From a83bd1ab06e6785a7ec5e5453cf6fb6b2cc0c4e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 9 Mar 2022 22:46:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmTask/XmTaskMng.vue | 28 +++++++++++++++-----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 207e1b2c..e8abd39d 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -6,26 +6,25 @@
         class="padding-left"
         :class="{ 'flex-box': displayType == 'agil' }"
       >
-        <el-row>
-          <el-select
-            v-model="filters.taskState"
-            placeholder="任务状态"
-            clearable 
-            style="width: 100px"
-          > 
+        <el-row>  
+					<el-select style="width: 100px" v-model="filters.taskState" placeholder="任务状态">
+									<el-option value="0" label="待领取"></el-option>
+									<el-option value="1" label="已领取执行中"></el-option>
+									<el-option value="2" label="已完工"></el-option>
+									<el-option value="3" label="已结算"></el-option> 
           </el-select>
           <el-select
             v-model="selkey"
-            placeholder="任务状态"
+            placeholder="场景"
             clearable
             @change="changeSelKey"
             style="width: 100px"
           >
-            <el-option class="showall" value="" label="全部状态"
-              >全部状态</el-option
+            <el-option class="showall" value="" label="全部场景"
+              >全部场景</el-option
             >
-            <el-option value="work" label="未完成">未完成</el-option>
-            <el-option value="finish" label="已完成">已完成</el-option>
+            <el-option value="work" label="未达到100%">未达到100%</el-option>
+            <el-option value="finish" label="已达100%">已达100%</el-option>
             <el-option value="myFocus" label="我关注">我关注</el-option>
             <el-option value="myExecuserStatus0" label="我排队"
               >我排队</el-option
@@ -429,6 +428,7 @@
                    
                 </template>
               </el-table-column>
+              
               <el-table-column
                 sortable
                 prop="name"
@@ -1169,6 +1169,7 @@ export default {
         executor: null, //执行人
         taskType: "",
         tags: [],
+        taskState:'',//任务状态
       },
       xmTasks: [], //查询结果
       pageInfo: {
@@ -2326,6 +2327,9 @@ export default {
           "myExecuserStatus".length
         );
       }
+      if(this.filters.taskState){
+        params.taskState=this.filters.taskState
+      }
       if (this.filters.selProject) {
         params.projectId = this.filters.selProject.id;
       }