diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 310d70f6..ad0beeab 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -991,11 +991,21 @@
 			},
 
 			loadTasksToXmMenuState: function () {
+				
+				if(!this.filters.product ){
+					if(!this.filters.iteration){
+						this.$notify.warning("请先选择产品或者迭代");
+						return;
+					} 
+				}
 				this.load.edit=true;
+				let params = { productId: ''};
 				if(!this.filters.product){
-					this.$notify.warning("请先选择产品");
+					params.productId=this.filters.iteration.productId
+				}else{
+					params = { productId: this.filters.product.id };
 				}
-				let params = { productId: this.filters.product.id };
+				
 				loadTasksToXmMenuState(params).then((res) => {
 					this.load.edit=false;
 					var tips=res.data.tips;
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index b89abb29..eabefdbb 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -168,7 +168,7 @@
 							 <xm-sub-work-item :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="5"> 
-						 <xm-task-workload-record :xm-task="editForm"></xm-task-workload-record>
+						 <xm-task-workload-record :visible="visible" :xm-task="editForm" :key="Math.random()"></xm-task-workload-record>
 					</el-tab-pane>
 					<el-tab-pane label="成本" name="6"> 
 						<el-form-item label="预估金额" prop="budgetCost">
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadList.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadList.vue
index 46f11948..7a7c8dc8 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadList.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadList.vue
@@ -55,6 +55,11 @@
 
 		},
 		watch:{
+			'xmTask.id':function(){
+				debugger;
+				this.initData();
+                this.searchXmTaskWorkloads()
+			},
             visible(val){
                 if(val==true){
                     this.initData();
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue
index 1860f9ad..651514f9 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue
@@ -45,14 +45,14 @@
 					</el-col> 
 					<el-col :span="6">
 						<el-form-item label="工时进度" prop="rate"> 
-							{{scope.row.rate}}&nbsp;&nbsp;%
+							{{editForm.rate}}&nbsp;&nbsp;%
 						</el-form-item> 
 					</el-col>
 				</el-row>
 			</el-form>
 		</el-row>
 		<el-row>
-			<xm-task-workload-list v-if="xmTask.ntype==='0'" :visible="visible" :xm-task="xmTask" @submit="onWorkloadSubmit"></xm-task-workload-list>
+			<xm-task-workload-list v-if="editForm.ntype==='0'" :visible="visible" :xm-task="editForm" @submit="onWorkloadSubmit"></xm-task-workload-list>
 		</el-row> 
 	</section>
 </template>
@@ -77,7 +77,9 @@
 		props:['xmTask','visible'],
 
 		watch: {
-	      
+	      'xmTask':function() {
+ 	      		this.initData()
+	      },
 	      'visible':function(visible) {
 	      	if(visible==true){
  	      		this.initData()
@@ -111,7 +113,7 @@
 			saveSubmit: function () {
 			},
 			initData: function(){ 
-				this.editForm={...this.xmTask}
+				this.editForm=this.xmTask
             },
 			
 			editXmTaskSomeFields(row,fieldName,$event){