From 574b449a39019a59dc90ecc19dda9f63d3aa9636 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期三, 18 十一月 2026 15:35:47 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/operation/index.vue |   82 +++++++++++++++++++++++-----------------
 1 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/src/views/followvisit/operation/index.vue b/src/views/followvisit/operation/index.vue
index 3386dbd..0f45670 100644
--- a/src/views/followvisit/operation/index.vue
+++ b/src/views/followvisit/operation/index.vue
@@ -126,6 +126,17 @@
             end-placeholder="缁撴潫鏃ユ湡"
           ></el-date-picker>
         </el-form-item>
+           <el-form-item label="闅忚瀹屾垚鏃堕棿">
+          <el-date-picker
+            v-model="dateRangefts"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+          ></el-date-picker>
+        </el-form-item>
 
         <el-form-item label="鎮h�呭鍚�" prop="sendname">
           <el-input
@@ -602,8 +613,8 @@
         <el-table-column
           label="绉戝"
           align="center"
-          key="deptname"
-          prop="deptname"
+          key="leaveldeptname"
+          prop="leaveldeptname"
           width="120"
         >
         </el-table-column>
@@ -695,7 +706,7 @@
                 size="medium"
                 type="text"
                 @click="handlestop(scope.row)"
-                v-hasPermi="['system:user:edit']"
+
                 ><span class="button-sc"
                   ><i class="el-icon-remove-outline"></i>鏆傚仠鏈嶅姟</span
                 ></el-button
@@ -1076,7 +1087,7 @@
           <el-input
             style="width: 400px"
             disabled
-            v-model="zcform.deptname"
+            v-model="zcform.leaveldeptname"
           ></el-input>
         </el-form-item>
         <el-form-item label="鐥呭尯">
@@ -1165,6 +1176,8 @@
       dialogFormVisible: false,
       // 鎬绘潯鏁�
       total: 0,
+      jgvalue: 0,
+
       // 鐢ㄦ埛琛ㄦ牸鏁版嵁
       userList: null,
       // 寮瑰嚭灞傛爣棰�
@@ -1180,6 +1193,7 @@
       // 鏃ユ湡鑼冨洿
       dateRange: [],
       dateRangefs: [],
+      dateRangefts: [],
       // 宀椾綅閫夐」
       postOptions: [],
       ruleForm: {
@@ -1189,8 +1203,8 @@
       dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」
       inputVisible: false,
       Labelchange: false,
-      ycvalue: "",
-      jgvalue: "",
+      ycvalue: 0,
+      jgvalue: 0,
       yfsvalue: "",
       inputValue: "",
       preachform: "",
@@ -1343,8 +1357,7 @@
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
-        sendstateView:
-          localStorage.getItem("orgname") == "鍗楀崕澶у闄勫睘绗竴鍖婚櫌" ? 1 : 2,
+        sendstateView:1,
         sort: localStorage.getItem("orgname") == "涓芥按甯備腑鍖婚櫌" ? 8 : 2, //0 鎵嬫湳瀹屾垚鏃堕棿(姝e簭)    1 鎵嬫湳瀹屾垚鏃堕棿(鍊掑簭)   2 鍙戦�佹椂闂�(姝e簭)    3 鍙戦�佹椂闂�(鍊掑簭)  7搴旈殢璁挎棩鏈�(鍊掑簭) 搴旈殢璁挎棩鏈�(姝e簭)
         serviceType: 19,
         searchscope: 3,
@@ -1535,7 +1548,7 @@
         this.topqueryParams.leavehospitaldistrictcodes =
           store.getters.belongWards.map((obj) => obj.districtCode);
       }
-      if (this.endOut == 0) {
+      if (this.endOut == 0 && !this.topqueryParams.endSendDateTime) {
         this.topqueryParams.endSendDateTime = this.formatDateToYYYYMMDDHHMMSS(
           this.getEndOfDay()
         );
@@ -1580,15 +1593,12 @@
         this.loading = false;
         this.userList.forEach((item) => {
           let idArray = null;
-          if (item.endtime) {
-            item.endDay = this.daysBetween(item.endtime);
-          }
+
+          item.endDay = this.daysBetween(item.endtime);
 
           if (item.preachform) {
-            if (item.endtime) {
-              item.preachformson = item.preachform;
-              idArray = item.preachform.split(",");
-            }
+            item.preachformson = item.preachform;
+            idArray = item.preachform.split(",");
 
             item.preachform = idArray.map((value) => {
               // 鏌ユ壘id瀵瑰簲鐨勫璞�
@@ -1644,8 +1654,10 @@
       this.getList(1);
     },
     onthatday() {
-      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() {
@@ -1653,13 +1665,12 @@
       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(
@@ -1671,7 +1682,7 @@
         pageSize: 10,
         leavehospitaldistrictcodes:
           this.topqueryParams.leavehospitaldistrictcodes,
-        sendstates: [2, 3],
+        sendstateView: 1,
         leaveldeptcodes: this.topqueryParams.leaveldeptcodes,
       };
       buidegetTasklist(obj).then((response) => {
@@ -1690,15 +1701,11 @@
         this.loading = false;
         this.userList.forEach((item) => {
           let idArray = null;
-          if (item.endtime) {
-            item.endDay = this.daysBetween(item.endtime);
-          }
+          item.endDay = this.daysBetween(item.endtime);
 
           if (item.preachform) {
-            if (item.endtime) {
-              item.preachformson = item.preachform;
-              idArray = item.preachform.split(",");
-            }
+            item.preachformson = item.preachform;
+            idArray = item.preachform.split(",");
 
             item.preachform = idArray.map((value) => {
               // 鏌ユ壘id瀵瑰簲鐨勫璞�
@@ -1781,6 +1788,8 @@
         this.topqueryParams.endOutHospTime = this.dateRange[1];
         this.topqueryParams.startSendDateTime = this.dateRangefs[0];
         this.topqueryParams.endSendDateTime = this.dateRangefs[1];
+          this.topqueryParams.finishtimeStart = this.dateRangefts[0];
+        this.topqueryParams.finishtimeEnd = this.dateRangefts[1];
       }
       this.getList(refresh);
     },
@@ -1837,11 +1846,14 @@
     resetQuery() {
       this.dateRange = [];
       this.dateRangefs = [];
+      this.dateRangefts = [];
+
+      this.serviceStatusValue = 10;
+
       this.topqueryParams = {
         pageNum: 1,
         pageSize: 10,
-        sendstateView:
-          localStorage.getItem("orgname") == "鍗楀崕澶у闄勫睘绗竴鍖婚櫌" ? 1 : 2,
+        sendstateView:1,
         sort: 2, //0 鎵嬫湳瀹屾垚鏃堕棿(姝e簭)    1 鎵嬫湳瀹屾垚鏃堕棿(鍊掑簭)   2 鍙戦�佹椂闂�(姝e簭)    3 鍙戦�佹椂闂�(鍊掑簭)
         serviceType: 19,
         searchscope: 3,

--
Gitblit v1.9.3