From 41f7a0bfcc9449b3811078e88b59477f8748779e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 29 Mar 2022 02:17:06 +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/XmTaskAdd.vue      |  19 +-
 src/views/xm/core/xmTask/XmTaskEdit.vue     | 344 +++++++++++---------
 src/views/xm/core/xmTask/XmTaskMng.vue      |   2 +-
 src/views/xm/core/xmTask/XmTaskMngBatch.vue |   4 +-
 4 files changed, 202 insertions(+), 167 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index b828bf07..16fbf723 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -151,7 +151,7 @@
 						</el-form-item> 
 					</el-tab-pane>
 					
-					<el-tab-pane label="需求" name="3">  
+					<el-tab-pane label="需求" name="3" v-if="addForm.ntype==='0'">  
 						
 						<el-row>
 							<el-col :span="12"> 
@@ -167,19 +167,22 @@
 							</el-col> 
 						</el-row>
 					</el-tab-pane>
-					<el-tab-pane label="子工作项" name="4">  
+					<el-tab-pane label="子工作项" name="4" v-if="false">  
 
 					</el-tab-pane>
 					<el-tab-pane label="工时" name="5"> 
 						<el-row>
-							<el-col :span="12">  
+							<el-col :span="8">  
 								<el-form-item label="数据收集方式" prop="calcType">
-									<el-radio   v-model="addForm.calcType"  label="0" placeholder="不统计" :disabled="addForm.ntype==='0'">不收集</el-radio>
-									<el-radio   v-model="addForm.calcType"  label="1" placeholder="下级往上级汇总" :disabled="addForm.ntype==='0'">下往上</el-radio>
- 									<el-radio   v-model="addForm.calcType"  label="2" placeholder="手工填报" :disabled="addForm.ntype==='1'">手工填报</el-radio>
+									
+									<el-select v-model="addForm.calcType">
+										<el-option label="不统计"  value="0"></el-option>
+										<el-option label="下级往上级汇总"  value="1"></el-option>
+										<el-option label="手工填报"  value="2"></el-option>
+									</el-select>   
 								</el-form-item>  
 							</el-col>
-							<el-col :span="6"> 
+							<el-col :span="8"> 
 								<el-form-item label="报工方式" prop="wtype" > 
 									<el-select v-model="addForm.wtype">
 										<el-option label="无须报工"  value="0"></el-option>
@@ -188,7 +191,7 @@
 									</el-select>  
 								</el-form-item>
 							</el-col>  
-							<el-col :span="6"> 
+							<el-col :span="8"> 
 								<el-form-item label="工时进度" prop="rate" >
 									<el-progress style="width:60%;" :text-inside="true" :stroke-width="15" :percentage="addForm.rate?addForm.rate:0"></el-progress>
 								</el-form-item>
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 64676828..baedd24e 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -1,11 +1,9 @@
 <template>
-	<section class="page-container padding">  
-		<el-row class="page-main ">
+	<section>  
+		<el-row>
 			<!--新增界面 XmTask xm_task--> 
-			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">    
-				<el-collapse value="1" accordion>
-					<el-collapse-item title="基础信息" name="1"> 
-						<el-row>
+			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm"> 
+						<el-row :gutter="10">
 							<el-col :span="6">
 								<el-form-item label="序号" prop="sortLevel" >  
 									<template slot="label"> 
@@ -26,28 +24,18 @@
 							
 						</el-row>
 						
-						<el-row> 
-							<el-col :span="6">
-								<el-form-item  label="" prop="milestone">  
-									<el-checkbox v-model="editForm.milestone" :true-label="1" :false-label="0">里程碑</el-checkbox>
-								</el-form-item> 
-							</el-col>
-							<el-col :span="9">  
-								<el-form-item  label="" prop="tagNames" label-width="0">   
-									<el-tag v-if="editForm.tagNames">{{editForm.tagNames?editForm.tagNames:''}} </el-tag>
-									<el-button type="text" icon="el-icon-plus" @click="tagSelectVisible=true">标签</el-button> 
-								</el-form-item>   
-							</el-col>  
-							<el-col :span="9"> 
-								<el-form-item prop="skill" label=""  v-if="editForm.ntype!='1'"  label-width="0"> 
-									<el-tag class="fs-ft" style="margin-right:10px" v-for="(item,i) in taskSkills" :key="i">{{item.taskSkillName}}</el-tag>
-									<el-button   type="text" @click.stop="showSkill()" icon="el-icon-plus">技能</el-button>
-								</el-form-item> 
-							</el-col>  
-						</el-row>
-						<el-divider></el-divider>
+						
 						<el-row>
