From 09a1bd58e04706d7e1d6e1543b990c08a4b8f97c Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 16 一月 2025 13:57:03 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/tasklist/index.vue |  109 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 71 insertions(+), 38 deletions(-)

diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 0d4f58b..454091a 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -69,9 +69,9 @@
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-select
-            @change="handleQuery"
+            @change="handleQuerytask"
             v-model="tasktopic"
-            placeholder="璇烽�夋嫨鏂板绫诲瀷"
+            placeholder="璇烽�夋嫨鏈嶅姟绫诲瀷"
           >
             <el-option
               v-for="item in taskoptions"
@@ -82,10 +82,11 @@
             </el-option>
           </el-select>
         </el-col>
-        <!-- <el-col :span="1.5">
+        <el-col :span="1.5">
           <el-select
-            v-model="longTask"
-            placeholder="璇烽�夋嫨浠诲姟绫诲瀷"
+            @change="handleQuery"
+            v-model="topqueryParams.type"
+            placeholder="璇烽�夋嫨鎵ц绫诲瀷"
           >
             <el-option
               v-for="item in longtermlist"
@@ -95,7 +96,7 @@
             >
             </el-option>
           </el-select>
-        </el-col> -->
+        </el-col>
         <el-col :span="1.5">
           <el-button
             type="primary"
@@ -420,7 +421,7 @@
       // 鐢ㄦ埛琛ㄦ牸鏁版嵁
       userList: null,
       // 寮瑰嚭灞傛爣棰�
-      title: "鏂板闂ㄨ瘖闅忚",
+      title: "鏂板褰卞儚闅忚",
       // 鏄惁鏄剧ず淇敼銆佹坊鍔犲脊鍑哄眰
       addalteropen: false,
       // 閮ㄩ棬鍚嶇О
@@ -444,31 +445,35 @@
       dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」
       inputVisible: false,
       inputValue: "",
-      previewVisible: false, //闂ㄨ瘖闅忚棰勮寮规
+      previewVisible: false, //褰卞儚闅忚棰勮寮规
       TaskOperation: {},
       radio: "",
       radios: [],
-      previewtype: 2, //棰勮闂ㄨ瘖闅忚绫诲瀷
+      previewtype: 2, //棰勮褰卞儚闅忚绫诲瀷
       total: 0, // 鎬绘潯鏁�
