From 2c4c416bf7950c72ffa2543a218e4fd993ee2af2 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 12 九月 2024 12:04:32 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/tasklist/index.vue |  141 +++++++++++++++++++++++++++-------------------
 1 files changed, 83 insertions(+), 58 deletions(-)

diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index e569728..1ebd6f8 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -154,6 +154,22 @@
             <span>{{ scope.row.wfs }}/{{ scope.row.yfs }}</span>
           </template>
         </el-table-column>
+
+        <el-table-column
+          label="鐘舵��"
+          align="center"
+          key="sendState"
+          prop="sendState"
+          width="120"
+        >
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.task_status"
+              :value="scope.row.sendState"
+            />
+          </template>
+        </el-table-column>
+
         <el-table-column
           label="鍒涘缓浜�"
           align="center"
@@ -170,29 +186,15 @@
           width="160"
         >
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
+            <span>{{ formatTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="鐘舵��"
-          fixed="right"
-          align="center"
-          key="sendState"
-          prop="sendState"
-          width="120"
-        >
-          <template slot-scope="scope">
-            <dict-tag
-              :options="dict.type.task_status"
-              :value="scope.row.sendState"
-            />
-          </template>
-        </el-table-column>
+
         <el-table-column
           label="鎿嶄綔"
           fixed="right"
           align="center"
-          width="120"
+          width="180"
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
@@ -202,13 +204,13 @@
               type="text"
               @click="sponsor(scope.row)"
               ><span class="button-zx"
-                ><i class="el-icon-s-promotion"></i>浠诲姟鍙戣捣</span
+                ><i class="el-icon-s-promotion"></i>鍙戣捣</span
               ></el-button
             >
 
             <el-button size="medium" type="text" @click="newAdd(scope.row)"
               ><span class="button-xj"
-                ><i class="el-icon-circle-plus-outline"></i>浠诲姟缁堟</span
+                ><i class="el-icon-circle-plus-outline"></i>缁堟</span
               ></el-button
             >
             <el-button
@@ -217,7 +219,7 @@
               type="text"
               @click="stop(scope.row)"
               ><span class="button-zt"
-                ><i class="el-icon-circle-plus-outline"></i>鏆傚仠浠诲姟</span
+                ><i class="el-icon-circle-plus-outline"></i>鏆傚仠</span
               ></el-button
             >
           </template>
@@ -546,6 +548,7 @@
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
+        type: 3,
         userName: undefined,
         tagid: undefined,
         topic: undefined,
@@ -621,6 +624,9 @@
   },
   watch: {},
   created() {
+    this.tasktopic = this.$route.query.tasktopic
+      ? this.$route.query.tasktopic
+      : this.tasktopic;
     this.getList();
     this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
@@ -637,22 +643,24 @@
     /** 鏌ヨ浠诲姟鍒楄〃 */
     getList() {
       this.loading = true;
-      this.tasktopic = this.$route.query.tasktopic
-        ? this.$route.query.tasktopic
-        : this.tasktopic;
+      let type = this.$route.query.type;
+
       this.topqueryParams.serviceType = Number(this.tasktopic);
-      if (this.tasktopic == 1 || this.tasktopic == 7 || this.tasktopic == 6) {
+      this.topqueryParams.type = Number(this.type);
+      if (
+        this.tasktopic == 2 ||
+        this.tasktopic == 3 ||
+        this.tasktopic == 1 ||
+        this.tasktopic == 7 ||
+        this.tasktopic == 6
+      ) {
         this.topqueryParams.type = 2;
         this.TaskOperation.taskType = 2;
       } else if (this.tasktopic == 4 || this.tasktopic == 8) {
-        this.topqueryParams.type = 1;
-        this.TaskOperation.taskType = 3;
-      } else if (
-        this.tasktopic == 2 ||
-        this.tasktopic == 3 ||
-        this.tasktopic == 5
-      ) {
         this.topqueryParams.type = 3;
+        this.TaskOperation.taskType = 3;
+      } else if (this.tasktopic == 5) {
+        this.topqueryParams.type = 1;
         this.TaskOperation.taskType = 1;
       }
       // this.topqueryParams.typename = this.findLabelByValue(
@@ -746,7 +754,7 @@
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
-      if (this.topqueryParams.type == 3) {
+      if (this.topqueryParams.type == 1) {
         this.$router.push({
           path: "/followvisit/particty",
           query: {
@@ -762,7 +770,7 @@
             serviceType: this.tasktopic,
           },
         });
-      } else if (this.topqueryParams.type == 1) {
+      } else if (this.topqueryParams.type == 3) {
         this.$router.push({
           path: "/followvisit/Missioncreation",
           query: {
@@ -774,39 +782,57 @@
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
-      // this.$router.push({
-      //   path: "/followvisit/particty",
-      //   query: { type: this.tasktopic, id: row.taskid },
-      // });
-      if (
-        this.tasktopic == 2 ||
-        this.tasktopic == 3 ||
-        this.tasktopic == 4 ||
-        this.tasktopic == 5
-      ) {
+      if (this.topqueryParams.type == 1) {
         this.$router.push({
           path: "/followvisit/particty",
-          query: { type: 1, id: row.taskid },
+          query: {
+            id: row.taskid,
+            type: this.topqueryParams.type,
+            serviceType: this.tasktopic,
+          },
         });
-      } else if (this.tasktopic == 6) {
+      } else if (this.topqueryParams.type == 2) {
         this.$router.push({
           path: "/followvisit/QuestionnaireTask",
-          query: { type: 2, id: row.taskid },
+          query: {
+            id: row.taskid,
+            type: this.topqueryParams.type,
+            serviceType: this.tasktopic,
+          },
         });
-      } else if (this.tasktopic == 1) {
+      } else if (this.topqueryParams.type == 3) {
         this.$router.push({
           path: "/followvisit/Missioncreation",
-          query: { type: 3, id: row.taskid },
+          query: {
+            id: row.taskid,
+            type: this.topqueryParams.type,
+            serviceType: this.tasktopic,
+          },
         });
       }
     },
     // 鍒犻櫎浠诲姟
-    deletefn() {},
+    deletefn(row) {
+      this.$modal
+        .confirm(
+          '鏄惁鍒犻櫎浠诲姟鍚嶇О涓�"' +
+            row.taskName +
+            '"鐨勬暟鎹」锛屽垹闄ゅ悗涓嶅彲鎾ゅ洖锛佹槸鍚︾户缁�'
+        )
+        .then(() => {
+          delTaskInfo(row.taskid).then((res) => {
+            if (res.code == 200) {
+              this.getList();
+              this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+            }
+          });
+        })
+        .catch(() => {});
+    },
     // 浠诲姟鍙戣捣
     sponsor(row) {
       console.log(row, "浠诲姟淇℃伅");
       this.taskform = row;
-      console.log(12);
       if (this.taskform.showDate && this.taskform.sendType != 2) {
         this.taskform.showDate = this.taskform.showDate.split(",");
       }
@@ -898,22 +924,21 @@
       this.$modal
         .confirm("鏄惁渚濈収褰撳墠浠诲姟鍒涘缓鏂颁换鍔★紵")
         .then(() => {
-          if (
-            this.tasktopic == 2 ||
-            this.tasktopic == 3 ||
-            this.tasktopic == 4 ||
-            this.tasktopic == 5
-          ) {
+          if (this.tasktopic == 5) {
             this.$router.push({
               path: "/followvisit/particty",
               query: { type: 1, id: row.taskid, nhh: 1 },
             });
-          } else if (this.tasktopic == 6) {
+          } else if (
+            this.tasktopic == 2 ||
+            this.tasktopic == 3 ||
+            this.tasktopic == 6
+          ) {
             this.$router.push({
               path: "/followvisit/QuestionnaireTask",
               query: { type: 2, id: row.taskid, nhh: 1 },
             });
-          } else if (this.tasktopic == 1) {
+          } else if (this.tasktopic == 8 || this.tasktopic == 4) {
             this.$router.push({
               path: "/followvisit/Missioncreation",
               query: { type: 3, id: row.taskid, nhh: 1 },

--
Gitblit v1.9.3