diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 04d833f4..6da56759 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -191,23 +191,10 @@
 								<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="'子工作项'+(subWorkItemNum>=0?'('+subWorkItemNum+')':'')" 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.actWorkload+' h)'" name="2">
-							
-							<el-form-item label="预估工期" prop="budgetHours">
-								<el-input-number :disabled="editForm.calcType!=='2'  " style="width:200px;"  v-model="editForm.budgetHours"  :precision="2" :step="8" :min="0" placeholder="预计工期(小时)"></el-input-number> &nbsp;h
-							</el-form-item>
-							<el-form-item label="预估工时" prop="budgetWorkload">
-								<el-input-number :disabled="editForm.calcType!=='2'  " style="width:200px;"  v-model="editForm.budgetWorkload" :precision="2" :step="8" :min="0" placeholder="预计工时(小时)"></el-input-number>  &nbsp;h
-							</el-form-item>
-							<el-form-item label="实际工时" prop="actWorkload">
-								<el-input-number :disabled="editForm.calcType!=='2'  " style="width:200px;"  v-model="editForm.actWorkload" :precision="2" :step="8" :min="0" placeholder="实际工时(小时)"></el-input-number> &nbsp;h
-							</el-form-item>  
-						</el-tab-pane>
-						
-						<el-tab-pane label="测试用例" name="62">
+						</el-tab-pane> 
+						<el-tab-pane :label="'测试用例('+editForm.testCases+')'" name="62">
 							 <xm-test-case-mng  v-if="activateTabPaneName=='62'" :xm-product="{id:editForm.productId,productName:editForm.productName}" :xm-menu="editForm"></xm-test-case-mng>
 						</el-tab-pane>
 						<el-tab-pane label="成本" name="3">
@@ -220,7 +207,7 @@
 						</el-tab-pane>
 						
 					
-					<el-tab-pane label="工时" 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">
@@ -327,6 +314,21 @@
 				}
 				return params;
 			},
+			subWorkitemCpd(){
+				if(this.subWorkItemNum>0){
+					return this.subWorkItemNum
+				}else{
+					var bugCnt=0;
+					var taskCnt=0;
+					if(this.editForm.bugCnt){
+						bugCnt=parseInt(this.editForm.bugCnt)
+					}
+					if(this.editForm.taskCnt){
+						taskCnt=parseInt(this.editForm.taskCnt)
+					}
+					return bugCnt+taskCnt;
+				} 
+			}
 		},
 		props:['xmMenu','visible','parentMenu','product','dclass','selProject','reload'],
 		watch: {
@@ -335,7 +337,7 @@
 	      },
 	      'visible':function(visible) { 
 	      	if(visible==true){
-				
+				this.subWorkItemNum=0;
 				if(this.reload==true){
 					this.searchXmMenus();
 				}else{
diff --git a/src/views/xm/core/xmWorkload/XmWorkloadRecord.vue b/src/views/xm/core/xmWorkload/XmWorkloadRecord.vue
index a9aa4f17..141f0d41 100644
--- a/src/views/xm/core/xmWorkload/XmWorkloadRecord.vue
+++ b/src/views/xm/core/xmWorkload/XmWorkloadRecord.vue
@@ -5,15 +5,15 @@
 		<el-row class="page-main"  ref="table">
 		<!--编辑界面 XmWorkload 工时登记表-->
 			<el-form :model="editForm" label-width="100px"  :rules="editFormRules" ref="editFormRef">
-				<el-row v-if="editForm.ntype==='0'"> 
+				<el-row v-if="bizType=='1' && editForm.ntype==='0'"> 
 					<el-col :span="8">  
 						<el-form-item label="原估工时" prop="initWorkload">
-							 <el-input :controls="false" type="number" :step="8" style="width:80%;"  v-model="editForm.initWorkload" placeholder="原估工时" @change="editSomeFields(editForm,'initWorkload',$event)"></el-input> &nbsp;小时
+							 <el-input  :controls="false" type="number" :step="8" style="width:80%;"  v-model="editForm.initWorkload" placeholder="原估工时" @change="editSomeFields(editForm,'initWorkload',$event)"></el-input> &nbsp;小时
 						</el-form-item>
 					</el-col>  
 					<el-col :span="8">
 						<el-form-item label="预估工时" prop="budgetWorkload">
-							 <el-input :controls="false" type="number" :step="8" style="width:80%;"  v-model="editForm.budgetWorkload" placeholder="预估工时" @change="editSomeFields(editForm,'budgetWorkload',$event)"></el-input> &nbsp;小时
+							 <el-input  :controls="false" type="number" :step="8" style="width:80%;"  v-model="editForm.budgetWorkload" placeholder="预估工时" @change="editSomeFields(editForm,'budgetWorkload',$event)"></el-input> &nbsp;小时
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
@@ -25,7 +25,7 @@
 				<el-row v-else> 
 					<el-col :span="8"> 
 							<el-form-item label="原估工时" prop="initWorkload">
-								<el-input :controls="false" type="number" :step="8" style="width:80%;"  v-model="editForm.initWorkload" placeholder="原估工时" @change="editSomeFields(editForm,'initWorkload',$event)"></el-input> &nbsp;小时
+								<el-input  :controls="false" type="number" :step="8" style="width:80%;"  v-model="editForm.initWorkload" placeholder="原估工时" @change="editSomeFields(editForm,'initWorkload',$event)"></el-input> &nbsp;小时
 							</el-form-item> 
 					</el-col>  
 					<el-col :span="8">