From f12b3e4c7c8d55217cc1d21f814a9a3d5fc57251 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 03 十一月 2026 16:02:21 +0800
Subject: [PATCH] 提交Merge branch 'subtask' of http://116.62.18.175:6699/r/~yxh/smartor-web into subtask

---
 src/views/followvisit/discharge/index.vue |   77 +++++++++++++++++++++++++++++---------
 1 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index fb47a9e..27bc525 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -1249,9 +1249,12 @@
             { value: 1, label: "琚鍙�" },
             { value: 2, label: "寰呭彂閫�" },
             { value: 3, label: "宸插彂閫�" },
-            { value: 5, label: "鍙戦�佸け璐�" },
             { value: 7, label: "瓒呮椂" },
           ],
+        },
+        {
+          value: 40, // 涓�绾э細鍙戦�佸け璐ワ紙鍗曠嫭鍒楀嚭锛屾柟渚跨洿鎺ョ瓫锛�
+          label: "鍙戦�佸け璐�",
         },
         {
           value: 20, // 涓�绾э細宸插畬鎴�
@@ -1303,6 +1306,10 @@
         },
         {
           name: "寰呴殢璁�",
+          value: 0,
+        },
+        {
+          name: "鍙戦�佸け璐�",
           value: 0,
         },
         {
@@ -1816,9 +1823,9 @@
         this.cardlist[2].value = response.rows[0].ysf;
         this.ycvalue = Number(response.rows[0].yc) || 0;
         this.jgvalue = response.rows[0].jg;
-        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[3].value = response.rows[0].dsf;
+        this.cardlist[4].value = response.rows[0].fssb;
+        this.cardlist[5].value = response.rows[0].ywc;
         this.yfsvalue = response.rows[0].yfs;
         this.loading = false;
         this.userList.forEach((item) => {
@@ -1927,7 +1934,7 @@
     },
     /**
      * 鍙充笅瑙掋�屽緟澶勭悊闅忚浠诲姟銆嶅崱鐗囩偣鍑绘暟瀛楄烦杞繃鏉ワ細
-     * 鎸夊嚭闄㈠勾鏈� + 寰呴殢璁匡紙sendstate 1/2/3/5/7锛�+ 鍑洪櫌婊� 7 澶� 杩囨护锛屽彛寰勪笌鍗$墖涓�鑷�
+     * 鎸夊嚭闄㈠勾鏈� + 寰呴殢璁匡紙sendstate 1/2/3/7锛�+ 鍑洪櫌婊� 7 澶� 杩囨护锛屽彛寰勪笌鍗$墖涓�鑷�
      * @returns {boolean} 鏄惁宸叉寜鍗$墖鏉′欢鍙戣捣鏌ヨ
      */
     applyPendingTaskQuery() {
@@ -1945,11 +1952,8 @@
       const serviceType = Number(query.serviceType) === 3 ? 3 : 2;
       this.errtype = undefined;
       const start = month + "-01";
-      let end = this.pendingTaskMonthEnd(month);
-      // 鏈堝垵 7 澶╁唴锛�"浠婂ぉ-7澶�" 浼氭棭浜庢湀鍒濓紝鍏滃簳鎴愭湀鍒濓紝閬垮厤鏃ユ湡鍖洪棿鍊掓寕
-      if (end < start) {
-        end = start;
-      }
+      // 鍗$墖缁熻鐨勬槸銆屽嚭闄㈡弧 7 澶┿�嶇殑浠诲姟锛屾埅姝㈡棩 = min(璇ユ湀鏈�鍚庝竴澶�, 浠婂ぉ-7 澶�)
+      const end = this.pendingTaskMonthEnd(month);
       this.dateRange = [start, end];
       this.topqueryParams.serviceType = serviceType;
       this.topqueryParams.sendstateView = 1;
@@ -1957,24 +1961,47 @@
       // 鍗$墖缁熻鐨勬槸鍏ㄩ儴寰呴殢璁夸换鍔★紙涓嶅尯鍒嗛杞�/澶嶈瘖锛夛紝鍒楄〃杩欓噷鍚屾鏀惧紑
       this.topqueryParams.visitCount = null;
       this.topqueryParams.pageNum = 1;
+      // 褰撴湀杩樻病鍒扮 8 澶╂椂锛岃鏈堜笉鍙兘鏈夈�屽嚭闄㈡弧 7 澶┿�嶇殑浠诲姟锛堝崱鐗囨樉绀� 0锛夛紝鍒楄〃鐩存帴缁欑┖銆�
+      // 鏃ユ湡妗嗕粛鏄剧ず璇ユ湀鐨勮嚜鐒跺尯闂达紝閬垮厤鍑虹幇銆岃捣姝㈠�掓寕銆嶇殑绛涢�夋潯浠躲��
+      if (end < start) {
+        this.dateRange = [start, this.pendingTaskMonthLastDay(month)];
+        this.userList = [];
+        this.total = 0;
+        this.loading = false;
+        this.$message.info("璇ユ湀鏆傛棤鍑洪櫌婊� 7 澶╃殑寰呴殢璁夸换鍔�");
+        return true;
+      }
       this.handleQuery(1);
       return true;
     },
     /**
-     * 鍗$墖鍙e緞鐨勬湀浠界粨鏉熸棩锛�
-     * 褰撴湀鍙粺璁″嚭闄㈡弧 7 澶╃殑锛屾墍浠ュ彇銆屼粖澶� - 7 澶┿�嶏紱鍘嗗彶鏈堜唤鍙栧綋鏈堟渶鍚庝竴澶�
+     * 璇ユ湀鏈�鍚庝竴澶╋紙yyyy-MM-dd锛夛紝鍙敤浜庛�屽綋鏈堣繕娌℃湁婊� 7 澶╀换鍔°�嶆椂灞曠ず姝e父鏈堜唤鍖洪棿
+     */
+    pendingTaskMonthLastDay(month) {
+      const parts = String(month).split("-");
+      const date = new Date(Number(parts[0]), Number(parts[1]), 0);
+      const mm = String(date.getMonth() + 1).padStart(2, "0");
+      const dd = String(date.getDate()).padStart(2, "0");
+      return date.getFullYear() + "-" + mm + "-" + dd;
+    },
+    /**
+     * 鍗$墖鍙e緞鐨勬湀浠界粨鏉熸棩锛氬崱鐗囧彧缁熻銆屽嚭闄㈡弧 7 澶╀粛鏈殢璁裤�嶇殑浠诲姟锛�
+     * 鎵�浠ユ埅姝㈡棩姘歌繙鏄� min(璇ユ湀鏈�鍚庝竴澶�, 浠婂ぉ-7 澶�)锛�
+     * 鍘嗗彶鏈堜唤鍚屾牱瑕佹寜銆屼粖澶�-7 澶┿�嶆埅鏂紝鍚﹀垯鏈堟湯鍑犲ぉ鍑洪櫌鐨勬偅鑰呬細琚畻杩涙潵锛堝崱鐗� 49銆佸垪琛� 77锛夈��
      */
     pendingTaskMonthEnd(month) {
       const parts = String(month).split("-");
       const year = Number(parts[0]);
       const mon = Number(parts[1]);
       const now = new Date();
-      let date;
-      if (year === now.getFullYear() && mon === now.getMonth() + 1) {
-        date = new Date(year, mon - 1, now.getDate() - 7);
-      } else {
-        date = new Date(year, mon, 0);
-      }
+      // 鍑洪櫌婊� 7 澶╋細鍑洪櫌鏃ユ湡 <= 浠婂ぉ-7锛堜笌鍚庣 endtime < 浠婂ぉ-6 00:00 绛変环锛�
+      const cutoff = new Date(
+        now.getFullYear(),
+        now.getMonth(),
+        now.getDate() - 7
+      );
+      const monthEnd = new Date(year, mon, 0);
+      const date = cutoff < monthEnd ? cutoff : monthEnd;
       const mm = String(date.getMonth() + 1).padStart(2, "0");
       const dd = String(date.getDate()).padStart(2, "0");
       return date.getFullYear() + "-" + mm + "-" + dd;
@@ -2060,6 +2087,11 @@
             break;
         }
         this.topqueryParams.sendstate = null;
+        // 涓�绾с�屽彂閫佸け璐ャ�嶏細鎸夌姸鎬� 5 鐩存帴杩囨护锛堜笉绛夊悓浜庡緟闅忚锛�
+        if (value === 40) {
+          this.topqueryParams.sendstateView = null;
+          this.topqueryParams.sendstate = 5;
+        }
       } else {
         // 閫変腑浜嗕簩绾э紙鍏蜂綋鐘舵�侊級
         this.topqueryParams.sendstateView = null;
@@ -2438,11 +2470,16 @@
       try {
         const res = await getTaskservelist(query);
         const row = (res && res.rows && res.rows[0]) || {};
+        // 鎺ュ彛娌¤繑鍥炵粺璁¤鏃朵繚鎸佸師鍊硷紝閬垮厤涓�娆″紓甯告妸鍗$墖鍏ㄥ埛鎴� 0
+        if (!res || !res.rows || !res.rows.length) {
+          return;
+        }
         this.cardlist[0].value = Number(row.wxsf || 0) + Number(row.xsf || 0);
         this.cardlist[1].value = Number(row.wxsf) || 0;
         this.cardlist[2].value = Number(row.xsf) || 0;
         this.cardlist[3].value = Number(row.dsf) || 0;
-        this.cardlist[4].value = Number(row.ywc) || 0;
+        this.cardlist[4].value = Number(row.fssb) || 0;
+        this.cardlist[5].value = Number(row.ywc) || 0;
         this.ycvalue = Number(row.yc) || 0;
         this.jgvalue = Number(row.jg) || 0;
       } catch (e) {
@@ -2472,6 +2509,8 @@
         query.sendstateView = 3;
       } else if (name === "寰呴殢璁�") {
         query.sendstateView = 1;
+      } else if (name === "鍙戦�佸け璐�") {
+        query.sendstates = [5];
       } else if (name === "宸插畬鎴�") {
         query.sendstateView = 2;
       } else if (name === "闇�闅忚") {

--
Gitblit v1.9.3