-							<el-col :span="12">
+							<el-col :span="8"> 
+								 <el-form-item v-if="editForm.ptype==='0'" label="归属项目" prop="projectId"> 
+									{{editForm.projectName?editForm.projectName:editForm.projectId}}
+								</el-form-item>
+								
+								<el-form-item v-if="editForm.ptype==='1'" label="归属产品" prop="productId">
+									{{editForm.productName?editForm.productName:editForm.productId}}
+								</el-form-item>
+							</el-col>
+							<el-col :span="8"> 
 								 <el-form-item label="上级计划" prop="parentTaskname">  
 									<template slot="label"> 
 										<div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
@@ -58,14 +46,85 @@
 									<font v-if="editForm.parentTaskid" >{{editForm.parentTaskname?editForm.parentTaskname:editForm.parentTaskid}}</font> 
 									<font v-else>无上级(视为顶级)</font> 
 								</el-form-item>
+							</el-col> 
+							<el-col :span="8"> 
+								<el-form-item label="总负责人"> 
+									<el-tag  v-if="editForm.createUserid" style="margin-left:10px;border-radius:30px;"  >{{editForm.createUsername}}</el-tag>
+									<el-button type="text" @click="showGroupUserSelect(editForm)" icon="el-icon-setting">设置负责人</el-button>
+								</el-form-item> 
+							</el-col>  
+						</el-row>
+						<el-row>
+							<el-col :span="8"> 
+								<el-form-item :label="editForm.ntype=='0'?'任务状态':'计划状态'">  
+									<el-select v-model="editForm.taskState">
+										<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-form-item> 
+							</el-col>
+							<el-col :span="8"> 
+								<el-form-item label="当前进度" prop="rate">
+									<el-slider   
+										v-model="editForm.rate"
+										show-input>
+									</el-slider> 
+								</el-form-item>  
+							</el-col>  
+							<el-col :span="8"> 
+								<el-form-item label="预计时间"> 
+											
+										<el-date-picker  
+										 style="display:inline;"
+											v-model="budgetDateRanger"
+											@change="onBudgetDateRangerChange" 
+											type="daterange"
+											align="right"
+											unlink-panels
+											range-separator="-"
+											start-placeholder="开始日期"
+											end-placeholder="完成日期"
+											value-format="yyyy-MM-dd HH:mm:ss"
+											:default-time="['00:00:00','23:59:59']"
+											:picker-options="pickerOptions"
+										></el-date-picker>
+								</el-form-item>  
+							</el-col> 
+
+							
+						</el-row>
+					<el-tabs value="1" accordion>
+						<el-tab-pane label="基础信息" name="1"> 	
+						<el-row>  
+							<el-col :span="10">
+								<el-form-item  label="" prop="milestone">  
+									<el-checkbox v-model="editForm.milestone" :true-label="1" :false-label="0">里程碑</el-checkbox>
+									<el-checkbox v-model="editForm.taskOut" @change="onTaskOutChange" true-label="1" false-label="0">众包</el-checkbox>
+								</el-form-item> 
+							</el-col> 
+							<el-col :span="14"> 
+								<el-form-item prop="skill" label=""  v-if="editForm.ntype!='1'"  label-width="0"> 
+									<el-tag class="fs-ft" style="margin-right:10px" v-for="(item,i) in taskSkills" :key="i">{{item.taskSkillName}}</el-tag>
+									<el-button   type="text" @click.stop="showSkill()" icon="el-icon-plus">技能要求</el-button>
+								</el-form-item> 
+							</el-col>  
+						</el-row> 
+						<el-row> 
+							
+							<el-col :span="12">
+								<el-form-item  label="优先级别" prop="level">  
+									<el-select v-model="editForm.level">
+											<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option> 
+									</el-select>    
+								</el-form-item>  
 							</el-col>
 							<el-col :span="12"> 
