From 385eae40221e5fc3bfe355cd0ec83d686497815f Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期三, 24 九月 2025 16:40:09 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/discharge/index.vue |   67 +++++++++++++--------------------
 1 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 2df797f..f6c83ed 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -342,7 +342,6 @@
           prop="suggest"
           width="120"
         >
-
           <template slot-scope="scope">
             <dict-tag
               :options="dict.type.sys_suggest"
@@ -784,7 +783,7 @@
       },
       value: [],
       list: [],
- topicoptionssort: [
+      topicoptionssort: [
         {
           value: 0,
           label: "鍑洪櫌鏃堕棿(姝ｅ簭)",
@@ -872,7 +871,7 @@
         pageNum: 1,
         pageSize: 10,
         serviceType: 2,
-        searchscope: 3,visitCount: 1,
+        visitCount: 1,
         scopetype: [],
         leaveldeptcodes: [],
         leavehospitaldistrictcodes: [],
@@ -992,6 +991,11 @@
         value: dept.districtCode,
       };
     });
+    this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+      (obj) => obj.deptCode
+    );
+    this.topqueryParams.leavehospitaldistrictcodes =
+      store.getters.belongWards.map((obj) => obj.districtCode);
     if (this.errtype) {
       this.toleadExport(2);
     } else {
@@ -1007,31 +1011,18 @@
   methods: {
     /** 鏌ヨ闂ㄨ瘖闅忚鏈嶅姟鍒楄〃 */
     getList(refresh) {
-      // 榛樿鍏ㄩ儴
-
-      if (this.topqueryParams.searchscope == 3) {
-        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(
           this.leavehospitaldistrictcode
         );
-        console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
       }
       this.loading = true;
-      if (
-        this.topqueryParams.leavehospitaldistrictcodes[0] &&
-        this.topqueryParams.leaveldeptcodes[0]
-      ) {
-        this.topqueryParams.deptOrDistrict = 2;
-      } else {
-        this.topqueryParams.deptOrDistrict = 1;
-      }
+      if (!this.topqueryParams.leavehospitaldistrictcodes)
+        this.topqueryParams.leavehospitaldistrictcodes = [];
+      if (!this.topqueryParams.leaveldeptcodes)
+        this.topqueryParams.leaveldeptcodes = [];
+
       getTaskservelist(this.topqueryParams).then((response) => {
         this.userList = response.rows[0].serviceSubtaskList;
         this.total = response.total;
@@ -1073,8 +1064,7 @@
       });
     },
     affiliation() {
-      this.topqueryParams.drcode = store.getters.hisUserId;
-      this.topqueryParams.nurseId = store.getters.hisUserId;
+      this.topqueryParams.managementDoctorCode = store.getters.hisUserId;
       this.getList(1);
     },
     onthatday() {
@@ -1087,13 +1077,11 @@
       return now.toISOString().slice(0, 10); // 鎴彇鍓�10涓瓧绗︼紝鍗� YYYY-MM-DD
     },
     buidegetTasklist(type) {
-      if (this.topqueryParams.searchscope == 3) {
-        this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
-          (obj) => obj.deptCode
-        );
-        this.topqueryParams.leavehospitaldistrictcodes =
-          store.getters.belongWards.map((obj) => obj.districtCode);
-      }
+      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(
@@ -1202,18 +1190,19 @@
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery(refresh) {
-      if (this.topqueryParams.searchscope == 3) {
-        this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
-          (obj) => obj.deptCode
-        );
-        this.topqueryParams.leavehospitaldistrictcodes =
-          store.getters.belongWards.map((obj) => obj.districtCode);
-      }
+      this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+        (obj) => obj.deptCode
+      );
+      this.topqueryParams.leavehospitaldistrictcodes =
+        store.getters.belongWards.map((obj) => obj.districtCode);
       this.topqueryParams.pageNum = 1;
+
       this.topqueryParams.startOutHospTime = this.dateRange[0];
       this.topqueryParams.endOutHospTime = this.dateRange[1];
       this.topqueryParams.startSendDateTime = this.dateRangefs[0];
       this.topqueryParams.endSendDateTime = this.dateRangefs[1];
+      console.log(221);
+
       this.getList(refresh);
     },
     // 鎮ｈ�呰寖鍥村鐞�
@@ -1225,13 +1214,10 @@
       if (type == 1) {
         this.topqueryParams.leaveldeptcodes.push(code);
         this.topqueryParams.leavehospitaldistrictcodes = [];
-        this.topqueryParams.searchscope = 1;
       } else if (type == 2) {
         this.topqueryParams.leavehospitaldistrictcodes.push(code);
         this.topqueryParams.leaveldeptcodes = [];
-        this.topqueryParams.searchscope = 2;
       } else {
-        this.topqueryParams.searchscope = 3;
       }
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -1244,7 +1230,6 @@
         sendstate: 2,
         sort: 2, //0 鍑洪櫌鏃堕棿(姝ｅ簭)    1 鍑洪櫌鏃堕棿(鍊掑簭)   2 鍙戦�佹椂闂�(姝ｅ簭)    3 鍙戦�佹椂闂�(鍊掑簭)
         serviceType: 2,
-        searchscope: 2,
       };
       this.handleQuery(1);
     },

--
Gitblit v1.9.3