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

---
 src/views/followvisit/again/index.vue |   62 ++++++++++++++++++++++++-------
 1 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/src/views/followvisit/again/index.vue b/src/views/followvisit/again/index.vue
index 608b20a..bccd382 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="鎮h�呰瘖鏂�" 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>
@@ -636,7 +644,17 @@
             </el-form-item>
           </el-col>
         </el-row>
-
+<el-row >
+          <el-col :span="8">
+            <el-form-item label="杩囨护鍖荤敓" width="100" prop="filterDrname">
+              <el-input
+                v-model="form.filterDrname"
+                placeholder="璇疯緭鍏ュ尰鐢熷鍚�"
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="杩囨护鍘熷洜">
@@ -921,10 +939,10 @@
           name: "寰呴殢璁�",
           value: 0,
         },
-        {
-          name: "宸插彂閫�",
-          value: 0,
-        },
+        // {
+        //   name: "宸插彂閫�",
+        //   value: 0,
+        // },
 
         // {
         //   name: "琛ㄥ崟宸插彂閫�",
@@ -976,7 +994,8 @@
         searchscope: 3,
         visitCount: 2,
         scopetype: [],
-        leaveldeptcodes: [],
+        visitDeptCodes: [],
+        leaveldeptcodes:[],
         leavehospitaldistrictcodes: [],
       },
       propss: { multiple: true },
@@ -1112,6 +1131,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 +1150,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 {
@@ -1145,7 +1167,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[2].value = response.rows[0].fssb;
           this.cardlist[3].value = response.rows[0].dsf;
-          this.cardlist[4].value = response.rows[0].yfs2;
+          // this.cardlist[4].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
@@ -1190,7 +1212,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 +1233,7 @@
         leavehospitaldistrictcodes:
           this.topqueryParams.leavehospitaldistrictcodes,
         sendstates: [2, 3],
+        visitDeptCodes: this.topqueryParams.visitDeptCodes,
         leaveldeptcodes: this.topqueryParams.leaveldeptcodes,
       };
       buidegetTasklist(obj).then((response) => {
@@ -1221,7 +1247,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[3].value = response.rows[0].fssb;
           this.cardlist[4].value = response.rows[0].dsf;
-          this.cardlist[5].value = response.rows[0].yfs2;
+          // this.cardlist[5].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
@@ -1305,6 +1331,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 +1353,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 +1382,8 @@
         searchscope: 3,
         visitCount: 2,
         scopetype: [],
-        leaveldeptcodes: [],
+        visitDeptCodes: [],
+        leaveldeptcodes:[],
         leavehospitaldistrictcodes: [],
       };
       this.handleQuery(1);
@@ -1567,6 +1600,7 @@
     handleUpdate(row) {
       particularpatient(row.patid).then((response) => {
         this.form = response.data;
+        this.form.filterDrname = store.getters.nickName;
       });
       this.amendtag = true;
       this.Labelchange = true;

--
Gitblit v1.9.3