From 43e1199ca0c75787fb6b52bef7d595abd115ceab Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期四, 02 一月 2025 21:44:58 +0800 Subject: [PATCH] 修改bug --- ruoyi-ui/src/views/pet/index.vue | 173 +++++++++++++++++++++++++++++---------------------------- 1 files changed, 87 insertions(+), 86 deletions(-) diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue index ba8ad27..314d317 100644 --- a/ruoyi-ui/src/views/pet/index.vue +++ b/ruoyi-ui/src/views/pet/index.vue @@ -87,57 +87,31 @@ v-hasPermi="['system:role:remove']" >鍒犻櫎</el-button> </el-col> - - <el-col :span="1.5"> - <el-button - type="primary" - plain - icon="el-icon-top" - size="mini" - :disabled="multiple" - @click="handleShare" - - >鍒嗕韩</el-button> - </el-col> - - <el-col :span="1.5"> - <el-button - type="primary" - plain - icon="el-icon-top" - size="mini" - @click="handleWho" - >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button> - </el-col> - - <el-col :span="1.5"> - <el-button - type="primary" - plain - icon="el-icon-top" - size="mini" - @click="whoShare" - >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button> - </el-col> - - <el-col :span="1.5"> - <el-button - type="primary" - plain - icon="el-icon-top" - size="mini" - @click="showData" - >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button> - </el-col> - - - <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> + <el-dropdown placement="鍒嗕韩鐩稿叧"> + <el-button size="mini" type="primary" + plain + icon="el-icon-top">鍒嗕韩鐩稿叧</el-button> + <template #dropdown> + <el-dropdown-menu> + <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item> + + <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item> + <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item> + <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item> + </el-dropdown-menu> + </template> + </el-dropdown> + + + + <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> + </el-row> - <el-table v-loading="loading" :data="petList,PetNoteList" ref="table2" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"> + <el-table v-loading="loading" border :data="petList" ref="table2" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"> <el-table-column type="selection" width="55" align="center" /> - <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/> + <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/> <el-table-column label="绉嶇被" prop="animal" sortable :show-overflow-tooltip="true" width="150" /> <el-table-column label="鍝佺" prop="type" sortable :show-overflow-tooltip="true" width="150" /> @@ -157,6 +131,7 @@ </el-table-column> <el-table-column label="瀹犵墿id" prop="id" sortable width="100" /> <el-table-column label="涓讳汉濮撳悕" prop="masterName" sortable width="100" /> + <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2"> <template slot-scope="scope" v-if="scope.row.roleId !== 1"> <div class="button-container"> @@ -200,9 +175,8 @@ /> <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 --> - <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> - <h2 style="width: 100px;height: 16px;font-size: 15px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 400;color: #000000;line-height: 15px;">榄呭疇淇℃伅</h2> - + <el-dialog :title="title" @click.native="handleDialogClick" :visible.sync="open" width="800px" append-to-body> + <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px"> <el-form-item label="璇佷欢鍙风爜" prop="idNum"> @@ -222,6 +196,8 @@ </el-form-item> <el-form-item label="鍑虹敓鏃ユ湡" prop="birth"> <el-date-picker v-model="formDat.birth" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + @click.native.stop + ref="datePicker" :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" ></el-date-picker> </el-form-item> @@ -380,13 +356,13 @@ <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" ref="table1" @selection-change="handleSelectionChange1" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> <el-table-column type="selection" width="55" align="center" /> - <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/> - <el-table-column label="韬唤" prop="identity" sortable width="130" > + <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/> + <!-- <el-table-column label="韬唤" prop="identity" sortable width="130" > <template slot-scope="scope" > <span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span> <span v-else>鈥斺��</span> </template> - </el-table-column> + </el-table-column> --> <el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/> </el-table> @@ -504,6 +480,8 @@ import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role"; import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu"; import {getInfo} from "@/api/login"; +import {getAllInfo} from "@/api/system/user" +import {showShareUser} from "@/api/bignote/index"; //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁� @@ -513,11 +491,14 @@ import {listUserAll} from "@/api/root/index"; import { Notification, MessageBox, Message, Loading } from 'element-ui' export default { - name: "Role", + name: "ZfPet", dicts: ['sys_normal_disable'], data() { return { // 鍒嗕韩缁欒皝鐨刲ist + total1:0, + + PetNoteList:[], listRoot: [], open1:false, open2:false, @@ -575,7 +556,7 @@ menuNodeAll: false, deptExpand: true, deptNodeAll: false, - + valueFromParent: '瀹跺涵瀹犵墿', dialogImageUrl: '', dialogVisible: false, // 鏃ユ湡鑼冨洿 @@ -583,7 +564,7 @@ // 鏁版嵁鑼冨洿閫夐」 // 鏁版嵁鑼冨洿閫夐」 fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx', - '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'], + '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'], fileList1:[ ], fileList2:[ ], @@ -761,6 +742,11 @@ this.getInfo() }, methods: { + handleDialogClick() + { + // 鍏抽棴鏃ユ湡閫夋嫨鍣� + this.$refs.datePicker.handleClose(); + }, // 鍒嗛〉 fenYe(){ // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)' @@ -892,26 +878,41 @@ return row.id }, getList1() { - this.loading1 = true; - this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0] - this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1] - listUserAll(this.queryParams1).then(response => { - this.listRoot = response.data.data; - const kon = {} - this.listRoot.forEach(element => { - kon[element['nickName']] = element['userId'] - }) - for(let i in kon){ - this.userOptions.push({label: i,value: kon[i]}) - } - for(let i in this.userOptions){ - this.userList.push(this.userOptions[i].value) - } - console.log(this.userList,'userListuserListuserList') - this.loading1 = false; - } - ); - }, + let userId = this.$store.state.user.userId + + this.userOptions = [] + + showShareUser(userId, 2022).then(response=>{ + console.log("===========ddddddddddddd") + console.log(response.data) + console.log("--------------------") + response.data.forEach(element =>{ + this.userOptions.push({label: element.oldName,value: element.userId}) + }) + }) + + + let clanId = this.$store.state.user.clanId + + getAllInfo(clanId).then(response => { + this.listRoot = response.data; + const kon = {} + console.log(response.data,'userListuserListuserList99999999999999') + this.listRoot.forEach(element => { + kon[element['nickName']] = element['userId'] + }) + // for(let i in kon){ + // this.userOptions.push({label: i,value: kon[i]}) + // } + // for(let i in this.userOptions){ + // this.userList.push(this.userOptions[i].value) + // } + // console.log(this.userList,'userListuserListuserList99999999999999') + this.loading1 = false; + } + ); + + }, // 纭鍒嗕韩 subShare(row) { const shareList = {} @@ -921,7 +922,8 @@ this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() { return share(shareList); }).then(() => { - // this.getList(); + this.getList(); + this.getList1(); Message({ message: "鍒嗕韩鎴愬姛", type: 'success' }); this.open1 = false; this.id1 = undefined; @@ -980,16 +982,7 @@ this.loading = false; } ); - listPetnote(this.queryParams).then(response => { - // alert(123) - // console.log(response.data) - console.log(response.data) - this.PetNoteList = response.data.data; - this.total = response.data.total; - this.loading = false; - } - ); }, handleRemove(file) { @@ -1075,6 +1068,7 @@ /** 鏌ョ湅璇︾粏淇℃伅 */ handleCheck(row){ const id = row.id; + this.open2 = false; this.$router.push("/familymodel/pet/petInfo/" + id); }, @@ -1196,6 +1190,13 @@ background: #FFEFF2; } +/deep/ .w-table__fixed{ + + bottom: 12px !important; + + box-shadow:none; + + } .upload-demo .el-upload-list__item-thumbnail img { width: 100%; height: 100%; -- Gitblit v1.9.1