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/doctor/index.vue | 67 ++++++++++++++++++++++----------- 1 files changed, 44 insertions(+), 23 deletions(-) diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue index a09ac1c..3774cc1 100644 --- a/ruoyi-ui/src/views/doctor/index.vue +++ b/ruoyi-ui/src/views/doctor/index.vue @@ -209,7 +209,7 @@ </template> </el-table-column> - <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2"> + <el-table-column fixed="right" 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"> <el-button @@ -564,8 +564,9 @@ 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"; //瀵煎叆鎺ュ彛鍑芥暟 import {listDoctor,enload,getDoctor, addDoctor,updateDoctor, delDoctor,uploadPic,listType, share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData @@ -573,7 +574,7 @@ import {listUserAll} from "@/api/root/index"; import { Notification, MessageBox, Message, Loading } from 'element-ui' export default { - name: "index", + name: "ZfDoctor", dicts: ['sys_normal_disable'], data() { return { @@ -645,7 +646,7 @@ // 鏁版嵁鑼冨洿閫夐」 fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx', '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng', - '.m4a'], + '.m4a','.M4A'], fileList:[], fileList1:[], uploadFileList: [], @@ -882,37 +883,56 @@ 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, 2019).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 = {} shareList.shareContents = this.id1 || this.ids; shareList.shareIds = this.ids1 + if(shareList.shareIds.length==0) + { + this.$modal.msgSuccess("璇烽�夋嫨鍒嗕韩瀵硅薄"); + return; + } console.log(shareList,'sharelistsharelist') this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() { return share(shareList); }).then(() => { this.getList(); + this.getList1(); this.$modal.msgSuccess("鍒嗕韩鎴愬姛"); this.id1 = undefined this.open1 = false; @@ -1107,6 +1127,7 @@ /** 鏌ョ湅璇︾粏淇℃伅 */ handleCheck(row){ const id = row.id; + this.open2 = false; this.$router.push("/familymodel/Doctor/doctorInfo/" + id); }, /** 淇敼鎸夐挳鎿嶄綔 */ -- Gitblit v1.9.1