From b4fe2c16274a91fee4fb26d91374f95fbe2dbcec Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期一, 09 十一月 2026 15:28:21 +0800
Subject: [PATCH] 测试完成

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

diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 7b355eb..99ad37f 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -73,7 +73,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">
@@ -115,6 +115,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"
@@ -244,7 +262,7 @@
           </div>
         </el-col>
         <div class="color-legend">
-          <span class="legend-item" v-if="orgname == '鐪佺珛鍚屽痉缈犺嫅闄㈠尯'">
+          <span class="legend-item" v-if="orgname == '鍗楀崕澶у闄勫睘绗竴鍖婚櫌'">
             <span class="legend-block legend-blue"></span>鏈埌闅忚鏃堕棿
           </span>
           <span class="legend-item">
@@ -585,6 +603,29 @@
           key="phone"
           prop="phone"
         />
+        <el-table-column
+          v-if="
+            orgname == '鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�' ||
+            orgname == '涓芥按甯備腑鍖婚櫌'
+          "
+          label="鎷ㄥ彿鐘舵��"
+          width="120"
+          align="center"
+          key="isManuallyCalled"
+          prop="isManuallyCalled"
+        >
+          <template slot-scope="scope">
+            <el-tag
+              v-if="Number(scope.row.isManuallyCalled) > 0"
+              type="success"
+              :disable-transitions="false"
+              >鎷ㄩ�歿{ scope.row.isManuallyCalled }}娆�</el-tag
+            >
+            <el-tag v-else type="info" :disable-transitions="false"
+              >鏈嫧閫�</el-tag
+            >
+          </template>
+        </el-table-column>
         <el-table-column
           label="韬唤璇佸彿鐮�"
           width="200"
@@ -1297,7 +1338,7 @@
       },
       // endOut: 1,
       endOut:
-        localStorage.getItem("orgname") == "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�" ? 0 : 1, //0 鍑洪櫌鏃堕棿(姝e簭)    1 鍑洪櫌鏃堕棿(鍊掑簭)   2 鍙戦�佹椂闂�(姝e簭)    3 鍙戦�佹椂闂�(鍊掑簭)  7搴旈殢璁挎棩鏈�(鍊掑簭) 搴旈殢璁挎棩鏈�(姝e簭)
+        localStorage.getItem("orgname") == "涓芥按甯備腑鍖婚櫌" ? 0 : 1, //0 鍑洪櫌鏃堕棿(姝e簭)    1 鍑洪櫌鏃堕棿(鍊掑簭)   2 鍙戦�佹椂闂�(姝e簭)    3 鍙戦�佹椂闂�(鍊掑簭)  7搴旈殢璁挎棩鏈�(鍊掑簭) 搴旈殢璁挎棩鏈�(姝e簭)
       endOuts: [
         {
           value: 0,
@@ -1361,6 +1402,7 @@
             : "",
         leaveldeptcodes: [],
         leavehospitaldistrictcodes: [],
+        currentPreachforms: [],
       },
       orgname: "",
       propss: { multiple: true },
@@ -1391,6 +1433,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: [
@@ -1511,6 +1563,8 @@
         value: dept.districtCode,
       };
     });
+    // 鍏嶇櫥鐩磋揪锛氭牴鎹瀹�/鐥呭尯缂栫爜棰勫~鎮h�呰寖鍥�
+    this.applyFollowUpScope();
     if (this.errtype == 1) {
       this.toleadExport(2);
     } else if (this.errtype == 2) {
@@ -1588,7 +1642,12 @@
       }
 
       try {
-        const response = await getTaskservelist(this.topqueryParams);
+        // 褰撳墠鎵ц鏂瑰紡涓哄閫夛紝闇�杞垚閫楀彿鍒嗛殧瀛楃涓诧紙濡� 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;
@@ -1635,10 +1694,11 @@
             });
           }
           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;
           }
         });
 
@@ -1725,8 +1785,10 @@
     onthatday() {
       this.resetQuerykj();
 
-      this.topqueryParams.startSendDateTime = this.getCurrentDate();
-      this.topqueryParams.endSendDateTime = this.getCurrentDate();
+      this.topqueryParams.sendstateView = 1; // 寰呴殢璁�
+      this.topqueryParams.sendstate = null;
+      this.topqueryParams.startSendDateTime = null;
+      this.topqueryParams.endSendDateTime = this.getCurrentDate(); // 寮�濮嬮殢璁挎棩鏈� <= 浠婂ぉ
       this.getList(1);
     },
     getCurrentDate() {
@@ -1735,10 +1797,12 @@
     },
 
     buidegetTasklist(type) {
-      if (type) {
-        this.resetQuerykj();
-      }
-      this.applyDeptWardScope();
+      // 鐢ㄦ埛鏉冮檺涓嬫墍鏈夊緟闅忚浠诲姟锛氫紶閫掑叏閮ㄧ瀹ゅ拰鐥呭尯
+      this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+        (obj) => obj.deptCode
+      );
+      this.topqueryParams.leavehospitaldistrictcodes =
+        store.getters.belongWards.map((obj) => obj.districtCode);
       // 鎺ュ彈寮傚父璺宠浆
       if (this.errtype) {
         this.topqueryParams.leavehospitaldistrictcodes.push(
@@ -1750,7 +1814,7 @@
         pageSize: 10,
         leavehospitaldistrictcodes:
           this.topqueryParams.leavehospitaldistrictcodes,
-        sendstates: [2, 3],
+        sendstateView: 1,
         leaveldeptcodes: this.topqueryParams.leaveldeptcodes,
       };
       buidegetTasklist(obj).then((response) => {
@@ -1847,6 +1911,7 @@
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery(refresh) {
       this.applyDeptWardScope();
+      this.clearAllSelection();
       this.topqueryParams.pageNum = 1;
       // 鍒ゆ柇鏄笉鏄伐浣滃彴蹇嵎鏌ヨ
       if (this.errtype != 2) {
@@ -1856,6 +1921,17 @@
         this.topqueryParams.endSendDateTime = this.dateRangefs[1];
       }
       this.getList(refresh);
+    },
+    // 鍏嶇櫥鐩磋揪锛氭牴鎹矾鐢变腑鐨勭瀹�/鐥呭尯缂栫爜棰勫~鎮h�呰寖鍥�
+    applyFollowUpScope() {
+      const deptCode = this.$route.query.followUpDeptCode;
+      const wardCode = this.$route.query.followUpWardCode;
+      if (!deptCode && !wardCode) return;
+      const scope = [];
+      if (deptCode) scope.push([1, deptCode]);
+      if (wardCode) scope.push([2, wardCode]);
+      this.topqueryParams.scopetype = scope;
+      this.lastScopeType = deptCode ? 1 : 2;
     },
     // 鎮h�呰寖鍥村鐞嗭細浠庡閫夌骇鑱� scopetype 瑙f瀽绉戝/鐥呭尯
     applyDeptWardScope() {
@@ -1961,6 +2037,7 @@
         scopetype: [],
         leaveldeptcodes: [],
         leavehospitaldistrictcodes: [],
+        currentPreachforms: [],
       };
       this.handleQuery(1);
     },
@@ -1981,6 +2058,7 @@
         scopetype: [],
         leaveldeptcodes: [],
         leavehospitaldistrictcodes: [],
+        currentPreachforms: [],
       };
     },
     handleSelectionChange(rows) {

--
Gitblit v1.9.3