From caf5eece759763e96591a786cf9a8eb8f515d5f0 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期四, 18 九月 2025 09:38:59 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/smartor-web

---
 src/views/followvisit/tasklist/index.vue |   42 ++++++++++++++++++++++--------------------
 1 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index fbcca62..10a9838 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -90,7 +90,7 @@
           >
             <el-option
               v-for="item in longtermlist"
-              :key="item.value"
+              :key="item.label"
               :label="item.label"
               :value="item.value"
             >
@@ -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,7 +156,6 @@
         />
         <el-table-column
           label="鏈嶅姟椤圭洰"
-          width="120"
           align="center"
           key="templatename"
           prop="templatename"
@@ -173,9 +170,11 @@
         >
           <template slot-scope="scope">
             <span
-              >{{ scope.row.wfs ? scope.row.wfs + scope.row.yfs : "" }}/{{
-                scope.row.yfs
-              }}</span
+              >{{
+                scope.row.wfs || scope.row.wfs == 0
+                  ? scope.row.wfs + scope.row.yfs
+                  : ""
+              }}/{{ scope.row.yfs }}</span
             >
           </template>
         </el-table-column>
@@ -184,7 +183,6 @@
           align="center"
           key="longTask"
           prop="longTask"
-          width="120"
         >
           <template slot-scope="scope">
             <span>{{ scope.row.longTask ? "闀挎湡浠诲姟" : "闈為暱鏈�" }}</span>
@@ -196,7 +194,6 @@
           align="center"
           key="sendState"
           prop="sendState"
-          width="120"
         >
           <template slot-scope="scope">
             <dict-tag
@@ -211,7 +208,6 @@
           align="center"
           key="createBy"
           prop="createBy"
-          width="120"
           :show-overflow-tooltip="true"
         />
         <el-table-column
@@ -219,7 +215,6 @@
           sortable
           align="center"
           prop="createTime"
-          width="160"
         >
           <template slot-scope="scope">
             <span>{{ formatTime(scope.row.createTime) }}</span>
@@ -530,7 +525,7 @@
         },
         {
           value: "13",
-          label: "涓撶闅忚",
+          label: "涓撶梾闅忚",
         },
       ],
       tasktopic: "2", //鏂板绫诲瀷
@@ -632,7 +627,7 @@
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
-        type: 2,
+        type: 1,
         userName: undefined,
         tagid: undefined,
         topic: undefined,
@@ -726,7 +721,7 @@
         this.tasktopic == 7 ||
         this.tasktopic == 6
       ) {
-        if (!this.topqueryParams.type) this.topqueryParams.type = "2";
+        if (!this.topqueryParams.type) this.topqueryParams.type = 1;
         this.longtermlist = [
           {
             value: 1,
@@ -737,6 +732,7 @@
             label: "闂嵎闅忚",
           },
         ];
+        // this.topqueryParams.type = 2;
       } else if (this.tasktopic == 4 || this.tasktopic == 8) {
         if (!this.topqueryParams.type) this.topqueryParams.type = "3";
         this.longtermlist = [
@@ -745,6 +741,7 @@
             label: "瀹ｆ暀鍏虫��",
           },
         ];
+        this.topqueryParams.type = 3;
       } else if (this.tasktopic == 5) {
         if (!this.topqueryParams.type) this.topqueryParams.type = "1";
         this.longtermlist = [
@@ -758,10 +755,6 @@
           },
         ];
       }
-      // this.topqueryParams.typename = this.findLabelByValue(
-      //   this.taskoptions,
-      //   this.tasktopic
-      // );
       this.topqueryParams.beginTime = this.dateRange[0];
       this.topqueryParams.endTime = this.dateRange[1];
       getTasklist(this.topqueryParams).then((response) => {
@@ -815,6 +808,8 @@
       this.getList();
     },
     handleQuery() {
+      console.log(this.topqueryParams.type);
+
       this.topqueryParams.pageNum = 1;
       this.getList();
     },
@@ -822,8 +817,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