-								 <el-form-item v-if="editForm.ptype==='0'" label="归属项目" prop="projectId"> 
-									{{editForm.projectName?editForm.projectName:editForm.projectId}}
-								</el-form-item>
-								
-								<el-form-item v-if="editForm.ptype==='1'" label="归属产品" prop="productId">
-									{{editForm.productName?editForm.productName:editForm.productId}}
+								<el-form-item label="工期类型"> 
+								<el-select v-model=" editForm.planType">
+									<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+								</el-select> 
 								</el-form-item>
 							</el-col>
 						</el-row> 
@@ -76,153 +135,126 @@
 									<el-tag v-if="editForm.preTaskid"  @close="clearPreTask" closable >{{editForm.preTaskname}}</el-tag>
 									<el-button  type="text"  @click.stop="selectTaskVisible=true"  >选前置</el-button> 
 								</el-form-item>  
+							</el-col>  
+							<el-col :span="12">
+								<el-form-item  :label="editForm.ntype=='0'?'任务类型':'计划类型'" prop="taskType">   
+									<el-select v-model="editForm.taskType">
+										<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+									</el-select>  
+								</el-form-item>   
+							</el-col>
+						</el-row>  
+					</el-tab-pane>
+					<el-tab-pane label="概述" name="2">  
+						<el-form-item  label="任务概述" prop="description">  
+ 							<el-input type="textarea" :autosize="{ minRows: 6, maxRows: 20}" v-model="editForm.description" placeholder="什么人？做什么事？，为什么？如： 作为招聘专员，我需要统计员工半年在职/离职人数，以便我能够制定招聘计划" ></el-input> 
+						</el-form-item> 
+					</el-tab-pane>
+					
+					<el-tab-pane label="需求" name="3">  
+						
+						<el-row>
+							<el-col :span="12"> 
+								<el-form-item  label="归属产品" prop="productId"> 
+									 {{editForm.productId}}
+								</el-form-item>  
 							</el-col>
 							<el-col :span="12"> 
-								<el-form-item  label="所属需求" prop="menuId" id="menuInfo" v-if="editForm.ntype!='1'"> 
+								<el-form-item  label="用户故事" prop="menuId" id="menuInfo" v-if="editForm.ntype!='1'"> 
 									{{editForm.menuName}} &nbsp;&nbsp;&nbsp; <el-link @click="menuVisible=true" type="primary">{{editForm.menuName?'更改':'设置'}}</el-link>&nbsp;&nbsp;&nbsp;
 									<el-link v-if="editForm.menuName" @click="toMenu" type="primary">查看需求</el-link>
 								</el-form-item> 
 							</el-col> 
 						</el-row>
+					</el-tab-pane>
+					<el-tab-pane label="子工作项" name="4" v-if="editForm.ntype==='1'">  
+
+					</el-tab-pane>
+					<el-tab-pane label="工时" name="5"> 
 						<el-row>
-							<el-col :span="12">
-								<el-form-item  label="优先级" prop="level">  
-									<el-select v-model="editForm.level">
-											<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option> 
-									</el-select>    
+							<el-col :span="8">  
+								<el-form-item label="统计方式" prop="calcType">
+									
+									<el-select v-model="editForm.calcType">
+										<el-option label="不统计"  value="0"></el-option>
+										<el-option label="下级往上级汇总"  value="1"></el-option>
+										<el-option label="手工填报"  value="2"></el-option>
+									</el-select>  
 								</el-form-item>  
 							</el-col>
-							<el-col :span="12">
-								<el-form-item  :label="editForm.ntype=='0'?'任务类型':'计划类型'" prop="taskType">   
-									<el-select v-model="editForm.taskType">
-										<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+							<el-col :span="8"> 
+								<el-form-item label="报工方式" prop="wtype" > 
+									<el-select v-model="editForm.wtype">
+										<el-option label="无须报工"  value="0"></el-option>
+										<el-option label="强制每日报工"  value="1"></el-option>
+										<el-option label="工期内报工"  value="2"></el-option>
 									</el-select>  
-								</el-form-item>   
-							</el-col>
-						</el-row> 
+								</el-form-item>
+							</el-col>  
+							<el-col :span="8"> 
+								<el-form-item label="工时进度" prop="rate" >
+									<el-progress style="width:60%;" :text-inside="true" :stroke-width="15" :percentage="editForm.rate?editForm.rate:0"></el-progress>
+								</el-form-item>
+							</el-col>  
+						</el-row>  
 						<el-row>
