From e46bb66ca6c3d82aaaddd3e6e5e39821cf2c7c1f Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 16 六月 2025 15:22:47 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/again/index.vue |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/views/followvisit/again/index.vue b/src/views/followvisit/again/index.vue
index b356ad7..bb64825 100644
--- a/src/views/followvisit/again/index.vue
+++ b/src/views/followvisit/again/index.vue
@@ -108,7 +108,7 @@
             placeholder="璇疯緭鍏ユ偅鑰呭鍚�"
           ></el-input>
         </el-form-item>
-           <el-form-item label="鎮ｈ�呰瘖鏂�" prop="leavediagname">
+        <el-form-item label="鎮ｈ�呰瘖鏂�" prop="leavediagname">
           <el-input
             v-model="topqueryParams.leavediagname"
             placeholder="璇疯緭鍏ユ偅鑰呰瘖鏂�"
@@ -450,10 +450,18 @@
         <!-- <el-table-column label="鎬у埆"width="100" align="center" key="sex" prop="sex" /> -->
         <!-- <el-table-column label="搴婂彿" align="center" key="badNo" prop="badNo" /> -->
         <el-table-column
-          label="绉戝"
+          label="棣栨闅忚绉戝"
           align="center"
           key="deptname"
           prop="deptname"
+          width="120"
+        >
+        </el-table-column>
+        <el-table-column
+          label="鏈绉戝"
+          align="center"
+          key="visitDeptName"
+          prop="visitDeptName"
           width="120"
         >
         </el-table-column>
@@ -974,8 +982,10 @@
         sort: 2, //0 鍑洪櫌鏃堕棿(姝ｅ簭)    1 鍑洪櫌鏃堕棿(鍊掑簭)   2 鍙戦�佹椂闂�(姝ｅ簭)    3 鍙戦�佹椂闂�(鍊掑簭)
         serviceType: 2,
         searchscope: 3,
+        visitCount: 2,
         scopetype: [],
-        leaveldeptcodes: [],
+        visitDeptCodes: [],
+        leaveldeptcodes:[],
         leavehospitaldistrictcodes: [],
       },
       propss: { multiple: true },
@@ -1111,6 +1121,9 @@
       // 榛樿鍏ㄩ儴
 
       if (this.topqueryParams.searchscope == 3) {
+        this.topqueryParams.visitDeptCodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
         this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
           (obj) => obj.deptCode
         );
@@ -1127,7 +1140,7 @@
       this.loading = true;
       if (
         this.topqueryParams.leavehospitaldistrictcodes[0] &&
-        this.topqueryParams.leaveldeptcodes[0]
+        this.topqueryParams.visitDeptCodes[0]&&this.topqueryParams.leaveldeptcodes[0]
       ) {
         this.topqueryParams.deptOrDistrict = 2;
       } else {
@@ -1189,7 +1202,10 @@
     },
     buidegetTasklist(type) {
       if (this.topqueryParams.searchscope == 3) {
-        this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+        this.topqueryParams.visitDeptCodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+          this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
           (obj) => obj.deptCode
         );
         this.topqueryParams.leavehospitaldistrictcodes =
@@ -1207,6 +1223,7 @@
         leavehospitaldistrictcodes:
           this.topqueryParams.leavehospitaldistrictcodes,
         sendstates: [2, 3],
+        visitDeptCodes: this.topqueryParams.visitDeptCodes,
         leaveldeptcodes: this.topqueryParams.leaveldeptcodes,
       };
       buidegetTasklist(obj).then((response) => {
@@ -1304,6 +1321,9 @@
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery(refresh) {
       if (this.topqueryParams.searchscope == 3) {
+        this.topqueryParams.visitDeptCodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
         this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
           (obj) => obj.deptCode
         );
@@ -1323,13 +1343,16 @@
       let type = value[0];
       let code = value.slice(-1)[0];
       this.topqueryParams.leavehospitaldistrictcodes = [];
+      this.topqueryParams.visitDeptCodes = [];
       this.topqueryParams.leaveldeptcodes = [];
       if (type == 1) {
+        this.topqueryParams.visitDeptCodes.push(code);
         this.topqueryParams.leaveldeptcodes.push(code);
         this.topqueryParams.leavehospitaldistrictcodes = [];
         this.topqueryParams.searchscope = 1;
       } else if (type == 2) {
         this.topqueryParams.leavehospitaldistrictcodes.push(code);
+        this.topqueryParams.visitDeptCodes = [];
         this.topqueryParams.leaveldeptcodes = [];
         this.topqueryParams.searchscope = 2;
       } else {
@@ -1340,18 +1363,20 @@
     resetQuery() {
       this.dateRange = [];
       this.dateRangefs = [];
-      (this.topqueryParams = {
+      this.topqueryParams = {
         pageNum: 1,
         pageSize: 10,
         sendstate: 2,
         sort: 2, //0 鍑洪櫌鏃堕棿(姝ｅ簭)    1 鍑洪櫌鏃堕棿(鍊掑簭)   2 鍙戦�佹椂闂�(姝ｅ簭)    3 鍙戦�佹椂闂�(鍊掑簭)
         serviceType: 2,
         searchscope: 3,
+        visitCount: 2,
         scopetype: [],
-        leaveldeptcodes: [],
+        visitDeptCodes: [],
+        leaveldeptcodes:[],
         leavehospitaldistrictcodes: [],
-      }),
-        this.handleQuery(1);
+      };
+      this.handleQuery(1);
     },
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
@@ -1520,6 +1545,7 @@
           patid: row.patid,
           id: row.id,
           Voicetype: type,
+          visitCount: this.topqueryParams.visitCount,
         },
       });
     },

--
Gitblit v1.9.3