From fae5df1d3f1ae875ac546cacfb4744b2e8230ca2 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期一, 29 七月 2024 11:07:24 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-ui/src/views/doctor/index.vue | 134 +++++++++++++++++++++++++++-----------------
1 files changed, 83 insertions(+), 51 deletions(-)
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 1be08fa..a5ff635 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -573,6 +573,15 @@
</el-table-column>
</el-table>
+ <pagination
+ v-show="total1>0"
+ :total="total1"
+ :page.sync="queryParams2.pageNo"
+ :limit.sync="queryParams2.pageSize"
+ @pagination='fenYe'
+ style="background: #FEF7FC;"
+ />
+
</el-dialog>
@@ -606,37 +615,53 @@
// shareList2: [],
userOptions:[],
user:undefined,
+ userList:[],
ifNum:undefined,
selectWho:undefined,
+ title1: "",
+ title2: "",
+ loading1: false,
+ loading2: false,
+ // 鏌ヨ鍙傛暟1
+ queryParams1: {
+ pageNum: 1,
+ pageSize: 10,
+ identity:undefined,
+ nickName:undefined,
+ sex:undefined,
+ birth:undefined,
+ },
+ queryParams2: {
+ pageNo: 1,
+ pageSize: 10,
+ },
+ ids1: [],
+ single1: true,
+ multiple1: true,
+ dateRange1: [],
userId: undefined,
// 閬僵灞�
disabled: false,
-
loading: true,
- loading1: false,
- loading2: false,
formData:[],
// 閫変腑鏁扮粍
ids: [],
- ids1: [],
// 闈炲崟涓鐢�
single: true,
- single1: true,
// 闈炲涓鐢�
multiple: true,
- multiple1: true,
// 鏄剧ず鎼滅储鏉′欢
showSearch: true,
// 鎬绘潯鏁�
total: 0,
+ total1: 0,
// 灏忓尰鐢熻〃鏍兼暟鎹�
doctorList: [],
typeList:[],
// 寮瑰嚭灞傛爣棰�
title: "",
- title1: "",
- title2: "",
+
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
@@ -647,7 +672,7 @@
deptNodeAll: false,
// 鏃ユ湡鑼冨洿
dateRange: [],
- dateRange1: [],
+
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
@@ -690,15 +715,7 @@
effect:undefined,
},
- // 鏌ヨ鍙傛暟1
- queryParams1: {
- pageNum: 1,
- pageSize: 10,
- identity:undefined,
- nickName:undefined,
- sex:undefined,
- birth:undefined,
- },
+
// searchVal:"",
// 琛ㄥ崟鍙傛暟
@@ -761,9 +778,21 @@
this.getList();
this.getTypeOptions();
this.getInfo();
+
this.getList1();
},
methods: {
+ // 鍒嗛〉
+ fenYe(){
+ // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
+ if(this.ifNum === 1){
+ this.selectValue(this.selectWho)
+ }else if(this.ifNum === 2){
+ this.whoShare()
+ }else{
+ this.showData()
+ }
+ },
// 鍏抽棴寮圭獥鍚�
handleClose(){
this.user = ''
@@ -788,8 +817,9 @@
Message({ message: "鏀跺洖鎴愬姛", type: 'success' })
const list2 = {"shareIds": [this.selectWho]}
- shareToWho(list2).then(response => {
- this.shareList1 = response.data
+ shareToWho(list2,this.queryParams2).then(response => {
+ this.shareList1 = response.data.data
+ this.total1 = response.data.total;
})
})
},
@@ -799,9 +829,10 @@
this.ifNum = 3
this.open2 = true
this.title2 = "涓嬭浇鐨勫垎浜暟鎹�";
- showShareData().then(response => {
- this.shareList1 = response
- // console.log(this.shareList1,'showShareDatashowShareData')
+ showShareData(this.queryParams2).then(response => {
+ this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ // console.log(response,'灞曠ず涓嬭浇鐨勫垎浜暟鎹睍绀轰笅杞界殑鍒嗕韩鏁版嵁')
})
},
// 灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹�
@@ -810,12 +841,16 @@
this.ifNum = 2
this.open2 = true
this.title2 = "鍒嗕韩缁欐垜鐨勬暟鎹�";
- getWhoShare().then(response => {
- const data = response.data
+ // const list = {"shareId": this.userList}
+ // const list = {"shareId": 111}
+ getWhoShare(this.queryParams2).then(response => {
+ const data = response.data.data
+ this.total1 = response.data.total
+ console.log(response,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁s')
for(let i in data){
+ console.log(i,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁')
this.shareList1.push(data[i])
}
-
})
},
@@ -823,14 +858,14 @@
selectValue(value){
this.selectWho = value
this.shareList1 = []
- const list = {"shareIds": [value]}
- shareToWho(list).then(response => {
- this.loading2 = true;
- this.shareList1 = response.data
- this.loading2 = false;
- console.log(this.shareList1,'鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹垎浜粰璋佷簡浠�涔堟暟鎹�')
+ const list = {"shareIds": [this.selectWho]}
+ shareToWho(list,this.queryParams2).then(response => {
+ // this.loading2 = true;
+ this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ // this.loading2 = false;
+ console.log(response.data,'鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹垎浜粰璋佷簡浠�涔堟暟鎹�')
})
- // console.log(value)
},
handleWho(){
this.ifNum = 1
@@ -841,16 +876,13 @@
/** 鍒嗕韩鎿嶄綔 */
handleShare(row) {
- // this.getList1();
- this.id1 = row.id
+ this.id1 = [row.id]
this.open1 = true;
this.title1 = "鍒嗕韩";
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange1(selection) {
this.ids1 = selection.map(item => item.userId)
- // console.log(selection)
- // console.log(this.ids1,'ids1ids1ids1ids1')
this.single1 = selection.length!=1
this.multiple1 = !selection.length
},
@@ -862,15 +894,20 @@
// this.single1 = selection.length!=1
// this.multiple1 = !selection.length
},
+ getRowId1(row)
+ {
+ return row.id
+ },
+ getRowId2(row)
+ {
+ 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;
- // console.log(this.listRoot,'listrootlistroot')
- // this.total1 = response.data.total;
-
const kon = {}
this.listRoot.forEach(element => {
kon[element['nickName']] = element['userId']
@@ -878,9 +915,10 @@
for(let i in kon){
this.userOptions.push({label: i,value: kon[i]})
}
- // console.log(this.userOptions,'userListuserListuserListuserListuserList')
-
-
+ for(let i in this.userOptions){
+ this.userList.push(this.userOptions[i].value)
+ }
+ console.log(this.userList,'userListuserListuserList')
this.loading1 = false;
}
);
@@ -900,6 +938,7 @@
this.open1 = false;
}).catch(() => {});
},
+ // ------------------------------------------------------------------
getInfo(){
console.log('-----------------')
@@ -1022,14 +1061,7 @@
{
return row.id
},
- getRowId1(row)
- {
- return row.id
- },
- getRowId2(row)
- {
- return row.id
- },
+
// 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
cancelDataScope() {
this.openDataScope = false;
--
Gitblit v1.9.1