From 83898e6b7ff3996fcef889042442a25753b07dea Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 24 九月 2024 14:00:24 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/tasklist/index.vue |  113 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 59 insertions(+), 54 deletions(-)

diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 1ebd6f8..1f385ea 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -35,7 +35,7 @@
           ></el-date-picker>
         </el-form-item>
 
-        <el-form-item label="鏈嶅姟椤圭洰" prop="status">
+        <el-form-item label="浠诲姟妯℃澘" prop="status">
           <el-input
             v-model="topqueryParams.templatename"
             @keyup.enter.native="handleQuery"
@@ -82,6 +82,20 @@
             </el-option>
           </el-select>
         </el-col>
+        <!-- <el-col :span="1.5">
+          <el-select
+            v-model="longTask"
+            placeholder="璇烽�夋嫨浠诲姟绫诲瀷"
+          >
+            <el-option
+              v-for="item in longtermlist"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-col> -->
         <el-col :span="1.5">
           <el-button
             type="primary"
@@ -89,11 +103,11 @@
             size="medium"
             @click="handleAdd"
             :disabled="!tasktopic"
-            >鏂板</el-button
+            >鏂板缓浠诲姟</el-button
           >
         </el-col>
 
-        <el-col :span="19">
+        <!-- <el-col :span="19">
           <div class="documentf">
             <div class="document">
               <el-button
@@ -107,7 +121,7 @@
               >
             </div>
           </div>
-        </el-col>
+        </el-col> -->
         <!-- <el-col :span="1.5"> </el-col> -->
       </el-row>
       <!-- <right-toolbar
@@ -127,6 +141,7 @@
         <el-table-column
           label="浠诲姟鍚嶇О"
           fixed
+          width="120"
           align="center"
           key="taskName"
           prop="taskName"
@@ -134,15 +149,19 @@
         />
         <el-table-column
           label="浠诲姟鎻忚堪"
+          width="280"
           align="center"
           key="taskDesc"
           prop="taskDesc"
+          :show-overflow-tooltip="true"
         />
         <el-table-column
           label="鏈嶅姟椤圭洰"
+          width="120"
           align="center"
           key="templatename"
           prop="templatename"
+          :show-overflow-tooltip="true"
         />
         <el-table-column
           label="寰呮墽琛�/鎬讳换鍔�"
@@ -152,6 +171,17 @@
         >
           <template slot-scope="scope">
             <span>{{ scope.row.wfs }}/{{ scope.row.yfs }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="鏄惁闀挎湡浠诲姟"
+          align="center"
+          key="longTask"
+          prop="longTask"
+          width="120"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.longTask?'闀挎湡浠诲姟':'闈為暱鏈�' }}</span>
           </template>
         </el-table-column>
 
@@ -199,7 +229,7 @@
         >
           <template slot-scope="scope">
             <el-button
-              v-if="scope.row.sendState == 1 || scope.row.sendState == 3"
+              v-if="(scope.row.sendState == 1 || scope.row.sendState == 3)&&!scope.row.longTask"
               size="medium"
               type="text"
               @click="sponsor(scope.row)"
@@ -207,10 +237,14 @@
                 ><i class="el-icon-s-promotion"></i>鍙戣捣</span
               ></el-button
             >
-
-            <el-button size="medium" type="text" @click="newAdd(scope.row)"
+            <!-- <el-button size="medium" type="text" @click="newAdd(scope.row)"
               ><span class="button-xj"
                 ><i class="el-icon-circle-plus-outline"></i>缁堟</span
+              ></el-button
+            > -->
+            <el-button size="medium" type="text" @click="handleUpdate(scope.row,1)"
+              ><span class="button-xj"
+                ><i class="el-icon-circle-plus-outline"></i>渚濈収鏂板</span
               ></el-button
             >
             <el-button
@@ -393,6 +427,7 @@
       postOptions: [],
       // 瑙掕壊閫夐」
       roleOptions: [],
+      longTask:0,
       taskform: {
         showDate: [],
         showTimeMorn: [],
@@ -414,6 +449,16 @@
       previewvalue: {
         username: "杩欎釜鍖荤敓瀵逛綘鎬庝箞鏍�",
       },
+      longtermlist:[
+      {
+          value: '1',
+          label: "闀挎湡浠诲姟",
+        },
+        {
+          value: '0',
+          label: "鏅�氫换鍔�",
+        },
+      ],
       taskoptions: [
         {
           value: "1",
@@ -556,24 +601,6 @@
       propss: { multiple: true },
       options: [],
 
-      topicoptions: [
-        {
-          value: 1,
-          label: "寰呭鏍�",
-        },
-        {
-          value: 2,
-          label: "鎵ц涓�",
-        },
-        {
-          value: 3,
-          label: "鎵ц瀹屾垚",
-        },
-        {
-          value: 4,
-          label: "宸插仠姝�",
-        },
-      ],
       // 琛ㄥ崟鏍¢獙
       rules: {
         userName: [
@@ -624,6 +651,8 @@
   },
   watch: {},
   created() {
+    this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(obj=>obj.deptCode);
+    this.topqueryParams.leavehospitaldistrictcodes = store.getters.belongWards.map(obj=>obj.districtCode);
     this.tasktopic = this.$route.query.tasktopic
       ? this.$route.query.tasktopic
       : this.tasktopic;
@@ -781,7 +810,7 @@
       }
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
-    handleUpdate(row) {
+    handleUpdate(row,newadd) {
       if (this.topqueryParams.type == 1) {
         this.$router.push({
           path: "/followvisit/particty",
@@ -789,6 +818,7 @@
             id: row.taskid,
             type: this.topqueryParams.type,
             serviceType: this.tasktopic,
+            newadd:newadd,//鏄惁渚濈収鏂板缓
           },
         });
       } else if (this.topqueryParams.type == 2) {
@@ -798,6 +828,7 @@
             id: row.taskid,
             type: this.topqueryParams.type,
             serviceType: this.tasktopic,
+            newadd:newadd,
           },
         });
       } else if (this.topqueryParams.type == 3) {
@@ -807,6 +838,7 @@
             id: row.taskid,
             type: this.topqueryParams.type,
             serviceType: this.tasktopic,
+            newadd:newadd,
           },
         });
       }
@@ -919,34 +951,7 @@
       }
     },
 
-    // 渚濈収鏂板
-    newAdd(row) {
-      this.$modal
-        .confirm("鏄惁渚濈収褰撳墠浠诲姟鍒涘缓鏂颁换鍔★紵")
-        .then(() => {
-          if (this.tasktopic == 5) {
-            this.$router.push({
-              path: "/followvisit/particty",
-              query: { type: 1, id: row.taskid, nhh: 1 },
-            });
-          } 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 == 8 || this.tasktopic == 4) {
-            this.$router.push({
-              path: "/followvisit/Missioncreation",
-              query: { type: 3, id: row.taskid, nhh: 1 },
-            });
-          }
-        })
-        .catch(() => {});
-    },
+
     // 鏆傚仠
     stop(row) {
       console.log(row);

--
Gitblit v1.9.3