From 8ad6ad04061013cb8af7994fa4009f2bc4d91fda 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, 28 Jul 2022 01:20:18 +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/xmMenu/XmMenuEdit.vue |  4 ++--
 src/views/xm/core/xmTask/XmTaskEdit.vue | 18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 5b429f10..001a9865 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -191,7 +191,7 @@
 								<el-input type="textarea" :autosize="{ minRows: 6, maxRows: 20}" v-model="editForm.remark"  @change="editXmMenuSomeFields(editForm,'remark',editForm.remark)" placeholder="什么人？做什么事？，为什么？如： 作为招聘专员，我需要统计员工半年在职/离职人数，以便我能够制定招聘计划" ></el-input>
 							</el-form-item> 
 						</el-tab-pane>
-						<el-tab-pane :label="'子工作项('+subWorkitemCpd+')'" name="6">
+						<el-tab-pane :label="'子工作项( '+subWorkitemCpd+' )'" name="6">
 							 <xm-sub-work-item v-if="this.activateTabPaneName=='6'" :parent-xm-menu="editForm" :link-project-id="selProject?selProject.id:null" @sub-work-item-num="setSubWorkItemNum" @add-sub-menu="onAddSubMenu"></xm-sub-work-item>
 						</el-tab-pane> 
 						<el-tab-pane :label="'测试用例('+editForm.testCases+')'" name="62">
@@ -207,7 +207,7 @@
 						</el-tab-pane>
 						
 					
-					<el-tab-pane :label="'工时('+editForm.actWorkload+' / '+editForm.budgetWorkload+' h)'" name="51"> 
+					<el-tab-pane :label="'工时( '+editForm.actWorkload+' / '+editForm.budgetWorkload+' h )'" name="51"> 
 						 <xm-workload-record v-if="activateTabPaneName=='51'" biz-type="5" :xm-menu="editForm" ></xm-workload-record>
 					</el-tab-pane>
 					<el-tab-pane label="链接" name="5">
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index ab3b27bf..fdf37d11 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -262,7 +262,7 @@
 						</el-row>
 					</el-tab-pane>
 					
-					<el-tab-pane label="工时" name="5"> 
+					<el-tab-pane :label="'工时( '+editForm.actWorkload+' / '+editForm.budgetWorkload+' h )'" name="5"> 
 						 <xm-workload-record v-if="activateTabPaneName=='5'" biz-type="1" :xm-task="editForm" ></xm-workload-record>
 					</el-tab-pane>
 					<el-tab-pane label="预算金额" name="6"> 
@@ -279,7 +279,7 @@
 						</el-form-item> 
 
 					</el-tab-pane>
-					<el-tab-pane :label="'子工作项('+subWorkItemNum+')'" name="4" v-if="editForm.ntype==='1'">  
+					<el-tab-pane :label="'子工作项('+subWorkitemCpd+')'" name="4" v-if="editForm.ntype==='1'">  
 							 <xm-sub-work-item v-if="activateTabPaneName=='4'" :parent-xm-task="editForm"  @sub-work-item-num="setSubWorkItemNum" @add-sub-task="onAddSubTask"></xm-sub-work-item>
 					</el-tab-pane>
 					<el-tab-pane label="缺陷" name="41" v-if="editForm.ntype!='1'">  
@@ -620,6 +620,19 @@
 				toPayAtObj.total=toPayAt;
 				return toPayAtObj;
 			},
+			
+			subWorkitemCpd(){
+				if(this.subWorkItemNum>0){
+					return this.subWorkItemNum
+				}else{
+					if(this.editForm.ntype=='1'){ 
+						return this.editForm.childrenCnt
+					}else{
+						return this.subWorkItemNum
+					}
+					
+				} 
+			}
 
 		},
 		props:['xmTask','visible','xmProject',"parentTask"],
@@ -629,6 +642,7 @@
 			'visible':function(visible) { 
 				this.fileVisible = visible;
 				if(visible==true){ 
+					this.subWorkItemNum=0
 					this.editForm=Object.assign(this.editForm, this.xmTask);      
 					this.editFormBak=Object.assign({},this.editForm)
 					this.setSkills()