From 17b041e2e7ebd5afe75403fefc57cc6a88b51dad Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 06 八月 2024 13:23:58 +0800
Subject: [PATCH] 测试完成

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

diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 1945b3c..356ca4a 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -12,12 +12,18 @@
         label-width="98px"
       >
         <el-form-item label="浠诲姟鍚嶇О">
-          <el-input v-model="topqueryParams.name"></el-input>
+          <el-input
+            v-model="topqueryParams.taskName"
+            @keyup.enter.native="handleQuery"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="瀹℃牳浜�">
-          <el-input v-model="topqueryParams.name"></el-input>
+        <el-form-item label="鍒涘缓浜�">
+          <el-input
+            v-model="topqueryParams.createBy"
+            @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"
@@ -28,32 +34,17 @@
             end-placeholder="缁撴潫鏃ユ湡"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="闅忚绫诲瀷" prop="status">
-          <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
-            <el-option
-              v-for="item in topicoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
+
+        <el-form-item label="鏈嶅姟椤圭洰" prop="status">
+          <el-input
+            v-model="topqueryParams.templatename"
+            @keyup.enter.native="handleQuery"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="妯$増" prop="status">
-          <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+        <el-form-item label="浠诲姟鐘舵��" prop="status">
+          <el-select v-model="topqueryParams.sendState" placeholder="璇烽�夋嫨">
             <el-option
-              v-for="item in topicoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="闂ㄨ瘖闅忚鐘舵��" prop="status">
-          <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
-            <el-option
-              v-for="item in topicoptions"
+              v-for="item in dict.type.task_status"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -125,19 +116,18 @@
               :columns="columns"
             ></right-toolbar> -->
       <el-table v-loading="loading" :data="userList">
-        <el-table-column
+        <!-- <el-table-column
           label="搴忓彿"
           fixed
           align="center"
           key="taskid"
           prop="taskid"
-        />
+        /> -->
 
         <el-table-column
           label="浠诲姟鍚嶇О"
           fixed
           align="center"
-          sortable
           key="taskName"
           prop="taskName"
           :show-overflow-tooltip="true"
@@ -147,6 +137,12 @@
           align="center"
           key="taskDesc"
           prop="taskDesc"
+        />
+        <el-table-column
+          label="鏈嶅姟椤圭洰"
+          align="center"
+          key="templatename"
+          prop="templatename"
         />
         <el-table-column
           label="寰呮墽琛�/鎬讳换鍔�"
@@ -436,7 +432,7 @@
         },
         {
           value: "6",
-          label: "闂嵎鏈嶅姟",
+          label: "鎮h�呮姤鍛�",
         },
       ],
       tasktopic: "2", //鏂板绫诲瀷
@@ -654,12 +650,14 @@
         this.taskoptions,
         this.tasktopic
       );
-      getTasklist(this.topqueryParams).then((response) => {
-        this.userList = response.rows;
-        this.total = response.total;
-        this.$forceUpdate();
-        this.loading = false;
-      });
+      getTasklist(this.addDateRange(this.topqueryParams, this.dateRange)).then(
+        (response) => {
+          this.userList = response.rows;
+          this.total = response.total;
+          this.$forceUpdate();
+          this.loading = false;
+        }
+      );
     },
     // 鏌ョ湅闂ㄨ瘖闅忚璇︽儏
     Referencequestion(row) {

--
Gitblit v1.9.3