From 6669c680f79663fc220935d61c3f3f6eee078e7c Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期日, 21 七月 2024 16:56:03 +0800
Subject: [PATCH] 修改了报错

---
 ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue |    2 
 ruoyi-ui/src/views/note/memo.vue                   |   10 +++-
 ruoyi-ui/src/api/doctor/index.js                   |   15 ++++---
 ruoyi-ui/src/views/doctor/index.vue                |   53 ++++++++++++++++++++------
 4 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/ruoyi-ui/src/api/doctor/index.js b/ruoyi-ui/src/api/doctor/index.js
index 35c373a..cdc9dd2 100644
--- a/ruoyi-ui/src/api/doctor/index.js
+++ b/ruoyi-ui/src/api/doctor/index.js
@@ -88,19 +88,21 @@
   })
 }
 // 鏌ョ湅鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�
-export function shareToWho(data) {
+export function shareToWho(data,query) {
   return request({
     url: '/ZfDoctorShare/getInfoByUserId',
     method: 'post',
-    data: data
+    data: data,
+    params: query
   })
 }
 // 鏌ョ湅璋佸垎浜簡鏁版嵁
-export function getWhoShare(data) {
+export function getWhoShare(data,query) {
   return request({
     url: '/ZfDoctorShare/getInfoByShareId',
     method: 'get',
-    data: data
+    data: data,
+    params: query
   })
 }
 // 涓嬭浇鍒嗕韩鐨勬暟鎹�
@@ -120,10 +122,11 @@
   })
 }
 // 灞曠ず涓嬭浇鐨勬暟鎹�
-export function showShareData() {
+export function showShareData(query) {
   return request({
     url: '/ZfDoctorShare/all',
-    method: 'get'
+    method: 'get',
+    params: query
   })
 }
 
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index ddec3fd..7699bf1 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>
 
 
@@ -622,6 +631,10 @@
         sex:undefined,
         birth:undefined,
       },
+      queryParams2: {
+        pageNo: 1,
+        pageSize: 10,
+      },
       ids1: [],
       single1: true,
       multiple1: true,
@@ -642,6 +655,7 @@
       showSearch: true,
       // 鎬绘潯鏁�
       total: 0,
+      total1: 0,
       // 灏忓尰鐢熻〃鏍兼暟鎹�
       doctorList: [],
       typeList:[],
@@ -768,6 +782,17 @@
     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 = ''
@@ -792,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;
         })
       })
     },
@@ -803,8 +829,10 @@
       this.ifNum = 3
       this.open2 = true
       this.title2 = "涓嬭浇鐨勫垎浜暟鎹�";
-      showShareData().then(response => {
-        this.shareList1 = response
+      showShareData(this.queryParams2).then(response => {
+        this.shareList1 = response.data.data
+        this.total1 = response.data.total;
+        // console.log(response,'灞曠ず涓嬭浇鐨勫垎浜暟鎹睍绀轰笅杞界殑鍒嗕韩鏁版嵁')
       })
     },
     // 灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹�
@@ -815,8 +843,8 @@
       this.title2 = "鍒嗕韩缁欐垜鐨勬暟鎹�";
       // const list = {"shareId": this.userList}
       const list = {"shareId": 111}
-      getWhoShare(list).then(response => {
-        const data = response.data
+      getWhoShare(list,this.queryParams2).then(response => {
+        const data = response.data.data
         console.log(data,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁s')
         for(let i in data){
           console.log(i,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁')
@@ -829,12 +857,13 @@
     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,'鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹垎浜粰璋佷簡浠�涔堟暟鎹�')
       })
     },
     handleWho(){
diff --git a/ruoyi-ui/src/views/note/memo.vue b/ruoyi-ui/src/views/note/memo.vue
index ca6cc0d..b4266f2 100644
--- a/ruoyi-ui/src/views/note/memo.vue
+++ b/ruoyi-ui/src/views/note/memo.vue
@@ -45,7 +45,7 @@
       style="background: #FEF7FC;"
     />
 
-    <el-dialog :title="isEdit1 ? '缂栬緫' : '鏂板'" :visible.sync="open" width="900px" append-to-body>
+    <el-dialog :title="isEdit1 ? '缂栬緫' : '鏂板'" :visible.sync="open" width="900px" append-to-body @close='closeFn'>
       <el-col >
         <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
 
@@ -199,7 +199,7 @@
 
 
     <!-- 鏌ョ湅璇︽儏寮圭獥 -->
-    <el-dialog title="璇︽儏" :visible.sync="open2" width="900px" append-to-body>
+    <el-dialog title="璇︽儏" :visible.sync="open2" width="900px" append-to-body @close='closeFn'>
           <el-col >
             <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
 
@@ -478,6 +478,10 @@
 
   },
   methods: {
+    closeFn(){
+      this.fileList = []
+      this.fileListOther = []
+    },
     //  寮圭獥
     handleShow(scope){
 
@@ -1091,7 +1095,7 @@
 .button1 {
   background:center no-repeat url('../../assets/icons/add1.png') ;
   /* margin-left: 69.5vw; */
-  margin-left: 780px;
+  margin-left: 650px;
 }
 
 .button_delete {
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index e757523..510ebd1 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -83,7 +83,7 @@
             </el-cow>
             <el-cow >
               <el-form-item label="澶囨敞" prop="remark" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
-                <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+                <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb" type="textarea"></el-input>
               </el-form-item>
             </el-cow>
           </el-row>

--
Gitblit v1.9.1