-							<el-col :span="12">
-								<el-form-item :label="editForm.ntype=='0'?'任务状态':'计划状态'">  
-									<el-select v-model="editForm.taskState">
-										<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-form-item> 
+							<el-col :span="8"> 
+								<el-form-item label="预估工作量" prop="budgetWorkload">
+									<el-input type="number"   style="width:150px;"   v-model="editForm.budgetWorkload" @change="onBudgetWorkloadChange" :precision="2" :step="8" :min="0" placeholder="预计总工作量(人时,不包括下一级)"></el-input type="number"> <el-tag>h</el-tag>
+								</el-form-item>    
 							</el-col>
-							<el-col :span="12"> 
-								<el-form-item label="总负责人"> 
-									<el-tag  v-if="editForm.createUserid" style="margin-left:10px;border-radius:30px;"  >{{editForm.createUsername}}</el-tag>
-									<el-button type="text" @click="showGroupUserSelect(editForm)" icon="el-icon-setting">设置负责人</el-button>
+							<el-col :span="8"> 
+								<el-form-item label="完工时间" prop="actEndTime">
+									 <el-date-picker style="display:inline;" type="daterange"  unlink-panels value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" v-model="actDateRanger"></el-date-picker>
 								</el-form-item> 
 							</el-col> 
-						</el-row> 
-						<!--
-						<el-form-item label="执行人" prop="executorUsername">
-							<el-tag  v-if="editForm.executorUserid" style="margin-left:10px;border-radius:30px;"  >{{editForm.executorUsername}}</el-tag>
-							<el-button  @click="execGroupUserSelectVisible=true" icon="el-icon-setting">设置执行人</el-button>
-						</el-form-item>
-						-->
-						<el-form-item :label="editForm.ntype=='1'?'计划描述':'任务描述'" prop="description">
-							<el-input type="textarea" :autosize="{ minRows: 4, maxRows: 10}" v-model="editForm.description" :placeholder="editForm.ntype=='1'?'计划描述':'任务描述'" ></el-input>
-						</el-form-item>   
-					</el-collapse-item>
-					<el-collapse-item title="进度预测" name="2">
-						<el-form-item label="预计时间"> 
-								<el-tooltip content="计划类型">
-									<el-select v-model=" editForm.planType" style="width:20%;">
-										<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-									</el-select> 
-								</el-tooltip>
-								<el-date-picker
-									v-model="budgetDateRanger"
-									@change="onBudgetDateRangerChange"
-									class="hidden-sm-and-down"
-									type="daterange"
-									align="right"
-									unlink-panels
-									range-separator="至"
-									start-placeholder="计划开始日期"
-									end-placeholder="计划完成日期"
-									value-format="yyyy-MM-dd HH:mm:ss"
-									:default-time="['00:00:00','23:59:59']"
-									:picker-options="pickerOptions"
-								></el-date-picker> 
-						</el-form-item>   
-						<el-form-item label="预估工作量" prop="budgetWorkload">
-							<el-input-number style="width:200px;"  v-model="editForm.budgetWorkload" @change="onBudgetWorkloadChange" :precision="2" :step="8" :min="0" placeholder="预计总工作量(人时,不包括下一级)"></el-input-number> <el-tag>人时，{{this.toFixed(editForm.budgetWorkload/8/20)}}人月</el-tag> 
-							 
-						</el-form-item>  
-						<el-form-item label="预估金额" prop="taskOut">
+							<el-col :span="8"> 
+								<el-form-item label="实际工作量" prop="actWorkload">
+									<el-input type="number"   style="width:150px;"     v-model="editForm.actWorkload" @change="onActWorkloadChange" :precision="2" :step="8" :min="0" placeholder="实际总工作量(人时,不包括下一级)"></el-input type="number"> <el-tag>h</el-tag>
+								</el-form-item> 
+							</el-col> 
+						</el-row>  
+					</el-tab-pane>
+					<el-tab-pane label="成本" name="6"> 
+						<el-form-item label="预估金额" prop="budgetCost">
 							<el-row v-if="editForm.taskOut!=='1'">
