From a99e82da2b087d7019cdce015c25befc620b9d61 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期二, 10 十一月 2026 14:14:16 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/discharge/index.vue |   66 ++++++++++++++++++++++++++-------
 1 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 27bc525..0e88fa5 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -75,7 +75,7 @@
         <el-form-item label="缁忕鍖荤敓" prop="managementDoctor">
           <el-input
             v-model="topqueryParams.managementDoctor"
-            placeholder="璇疯緭鍏ヤ富娌诲尰鐢�"
+            placeholder="璇疯緭鍏ョ粡绠″尰鐢�"
           ></el-input>
         </el-form-item>
         <el-form-item label="鏃ユ湡闄愬埗" prop="status">
@@ -117,6 +117,24 @@
           <el-select v-model="topqueryParams.sort" placeholder="璇烽�夋嫨">
             <el-option
               v-for="item in topicoptionssort"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="褰撳墠鎵ц鏂瑰紡" prop="currentPreachforms">
+          <el-select
+            v-model="topqueryParams.currentPreachforms"
+            placeholder="璇烽�夋嫨"
+            multiple
+            clearable
+            collapse-tags
+          >
+            <el-option
+              v-for="item in currentPreachformOptions"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -259,8 +277,12 @@
       </el-row>
       <div v-if="cardFilter" class="card-filter-tip">
         褰撳墠鎸夐《閮ㄥ崱鐗囩瓫閫夛細<b>{{ cardFilter }}</b>
-        <span class="tip-desc">锛堜笉褰卞搷涓婃柟琛ㄥ崟鏉′欢锛岀偣銆屾悳绱€�嶅彲鎭㈠琛ㄥ崟鏉′欢锛�</span>
-        <el-button type="text" size="mini" @click="clearCardFilter">娓呴櫎</el-button>
+        <span class="tip-desc"
+          >锛堜笉褰卞搷涓婃柟琛ㄥ崟鏉′欢锛岀偣銆屾悳绱€�嶅彲鎭㈠琛ㄥ崟鏉′欢锛�</span
+        >
+        <el-button type="text" size="mini" @click="clearCardFilter"
+          >娓呴櫎</el-button
+        >
       </div>
       <div class="selected-info">
         宸查�変腑
@@ -594,8 +616,7 @@
         />
         <el-table-column
           v-if="
-            orgname == '鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�' ||
-            orgname == '涓芥按甯備腑鍖婚櫌'
+            orgname == '鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�' || orgname == '涓芥按甯備腑鍖婚櫌'
           "
           label="鎷ㄥ彿鐘舵��"
           width="120"
@@ -1335,8 +1356,7 @@
         btstatus: "",
       },
       // endOut: 1,
-      endOut:
-        localStorage.getItem("orgname") == "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�" ? 0 : 1, //0 鍑洪櫌鏃堕棿(姝e簭)    1 鍑洪櫌鏃堕棿(鍊掑簭)   2 鍙戦�佹椂闂�(姝e簭)    3 鍙戦�佹椂闂�(鍊掑簭)  7搴旈殢璁挎棩鏈�(鍊掑簭) 搴旈殢璁挎棩鏈�(姝e簭)
+      endOut: localStorage.getItem("orgname") == "涓芥按甯備腑鍖婚櫌" ? 0 : 1, //0 鍑洪櫌鏃堕棿(姝e簭)    1 鍑洪櫌鏃堕棿(鍊掑簭)   2 鍙戦�佹椂闂�(姝e簭)    3 鍙戦�佹椂闂�(鍊掑簭)  7搴旈殢璁挎棩鏈�(鍊掑簭) 搴旈殢璁挎棩鏈�(姝e簭)
       endOuts: [
         {
           value: 0,
@@ -1400,6 +1420,7 @@
             : "",
         leaveldeptcodes: [],
         leavehospitaldistrictcodes: [],
+        currentPreachforms: [],
       },
       orgname: "",
       propss: { multiple: true },
@@ -1430,6 +1451,16 @@
           value: 5,
           label: "鏃犻渶闅忚",
         },
+      ],
+
+      currentPreachformOptions: [
+        { value: "1", label: "浜哄伐" },
+        { value: "2", label: "绾歌川" },
+        { value: "3", label: "鏅鸿兘璇煶" },
+        { value: "4", label: "鐭俊" },
+        { value: "5", label: "寰俊鍏紬鍙�" },
+        { value: "6", label: "寰俊灏忕▼搴�" },
+        { value: "7", label: "鏈悗闅忚" },
       ],
 
       sextype: [
@@ -1648,9 +1679,12 @@
       }
 
       try {
-        // 椤堕儴鍗$墖鐐瑰嚮鐨勪复鏃舵潯浠跺彧鍔犲湪鏈璇锋眰涓婏紝涓嶅啓鍥炶〃鍗�
-        const query = this.applyCardFilter({ ...this.topqueryParams });
-        const response = await getTaskservelist(query);
+        // 褰撳墠鎵ц鏂瑰紡涓哄閫夛紝闇�杞垚閫楀彿鍒嗛殧瀛楃涓诧紙濡� 1,2,5锛�
+        const params = { ...this.topqueryParams };
+        if (Array.isArray(params.currentPreachforms)) {
+          params.currentPreachforms = params.currentPreachforms.join(",");
+        }
+        const response = await getTaskservelist(params);
 
         // 鉁� 绗竴姝ワ細鍏堥攣瀹氭仮澶嶇姸鎬�
         this.isRestoring = true;
@@ -1670,7 +1704,7 @@
           this.yfsvalue = response.rows[0].yfs;
           // 椤堕儴鍗$墖鐨勬暟瀛椾笉璺熴�岄殢璁跨姸鎬�/寮傚父銆嶈蛋锛氬崟鐙煡涓�娆″幓鎺夌姸鎬佹潯浠剁殑缁熻锛�
           // 鍚﹀垯绛涗簡銆屽緟闅忚銆嶅悗銆屽凡瀹屾垚銆嶆案杩滄槸 0锛岀湅鐫�鍍忕畻閿欎簡
-          this.refreshCardCounts(query);
+          this.refreshCardCounts(params);
         }
 
         // 鉁� 绗簲姝ワ細澶勭悊 preachform 绛夊叾浠栨暟鎹�
@@ -1679,10 +1713,13 @@
           if (item.endtime) {
             item.endDay = this.daysBetween(item.endtime);
           }
+          console.log(item,'3');
 
           if (item.preachform) {
             item.preachformson = item.preachform;
             idArray = item.preachform.split(",");
+            console.log(this.checkboxlist);
+            console.log(idArray);
 
             item.preachform = idArray.map((value) => {
               const item = this.checkboxlist.find(
@@ -1693,9 +1730,8 @@
           }
           if (item.currentPreachform) {
             item.currentPreachform = this.checkboxlist.find(
-              (item) => item.value == item.currentPreachform
-            )?.value;
-            console.log(item.currentPreachform, "mi");
+              (items) => items.value == item.currentPreachform
+            )?.label;
           }
         });
 
@@ -2115,6 +2151,7 @@
         scopetype: [],
         leaveldeptcodes: [],
         leavehospitaldistrictcodes: [],
+        currentPreachforms: [],
       };
       this.handleQuery(1);
     },
@@ -2135,6 +2172,7 @@
         scopetype: [],
         leaveldeptcodes: [],
         leavehospitaldistrictcodes: [],
+        currentPreachforms: [],
       };
     },
     handleSelectionChange(rows) {

--
Gitblit v1.9.3