From 8904734d9acaac1341ba6c65501792e7fb916d56 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 15 八月 2024 09:42:55 +0800
Subject: [PATCH] 测试完成

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

diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index cd4b95d..e569728 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -415,27 +415,36 @@
       taskoptions: [
         {
           value: "1",
-          label: "瀹f暀鏈嶅姟",
+          label: "鐩戞祴璇勪及",
         },
         {
           value: "2",
-          label: "闂ㄨ瘖闅忚",
-        },
-        {
-          value: "3",
           label: "鍑洪櫌闅忚",
         },
         {
+          value: "3",
+          label: "闂ㄨ瘖闅忚",
+        },
+        {
           value: "4",
-          label: "澶嶈瘖鏈嶅姟",
+          label: "瀹f暀鍏虫��",
         },
         {
           value: "5",
-          label: "浣撴閫氱煡",
+          label: "澶嶈瘖绠$悊",
         },
         {
           value: "6",
+          label: "婊℃剰搴﹁皟鏌�",
+        },
+        {
+          value: "7",
           label: "鎮h�呮姤鍛�",
+        },
+
+        {
+          value: "8",
+          label: "鍏朵粬閫氱煡",
         },
       ],
       tasktopic: "2", //鏂板绫诲瀷
@@ -616,7 +625,7 @@
     this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
     });
-    this.taskoptions = store.getters.Serviceauthority;
+    // this.taskoptions = store.getters.Serviceauthority;
   },
   // 鎼滅储
   mounted() {
@@ -631,30 +640,25 @@
       this.tasktopic = this.$route.query.tasktopic
         ? this.$route.query.tasktopic
         : this.tasktopic;
-      if (this.tasktopic == 1) {
-        this.topqueryParams.type = 3;
-        this.TaskOperation.taskType = 3;
-      } else if (this.tasktopic == 2) {
-        this.topqueryParams.type = 1;
-        this.TaskOperation.taskType = 1;
-      } else if (this.tasktopic == 3) {
-        this.topqueryParams.type = 1;
-        this.TaskOperation.taskType = 1;
-      } else if (this.tasktopic == 4) {
-        this.topqueryParams.type = 1;
-        this.TaskOperation.taskType = 1;
-      } else if (this.tasktopic == 5) {
-        this.topqueryParams.type = 1;
-
-        this.TaskOperation.taskType = 1;
-      } else if (this.tasktopic == 6) {
+      this.topqueryParams.serviceType = Number(this.tasktopic);
+      if (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 = 1;
       }
-      this.topqueryParams.typename = this.findLabelByValue(
-        this.taskoptions,
-        this.tasktopic
-      );
+      // this.topqueryParams.typename = this.findLabelByValue(
+      //   this.taskoptions,
+      //   this.tasktopic
+      // );
       getTasklist(this.addDateRange(this.topqueryParams, this.dateRange)).then(
         (response) => {
           this.userList = response.rows;
@@ -742,27 +746,29 @@
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
-      const typename = this.findLabelByValue(this.taskoptions, this.tasktopic);
-
-      if (
-        this.tasktopic == 2 ||
-        this.tasktopic == 3 ||
-        this.tasktopic == 4 ||
-        this.tasktopic == 5
-      ) {
+      if (this.topqueryParams.type == 3) {
         this.$router.push({
           path: "/followvisit/particty",
-          query: { type: 1, typename: typename },
+          query: {
+            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, typename: typename },
+          query: {
+            type: this.topqueryParams.type,
+            serviceType: this.tasktopic,
+          },
         });
-      } else if (this.tasktopic == 1) {
+      } else if (this.topqueryParams.type == 1) {
         this.$router.push({
           path: "/followvisit/Missioncreation",
-          query: { type: 3, typename: typename },
+          query: {
+            type: this.topqueryParams.type,
+            serviceType: this.tasktopic,
+          },
         });
       }
     },

--
Gitblit v1.9.3