From 964e6cacbd89c3b2a70bba450ffdb59b2fc888e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 21 Mar 2022 04:01:41 +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/xmProject/XmProjectCost.vue |  4 ++--
 .../XmProjectMCostUserMng.vue                 |  8 +-------
 src/views/xm/core/xmTask/XmTaskMng.vue        | 19 +++++++++++++------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/views/xm/core/xmProject/XmProjectCost.vue b/src/views/xm/core/xmProject/XmProjectCost.vue
index 3fdb17fc..280da81f 100644
--- a/src/views/xm/core/xmProject/XmProjectCost.vue
+++ b/src/views/xm/core/xmProject/XmProjectCost.vue
@@ -88,10 +88,10 @@
 				<xm-cost-user v-if="showType == '人力'" :sel-project="selProject"></xm-cost-user>
 				<xm-cost-nouser v-else  :sel-project="selProject"></xm-cost-nouser>
 			</div>
-			<el-drawer title="查看人力支出明细" :visible.sync="costUserVisible"  fullscreen  append-to-body   :close-on-click-modal="false">
+			<el-drawer title="查看人力支出明细" :visible.sync="costUserVisible"  size="60%"  append-to-body   :close-on-click-modal="false">
 				<xm-cost-user :cost-user="costUser" :visible="costUserVisible" :field-name="fieldName" :query-type="queryType" :sel-project="selProject"></xm-cost-user>
 			</el-drawer> 
-			<el-drawer title="查看非人力支出明细" :visible.sync="costNouserVisible"  fullscreen  append-to-body   :close-on-click-modal="false">
+			<el-drawer title="查看非人力支出明细" :visible.sync="costNouserVisible"  size="60%"   append-to-body   :close-on-click-modal="false">
 				<xm-cost-nouser :cost-nouser="costNouser" :visible="costNouserVisible" :field-name="fieldName" :query-type="queryType" :sel-project="selProject"></xm-cost-nouser>
 			</el-drawer> 
 		</el-row>
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
index 3addf98d..305c16fb 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
@@ -9,15 +9,9 @@
 			
 			<el-button type="primary" v-if="batchEditVisible==false"  @click="showAdd" icon="el-icon-plus"></el-button>
 			<el-button   v-if="batchEditVisible==false" @click="batchEditVisible=true" icon="el-icon-edit"></el-button> 
-			<el-button type="primary" v-if="batchEditVisible==true" @click="batchSave"> icon="el-icon-finish">保存</el-button>  
+			<el-button type="primary" v-if="batchEditVisible==true" @click="batchSave"  icon="el-icon-finish">保存</el-button>  
 			<el-button   v-if="batchEditVisible==true" @click="noBatchEdit" icon="el-icon-back">返回</el-button> 
 			<el-button type="danger" v-if="batchEditVisible==false"  v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true"  icon="el-icon-delete"></el-button>  
-			<font class="hidden-md-and-down">	
-				<span style="margin-left:10px;font-size:14px;">项目总成本：</span><el-tag type='success'> {{selProject.planTotalCost}}</el-tag> 
-				<span style="margin-left:10px;font-size:14px;">非人力总成本：</span><el-tag type='warning'>{{selProject.planNouserAt}}</el-tag>  
-				<span style="margin-left:10px;font-size:14px;">内部人力总成本：</span><el-tag type='warning'>{{selProject.planIuserAt}}</el-tag>  
-				<span style="margin-left:10px;font-size:14px;">外购人力总成本：</span><el-tag type='warning'>{{selProject.planOuserAt}}</el-tag>  
-			</font>
 		</el-row>
 		<el-row class="page-main "> 
 			<!--列表 XmProjectMCostUser xm_project_m_budget_cost_user-->
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 6c996e02..a83ea22d 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -17,10 +17,7 @@
               <el-link type="warning" @click="projectVisible=true" slot="reference" v-if="!selProject||!selProject.id"  icon="el-icon-search"><font style="font-size:14px;">{{filters.selProject?filters.selProject.name:'选择项目'}}</font></el-link>
           </el-popover>
 					<el-select style="width: 100px" v-model="filters.taskState" placeholder="状态" clearable>
-									<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-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.taskState" :key="index"></el-option> 
           </el-select>
           <el-select
             v-model="selkey"
@@ -413,7 +410,16 @@
 
                 </template>
               </el-table-column>
-
+              
+              <el-table-column
+                label="状态"
+                type="taskState"
+                width="100"
+              >
+                <template slot-scope="scope">
+                    {{formateOption("taskState",scope.row.taskState)}}
+                </template>
+              </el-table-column>
               <el-table-column
                 sortable
                 prop="name"
@@ -1170,6 +1176,7 @@ export default {
         planType: [],
         priority: [],
         xmTaskSettleSchemel: [],
+        taskState:[],
       }, //下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
 
       addFormVisible: false, //新增xmTask界面是否显示
@@ -2484,7 +2491,7 @@ export default {
     this.$nextTick(() => {
       this.getXmTasks();
       this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
-      initSimpleDicts( "all", ["planType","taskType","urgencyLevel","xmTaskSettleSchemel","priority" ]).then((res) => {
+      initSimpleDicts( "all", ["planType","taskType","urgencyLevel","xmTaskSettleSchemel","priority","taskState" ]).then((res) => {
         this.dicts = res.data.data;
       });
     });