-      ImportQuantity: 999, //瀵奸棬璇婇殢璁挎暟閲�
-      //棰勮闂ㄨ瘖闅忚淇℃伅
+      ImportQuantity: 999, //瀵煎奖鍍忛殢璁挎暟閲�
+      //棰勮褰卞儚闅忚淇℃伅
       previewvalue: {
         username: "杩欎釜鍖荤敓瀵逛綘鎬庝箞鏍�",
       },
       longtermlist: [
         {
-          value: "1",
-          label: "闀挎湡浠诲姟",
+          value: 1,
+          label: "璇煶闅忚",
         },
         {
-          value: "0",
-          label: "鏅�氫换鍔�",
+          value: 2,
+          label: "闂嵎闅忚",
+        },
+        {
+          value: 3,
+          label: "瀹f暀鍏虫��",
         },
       ],
       taskoptions: [
         {
           value: "1",
-          label: "鐩戞祴璇勪及",
+          label: "蹇冪數闅忚",
         },
         {
           value: "2",
@@ -476,7 +481,7 @@
         },
         {
           value: "3",
-          label: "闂ㄨ瘖闅忚",
+          label: "褰卞儚闅忚",
         },
         {
           value: "4",
@@ -484,7 +489,7 @@
         },
         {
           value: "5",
-          label: "澶嶈瘖绠$悊",
+          label: "浣撴闅忚",
         },
         {
           value: "6",
@@ -599,14 +604,14 @@
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
-        type: 3,
+        type: 2,
         userName: undefined,
         tagid: undefined,
         topic: undefined,
       },
       propss: { multiple: true },
       options: [],
-
+      checkboxlist: [],
       // 琛ㄥ崟鏍¢獙
       rules: {
         userName: [
@@ -669,7 +674,7 @@
     this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
     });
-    // this.taskoptions = store.getters.Serviceauthority;
+    this.checkboxlist = store.getters.checkboxlist;
   },
   activated() {
     this.getList();
@@ -684,10 +689,9 @@
     /** 鏌ヨ浠诲姟鍒楄〃 */
     getList() {
       this.loading = true;
-      let type = this.$route.query.type;
+      console.log(this.topqueryParams.type);
 
       this.topqueryParams.serviceType = Number(this.tasktopic);
-      this.topqueryParams.type = Number(this.type);
       if (
         this.tasktopic == 2 ||
         this.tasktopic == 3 ||
@@ -695,14 +699,37 @@
         this.tasktopic == 7 ||
         this.tasktopic == 6
       ) {
-        this.topqueryParams.type = 2;
-        this.TaskOperation.taskType = 2;
+        if (!this.topqueryParams.type) this.topqueryParams.type = '2';
+        this.longtermlist = [
+          {
+            value: 1,
+            label: "璇煶闅忚",
+          },
+          {
+            value: 2,
+            label: "闂嵎闅忚",
+          },
+        ];
       } else if (this.tasktopic == 4 || this.tasktopic == 8) {
-        this.topqueryParams.type = 3;
-        this.TaskOperation.taskType = 3;
+        if (!this.topqueryParams.type) this.topqueryParams.type = '3';
+        this.longtermlist = [
+          {
+            value: 3,
+            label: "瀹f暀鍏虫��",
+          },
+        ];
       } else if (this.tasktopic == 5) {
-        this.topqueryParams.type = 1;
-        this.TaskOperation.taskType = 1;
+        if (!this.topqueryParams.type) this.topqueryParams.type = '1';
+        this.longtermlist = [
+          {
+            value: 1,
+            label: "璇煶闅忚",
+          },
+          {
+            value: 2,
+            label: "闂嵎闅忚",
+          },
+        ];
       }
       // this.topqueryParams.typename = this.findLabelByValue(
       //   this.taskoptions,
@@ -710,16 +737,14 @@
       // );
       this.topqueryParams.startOutHospTime = this.dateRange[0];
       this.topqueryParams.endOutHospTime = this.dateRange[1];
-      getTasklist(this.topqueryParams).then(
-        (response) => {
-          this.userList = response.rows;
-          this.total = response.total;
-          this.$forceUpdate();
-          this.loading = false;
-        }
-      );
+      getTasklist(this.topqueryParams).then((response) => {
+        this.userList = response.rows;
+        this.total = response.total;
+        this.$forceUpdate();
+        this.loading = false;
+      });
     },
-    // 鏌ョ湅闂ㄨ瘖闅忚璇︽儏
+    // 鏌ョ湅褰卞儚闅忚璇︽儏
     Referencequestion(row) {
       this.previewVisible = true;
     },
@@ -757,6 +782,11 @@
       this.resetForm("form");
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuerytask() {
+      this.topqueryParams.pageNum = 1;
+      // this.topqueryParams.type = '';
+      this.getList();
+    },
     handleQuery() {
       this.topqueryParams.pageNum = 1;
       this.getList();
@@ -901,6 +931,7 @@
         this.taskformVisible = true;
       } else if (this.taskform.sendState != 2 && this.taskform.sendType == 2) {
         this.TaskOperation.taskId = row.taskid;
+        this.TaskOperation.taskType = this.topqueryParams.type;
         this.TaskOperation.sendState = 2;
         this.TaskOperation.sendType = 2;
         this.$modal
@@ -926,6 +957,7 @@
     confirmSponsor(row) {
       if (this.activname == 0) {
         this.TaskOperation.taskId = row.taskid;
+        this.TaskOperation.taskType = this.topqueryParams.type;
         this.TaskOperation.sendState = 2;
         TaskTemplateSendExecution(this.TaskOperation).then((res) => {
           if (res.code == 200) {
@@ -943,6 +975,7 @@
     immediateExecution(row) {
       console.log(row, "浠诲姟淇℃伅");
       if (row.sendState != 2) {
+        this.TaskOperation.taskType = this.topqueryParams.type;
         this.TaskOperation.taskId = row.taskid;
         this.TaskOperation.sendState = 2;
         this.TaskOperation.sendType = 2;

--
Gitblit v1.9.3