From dfd32b299236e015fe80e10fae01548288d91000 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 02 十一月 2026 09:56:32 +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 |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index fb47a9e..3fb51d4 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) => {
@@ -2060,6 +2067,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 +2450,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 +2489,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