From f4d26b732f3b03b3adc48f9f5f662ec87f84cdae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 21 Apr 2022 18:12:52 +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  | 40 +++++++++++++------------
 src/views/xm/core/xmTask/XmTaskEdit.vue | 10 ++++---
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index 57c89903..79ffd3ca 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -207,22 +207,22 @@
 							</el-col> 
 							<el-col :span="8"> 
 								<el-form-item label="实际工作量" prop="actWorkload">
-									<el-input type="number"   style="width:150px;"     v-model="addForm.actWorkload"  :precision="2" :step="8" :min="0" placeholder="实际总工作量(人时,不包括下一级)"></el-input type="number"> <el-tag>h</el-tag>
+									<el-input type="number"   style="width:150px;"     v-model="addForm.actWorkload"  :precision="2" :step="8" :min="0" placeholder="实际总工作量(人时,不包括下一级)"></el-input> <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="uniInnerPrice">
+							 <el-input type="number" style="width:150px;"   v-model="addForm.uniInnerPrice" :precision="2" :step="10" :min="0" placeholder="自研工时单价"  ></el-input  >   元/h
+							 
+						</el-form-item> 
+						<el-form-item label="外包、众包单价" prop="uniOutPrice"> 
+								 <el-input type="number" style="width:150px;"   v-model="addForm.uniOutPrice" :precision="2" :step="10" :min="0" placeholder="外发工时单价"  ></el-input  >   元/h
+						 
+						</el-form-item> 
 						<el-form-item label="预估金额" prop="budgetAt">
-							<el-row v-if="addForm.taskOut!=='1'">
-								工时单价&nbsp;<el-input type="number" style="width:150px;"   v-model="addForm.uniInnerPrice" :precision="2" :step="10" :min="0" placeholder="工时单价"></el-input type="number">   元/h
-							</el-row> 
-							<el-row v-if="addForm.taskOut==='1'">
-								工时单价&nbsp;<el-input type="number" style="width:150px;"   v-if="addForm.taskOut==='1'" v-model="addForm.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="addForm.budgetAt" :precision="2" :step="100" :min="0" placeholder="预算金额"></el-input type="number">   元
-							</el-row>
+						 	<el-input type="number" style="width:150px;"    v-model="addForm.budgetAt" :precision="2" :step="100" :min="0" placeholder="预算金额"  ></el-input  >   元 
 						</el-form-item> 
 
 					</el-tab-pane>
@@ -236,17 +236,19 @@
 							</el-select>
 						</el-form-item>
 					</el-tab-pane>
-					<el-tab-pane label="众包" name="8" v-if="addForm.ntype!='1' ">
-					 	<el-form-item label="" prop="crowd">  
-							<el-checkbox v-model="addForm.crowd" true-label="1" false-label="0" id="crowd" >开通众包</el-checkbox> 
-							<el-checkbox v-model="addForm.toTaskCenter" true-label="1" false-label="0" id="toTaskCenter">发布到互联网任务大厅</el-checkbox>  
+					<el-tab-pane label="外包、众包、互联网" name="8" v-if="addForm.ntype!='1' ">
+					 	<el-form-item> 
+							 <el-checkbox v-model="addForm.taskOut" true-label="1" false-label="0" id="taskOut" >外包</el-checkbox>   
+ 						 
+							 <el-checkbox v-model="addForm.crowd" true-label="1" false-label="0" id="crowd"  >开通众包</el-checkbox>   
+						 
+							<el-checkbox v-model="addForm.toTaskCenter" true-label="1" false-label="0" id="toTaskCenter"  >发布到互联网任务大厅</el-checkbox> 
 						</el-form-item>
 						<el-form-item label="分享赚" prop="oshare">
- 							<el-checkbox v-model="addForm.oshare" true-label="1" false-label="0" id="oshare">开通分享赚</el-checkbox>  
-						</el-form-item>
-
-						<el-form-item label="分享赚佣金" prop="shareFee" v-if="addForm.oshare==='1'">
- 							<el-input type="number" style="width:150px;"    v-model="addForm.shareFee" :precision="2" :step="100" :min="0" placeholder="分享赚佣金" ></el-input  >   元
+ 							<el-checkbox v-model="addForm.oshare" true-label="1" false-label="0" id="oshare"  >开通分享赚</el-checkbox>  
+						</el-form-item> 
+						<el-form-item label="分享佣金" prop="shareFee" v-if="addForm.oshare==='1'">
+ 							<el-input type="number" style="width:150px;"    v-model="addForm.shareFee" :precision="2" :step="100" :min="0" placeholder="分享赚佣金"  ></el-input  >   元
 							 <font color="blue">开通分享赚后起效，佣金从任务预算中扣除，如果未发生分享佣金，则不扣除。一般建议为任务佣金的1%-5%</font>
 						</el-form-item>
 					 
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 0e5d8795..fbfef8d6 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -193,15 +193,17 @@
 							</el-select>
 						</el-form-item>
 					</el-tab-pane>
-					<el-tab-pane label="众包" name="8" v-if="editForm.ntype!='1'">
-					 	<el-form-item label="" prop="crowd"> 
+					<el-tab-pane label="众包、外包、互联网访问" name="8" v-if="editForm.ntype!='1'">
+					 	<el-form-item> 
+							 <el-checkbox v-model="editForm.taskOut" true-label="1" false-label="0" id="taskOut" @change="editXmTaskSomeFields(editForm,'taskOut',$event)">外包</el-checkbox>   
+ 						 
 							 <el-checkbox v-model="editForm.crowd" true-label="1" false-label="0" id="crowd" @change="editXmTaskSomeFields(editForm,'crowd',$event)">开通众包</el-checkbox>   
+						 
 							<el-checkbox v-model="editForm.toTaskCenter" true-label="1" false-label="0" id="toTaskCenter" @change="editXmTaskSomeFields(editForm,'toTaskCenter',$event)">发布到互联网任务大厅</el-checkbox> 
 						</el-form-item>
 						<el-form-item label="分享赚" prop="oshare">
  							<el-checkbox v-model="editForm.oshare" true-label="1" false-label="0" id="oshare" @change="editXmTaskSomeFields(editForm,'oshare',$event)">开通分享赚</el-checkbox>  
-						</el-form-item>
-
+						</el-form-item> 
 						<el-form-item label="分享佣金" prop="shareFee" v-if="editForm.oshare==='1'">
  							<el-input type="number" style="width:150px;"    v-model="editForm.shareFee" :precision="2" :step="100" :min="0" placeholder="分享赚佣金" @change="editXmTaskSomeFields(editForm,'shareFee',$event)"></el-input  >   元
 							 <font color="blue">开通分享赚后起效，佣金从任务预算中扣除，如果未发生分享佣金，则不扣除。一般建议为任务佣金的1%-5%</font>