From 93f544dbe267c8bbceda5419d4512a993babdbcc Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期一, 28 七月 2025 17:37:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb

---
 src/views/doctor/checkAll/index.vue |   52 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index bd6d791..fe2bf91 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -733,7 +733,7 @@
                     placeholder="璇疯緭鍏ュ唴瀹�"
                     v-model="textarea1"
                     :autosize="{ minRows: minRows, maxRows: maxRows }"
-                    style="font-size: 16px;"
+                    style="font-size: 16px"
                   ></el-input>
                 </el-form-item>
               </el-form>
@@ -779,6 +779,7 @@
                       style="width: 100%"
                       :header-cell-style="{ background: '#67C23A' }"
                       :row-key="getRowKeys"
+                      :expand-row-keys="expends"
                     >
                       <!--  :expand-row-keys="expends" -->
                       <el-table-column type="expand">
@@ -2009,7 +2010,6 @@
       flags: false,
       jianqianwenzhendata: [],
       jianqians: false,
-      adviceLoading: false,
       sex: true,
       activeName: "1",
       hosproy: true,
@@ -2066,7 +2066,7 @@
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
+              picker.$adviceLoading("pick", [start, end]);
             },
           },
           {
@@ -2151,6 +2151,8 @@
       status1: 0,
       viewportHeight: 0,
       expends: [],
+      expandRowKeys: [],
+      shouldExpand: false,
     };
   },
 
@@ -2581,6 +2583,15 @@
     yichangjieguo() {
       this.loading = true;
       this.status1 = 0;
+      getConfigKey("kzycxmsfzk").then((res) => {
+        this.shouldExpand = res.msg;
+        // 鍙湁Y/y鎵嶅睍寮�锛屽叾瀹冿紙鍖呮嫭绌恒�丯銆乶ull銆乽ndefined锛夐兘涓嶅睍寮�
+        if (this.shouldExpand === "Y") {
+          this.getExpends();
+        } else {
+          this.expends = [];
+        }
+      });
       yichang({
         tjNum: this.tjNumber,
       })
@@ -2599,6 +2610,12 @@
           if (!this.yichangList) {
             this.$message.warning("鏆傛棤寮傚父鎶ュ憡");
           }
+          // 杩欓噷涔熷彲浠ユ牴鎹畇houldExpand鍐嶈皟鐢ㄤ竴娆etExpends锛岀‘淇濇暟鎹凡鍔犺浇
+          if (this.shouldExpand === "Y" || this.shouldExpand === "y") {
+            this.getExpends();
+          } else {
+            this.expends = [];
+          }
         })
         .catch((error) => {
           this.isLoading = false;
@@ -2610,6 +2627,7 @@
           this.loading = false;
         });
     },
+    
 
     fuchaxiangmu() {
       this.loading = true;
@@ -2937,7 +2955,7 @@
 
     propoChange() {
       this.cusobj = { sex: this.tableAll.cusSex, isZj: 0 };
-       this.$refs.proposal.clearSearchFields()
+      this.$refs.proposal.clearSearchFields();
       getConfigKey("mrzscyjy").then((res) => {
         this.mrjy = res.msg; // 浼氳Е鍙� watch 鈫� 璁剧疆 tjproposal = "1"
         // 绛夋暟鎹姸鎬佸噯澶囧ソ鍚庡啀鎵撳紑寮圭獥
@@ -3134,18 +3152,18 @@
       this.qingkong();
       this.$refs.Pre.open = false;
       this.tableAll = row;
-      let dict = "dict_tjtype"
-      getDicts(dict).then(res => {
-         if (res.code == 200) {
-            res.data.forEach((item) => {
-              if (this.tableAll.tjCategory == item.dictValue) {
-                this.tableAll.tjCategory = item.dictLabel;
-              }
-            });
-          } else {
-            throw new Error('鑾峰彇浣撴绫诲瀷瀛楀吀澶辫触');
-          }
-      })
+      let dict = "dict_tjtype";
+      getDicts(dict).then((res) => {
+        if (res.code == 200) {
+          res.data.forEach((item) => {
+            if (this.tableAll.tjCategory == item.dictValue) {
+              this.tableAll.tjCategory = item.dictLabel;
+            }
+          });
+        } else {
+          throw new Error("鑾峰彇浣撴绫诲瀷瀛楀吀澶辫触");
+        }
+      });
       this.tjproject = "0";
       this.tjNumber = this.tableAll.tjNumber;
 
@@ -3349,7 +3367,7 @@
               id: this.MsgId,
             };
 
-             /* gettoPdf(tjNumber)
+            /* gettoPdf(tjNumber)
               .then((res) => {
                 this.$modal.msgSuccess("宸茬敓鎴愭姤鍛婏紒璇峰墠寰�鎶ュ憡鏍告敹椤甸潰纭锛�");
               })

--
Gitblit v1.8.0