From 4c44ccbdcbe25de7dc0725bf53f1290fba10edf7 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期五, 05 九月 2025 11:33:41 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/tasklist/index.vue |   80 ++++++++++++++-------------------------
 1 files changed, 29 insertions(+), 51 deletions(-)

diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index e8e66a3..9f51be9 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -23,7 +23,7 @@
             @keyup.enter.native="handleQuery"
           ></el-input>
         </el-form-item>
-        <el-form-item label="鍒涘彂閫佹椂闂�">
+        <el-form-item label="鍙戦�佹椂闂�">
           <el-date-picker
             v-model="dateRange"
             style="width: 240px"
@@ -142,7 +142,6 @@
         <el-table-column
           label="浠诲姟鍚嶇О"
           fixed
-          width="200"
           align="center"
           key="taskName"
           prop="taskName"
@@ -150,7 +149,6 @@
         />
         <el-table-column
           label="浠诲姟鎻忚堪"
-          width="280"
           align="center"
           key="taskDesc"
           prop="taskDesc"
@@ -158,21 +156,26 @@
         />
         <el-table-column
           label="鏈嶅姟椤圭洰"
-          width="120"
           align="center"
           key="templatename"
           prop="templatename"
           :show-overflow-tooltip="true"
         />
         <el-table-column
-          label="寰呴殢璁�/鎬讳换鍔�"
+          label="鎬讳换鍔�/宸查殢璁�"
           align="center"
           key="nickName"
           width="120"
           prop="nickName"
         >
           <template slot-scope="scope">
-            <span>{{ scope.row.wfs }}/{{ scope.row.yfs }}</span>
+            <span
+              >{{
+                scope.row.wfs || scope.row.wfs == 0
+                  ? scope.row.wfs + scope.row.yfs
+                  : ""
+              }}/{{ scope.row.yfs }}</span
+            >
           </template>
         </el-table-column>
         <el-table-column
@@ -180,7 +183,6 @@
           align="center"
           key="longTask"
           prop="longTask"
-          width="120"
         >
           <template slot-scope="scope">
             <span>{{ scope.row.longTask ? "闀挎湡浠诲姟" : "闈為暱鏈�" }}</span>
@@ -192,7 +194,6 @@
           align="center"
           key="sendState"
           prop="sendState"
-          width="120"
         >
           <template slot-scope="scope">
             <dict-tag
@@ -207,7 +208,6 @@
           align="center"
           key="createBy"
           prop="createBy"
-          width="120"
           :show-overflow-tooltip="true"
         />
         <el-table-column
@@ -215,7 +215,6 @@
           sortable
           align="center"
           prop="createTime"
-          width="160"
         >
           <template slot-scope="scope">
             <span>{{ formatTime(scope.row.createTime) }}</span>
@@ -470,38 +469,13 @@
           value: 3,
           label: "瀹ｆ暀鍏虫��",
         },
-      ],
-      taskoptions: [
         {
-          value: "1",
-          label: "蹇冪數闅忚",
-        },
-        {
-          value: "2",
-          label: "鍑洪櫌闅忚",
-        },
-        {
-          value: "3",
-          label: "褰卞儚闅忚",
-        },
-        {
-          value: "4",
-          label: "瀹ｆ暀鍏虫��",
-        },
-        {
-          value: "5",
-          label: "浣撴闅忚",
-        },
-        {
-          value: "11",
-          label: "鍖绘妧闅忚",
-        },
-        {
-          value: "10",
-          label: "涓撶闅忚",
+          value: 4,
+          label: "娑堟伅閫氱煡",
         },
       ],
-      tasktopic: "2", //鏂板绫诲瀷
+      taskoptions: store.getters.tasktypes,
+      tasktopic: 2, //鏂板绫诲瀷
       activname: "",
       value: [],
       list: [],
@@ -685,7 +659,6 @@
     /** 鏌ヨ浠诲姟鍒楄〃 */
     getList() {
       this.loading = true;
-      console.log(this.topqueryParams.type);
 
       this.topqueryParams.serviceType = Number(this.tasktopic);
       if (
@@ -695,7 +668,7 @@
         this.tasktopic == 7 ||
         this.tasktopic == 6
       ) {
-        if (!this.topqueryParams.type) this.topqueryParams.type = '2';
+        if (!this.topqueryParams.type) this.topqueryParams.type = "2";
         this.longtermlist = [
           {
             value: 1,
@@ -706,16 +679,18 @@
             label: "闂嵎闅忚",
           },
         ];
+        this.topqueryParams.type=2;
       } else if (this.tasktopic == 4 || this.tasktopic == 8) {
-        if (!this.topqueryParams.type) this.topqueryParams.type = '3';
+        if (!this.topqueryParams.type) this.topqueryParams.type = "3";
         this.longtermlist = [
           {
             value: 3,
             label: "瀹ｆ暀鍏虫��",
           },
         ];
+        this.topqueryParams.type=3;
       } else if (this.tasktopic == 5) {
-        if (!this.topqueryParams.type) this.topqueryParams.type = '1';
+        if (!this.topqueryParams.type) this.topqueryParams.type = "1";
         this.longtermlist = [
           {
             value: 1,
@@ -727,12 +702,8 @@
           },
         ];
       }
-      // this.topqueryParams.typename = this.findLabelByValue(
-      //   this.taskoptions,
-      //   this.tasktopic
-      // );
-      this.topqueryParams.startOutHospTime = this.dateRange[0];
-      this.topqueryParams.endOutHospTime = this.dateRange[1];
+      this.topqueryParams.beginTime = this.dateRange[0];
+      this.topqueryParams.endTime = this.dateRange[1];
       getTasklist(this.topqueryParams).then((response) => {
         this.userList = response.rows;
         this.total = response.total;
@@ -791,8 +762,15 @@
     resetQuery() {
       this.dateRange = [];
       this.resetForm("queryForm");
-      this.topqueryParams.deptId = undefined;
-      this.$refs.tree.setCurrentKey(null);
+      this.topqueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        type: 2,
+        userName: undefined,
+        tagid: undefined,
+        topic: undefined,
+      };
+      // this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
     // 澶氶�夋閫変腑鏁版嵁

--
Gitblit v1.9.3