-								工时单价&nbsp;<el-input-number style="width:200px;"  v-model="editForm.uniInnerPrice" :precision="2" :step="10" :min="0" placeholder="工时单价"></el-input-number>   元/人时
+								工时单价&nbsp;<el-input type="number" style="width:150px;"   v-model="editForm.uniInnerPrice" :precision="2" :step="10" :min="0" placeholder="工时单价"></el-input type="number">   元/h
 							</el-row> 
 							<el-row v-if="editForm.taskOut==='1'">
-								工时单价&nbsp;<el-input-number style="width:200px;" v-if="editForm.taskOut==='1'" v-model="editForm.uniOutPrice" :precision="2" :step="10" :min="0" placeholder="外发工时单价"></el-input-number>   元/人时
+								工时单价&nbsp;<el-input type="number" style="width:150px;"   v-if="editForm.taskOut==='1'" v-model="editForm.uniOutPrice" :precision="2" :step="10" :min="0" placeholder="外发工时单价"></el-input type="number">   元/h
+							</el-row>
+							<el-row>
+								预估金额&nbsp;<el-input type="number" style="width:150px;"    v-model="editForm.budgetCost" :precision="2" :step="100" :min="0" placeholder="预算金额"></el-input type="number">   元
 							</el-row>
-							
-							预估金额&nbsp;<el-input-number style="width:200px;"  v-model="editForm.budgetCost" :precision="2" :step="1000" :min="0" placeholder="预算金额"></el-input-number>   元
-						</el-form-item>  
-					</el-collapse-item>
-					<el-collapse-item title="实际进度、工作量与成本" name="3">
-						
-						<el-form-item label="实际时间" prop="actStartTime">
-								<el-date-picker
-									v-model="actDateRanger"
-									class="hidden-sm-and-down"
-									type="daterange"
-									align="right"
-									unlink-panels
-									range-separator="至"
-									start-placeholder="实际开始日期"
-									end-placeholder="实际完成日期"
-									value-format="yyyy-MM-dd HH:mm:ss"
-									:default-time="['00:00:00','23:59:59']"
-									:picker-options="pickerOptions"
-								></el-date-picker> 
-						</el-form-item>  
-						<el-form-item label="实际进度" prop="rate">
-							<el-slider
-								v-model="editForm.rate"
-								show-input>
-							</el-slider> 
-						</el-form-item>  
-						<el-form-item  label="实际工作量" prop="actWorkload" shadow="hover">
-							<el-input-number style="width:200px;"  disabled v-model="editForm.actWorkload" :precision="2" :step="8" :min="0" placeholder="实际工作量"></el-input-number>  <el-tag>由后台自动计算，无需填写</el-tag>     
 						</el-form-item> 
-						<el-form-item label="实际金额" prop="actCost">
-							<el-input-number  style="width:200px;"  disabled v-model="editForm.actCost" :precision="2" :step="1000" :min="0" placeholder="实际金额"></el-input-number>    <el-tag>由后台自动计算，无需填写</el-tag>  
-						</el-form-item>   
-						</el-collapse-item>
-					<el-collapse-item title="结算信息" name="4"  v-if="editForm.ntype!='1'">
+
+					</el-tab-pane>
+					<el-tab-pane label="结算信息" name="7" v-if="editForm.ntype!='1'">
 						<el-form-item label="" prop="taskClass">
-							<el-checkbox v-model="editForm.taskClass" true-label="1" false-label="0">是否需要结算</el-checkbox> 
-						</el-form-item>  
-						<el-form-item v-if="editForm.taskClass=='1'" label="结算方案" prop="settlSchemel"> 
+							<el-checkbox v-model="editForm.taskClass" true-label="1" false-label="0">是否需要结算</el-checkbox>
+						</el-form-item>
+						<el-form-item v-if="editForm.taskClass=='1'" label="结算方案" prop="settlSchemel">
 							<el-select v-model=" editForm.settleSchemel">
 								<el-option v-for="i in dicts.xmTaskSettleSchemel" :label="i.name" :key="i.id" :value="i.id"></el-option>
 							</el-select>
