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

---
 src/views/followvisit/again/index.vue |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/views/followvisit/again/index.vue b/src/views/followvisit/again/index.vue
index 608b20a..ba0cee9 100644
--- a/src/views/followvisit/again/index.vue
+++ b/src/views/followvisit/again/index.vue
@@ -108,10 +108,10 @@
             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="璇疯緭鍏ユ偅鑰呰瘖鏂�"
+            placeholder="璇疯緭鍏ヨ瘖鏂悕绉�"
           ></el-input>
         </el-form-item>
 
@@ -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>
@@ -976,7 +984,8 @@
         searchscope: 3,
         visitCount: 2,
         scopetype: [],
-        leaveldeptcodes: [],
+        visitDeptCodes: [],
+        leaveldeptcodes:[],
         leavehospitaldistrictcodes: [],
       },
       propss: { multiple: true },
@@ -1112,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
         );
@@ -1128,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 {
@@ -1190,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 =
@@ -1208,6 +1223,7 @@
         leavehospitaldistrictcodes:
           this.topqueryParams.leavehospitaldistrictcodes,
         sendstates: [2, 3],
+        visitDeptCodes: this.topqueryParams.visitDeptCodes,
         leaveldeptcodes: this.topqueryParams.leaveldeptcodes,
       };
       buidegetTasklist(obj).then((response) => {
@@ -1305,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
         );
@@ -1324,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 {
@@ -1350,7 +1372,8 @@
         searchscope: 3,
         visitCount: 2,
         scopetype: [],
-        leaveldeptcodes: [],
+        visitDeptCodes: [],
+        leaveldeptcodes:[],
         leavehospitaldistrictcodes: [],
       };
       this.handleQuery(1);

--
Gitblit v1.9.3