-						</el-form-item>  
-					</el-collapse-item>
-					<el-collapse-item title="众包" name="5" v-if="editForm.ntype!='1'">
-						<el-form-item label="" prop="toTaskCenter"> 
-							<el-checkbox v-model="editForm.toTaskCenter" true-label="1" false-label="0" id="toTaskCenter">发布到互联网任务大厅</el-checkbox>  
-						</el-form-item>   
-						<el-form-item label="众包流程" prop="taskOut" v-if="editForm.taskOut=='1'">
-							<el-steps :active="calcTaskStep" align-center finish-status="success" simple>
-								<el-step title="发布" description="任务创建成功后即发布"></el-step>
-								<el-step title="竞标" description="候选人参与竞标，或者由责任人主动设置候选人"></el-step>
-								<el-step title="执行" description="候选人中标后，成为执行人，执行任务"></el-step>
-								<el-step title="验收" description="任务完成后提交验收，验收通过，即可进行结算"></el-step>
-								<el-step title="结算" description="提交结算申请审批流程，审批过程自动根据审批结果进行结算"></el-step>
-								<el-step title="企业付款" description="结算流程审批通过，自动付款到个人钱包"></el-step> 
-								<el-step title="提现" description="企业付款完成后，个人对钱包中余额进行提现"></el-step> 
-							</el-steps>
-						</el-form-item> 
-					</el-collapse-item>
-				</el-collapse>    
-			</el-form>  
+						</el-form-item>
+					</el-tab-pane>
+					<el-tab-pane label="众包" name="8" v-if="editForm.ntype!='1' && editForm.taskOut=='1'">
+					 
+					<el-checkbox v-model="editForm.toTaskCenter" true-label="1" false-label="0" id="taskOut">发布到互联网任务大厅</el-checkbox>  
+					 
+						<el-steps :active="calcTaskStep" align-center simple>
+							<el-step title="发布" description="任务创建成功后即发布"></el-step>
+							<el-step title="竞标" description="候选人参与竞标，或者由责任人主动设置候选人"></el-step>
+							<el-step title="执行" description="候选人中标后，成为执行人，执行任务"></el-step>
+							<el-step title="验收" description="任务完成后提交验收，验收通过，即可进行结算"></el-step>
+							<el-step title="结算" description="提交结算申请审批流程，审批过程自动根据审批结果进行结算"></el-step>
+							<el-step title="企业付款" description="结算流程审批通过，自动付款到个人钱包"></el-step>
+							<el-step title="提现" description="企业付款完成后，个人对钱包中余额进行提现"></el-step>
+						</el-steps> 
+					</el-tab-pane>
+				</el-tabs>   
+			</el-form>
 		</el-row>
 		<el-row class="padding">
 			<el-button @click.native="handleCancel">取消</el-button>  
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index ae55719a..fca109c5 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -1945,7 +1945,7 @@ export default {
         i.taskOut = i.taskOut ? i.taskOut : "0";
         i.taskClass = i.taskClass ? i.taskClass : "1";
         i.toTaskCenter = i.toTaskCenter ? i.toTaskCenter : "1";
-        i.settleSchemel = i.settleSchemel ? i.settleSchemel : "quotePrice";
+        i.settleSchemel = i.settleSchemel ? i.settleSchemel : "1";
         i.createUserid = this.userInfo.userid;
         i.createUsername = this.userInfo.username;
         const createTime = new Date();
diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
index 12e3a180..f05a2091 100644
--- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue
+++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
@@ -728,7 +728,7 @@ export default {
         i.taskOut = i.taskOut ? i.taskOut : "0";
         i.taskClass = i.taskClass ? i.taskClass : "1";
         i.toTaskCenter = i.toTaskCenter ? i.toTaskCenter : "1";
-        i.settleSchemel = i.settleSchemel ? i.settleSchemel : "quotePrice";
+        i.settleSchemel = i.settleSchemel ? i.settleSchemel : "1";
         i.createUserid = this.userInfo.userid;
         i.createUsername = this.userInfo.username;
         const createTime = new Date();
@@ -951,7 +951,7 @@ export default {
         subRow.toTaskCenter = subRow.toTaskCenter ? subRow.toTaskCenter : "1";
         subRow.settleSchemel = subRow.settleSchemel
           ? subRow.settleSchemel
-          : "quotePrice";
+          : "1";
         subRow.createUserid = this.userInfo.userid;
         subRow.createUsername = this.userInfo.username;
         const createTime = new Date();