From 8563a81fb7b8540f38b2d5ec68e35606a69156e7 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, 19 May 2022 18:31:09 +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/XmMenuMng.vue        |  1 +
 src/views/xm/core/xmTask/XmTaskMng.vue        | 27 +++++++++++++------
 .../xmTaskWorkload/XmTaskWorkloadRecord.vue   |  8 +++---
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 9adc9016..edd42a82 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -735,6 +735,7 @@
 					this.addFormVisible = true;
 				}else{
 					this.$refs.xmProductSelect1.productVisible=true;
+					this.$refs.xmProductSelect1.searchXmProducts();
 					this.$notify({position:'bottom-left',showClose:true,message: "请先选择一个产品", type: 'warning'});
 				}
 
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index d474547b..1152ae90 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -194,7 +194,7 @@
             <el-button
               slot="reference"
               v-if="
-                isTaskCenter != '1' && isMy != '1' && !xmIteration
+                 queryScope=='plan'||queryScope=='planTask'
               "
               type="primary"
               round
@@ -204,6 +204,7 @@
           </el-popover>
           <el-button
             @click="showParentTaskList" 
+            v-if="  queryScope=='plan'||queryScope=='planTask'  "
             title="更换任务的上级，实现任务搬家功能"
             icon="el-icon-upload2"
             v-loading="load.edit"
@@ -248,6 +249,7 @@
                 <el-tag
                   v-if="filters.createUser"
                   closable
+                  @click="showMenuGroupUser"
                   @close="clearFiltersCreateUser"
                   >{{ this.filters.createUser.username }}</el-tag
                 >
@@ -268,6 +270,7 @@
                 <el-tag
                   v-if="filters.executor"
                   closable
+                  @click="showMenuExecutor"
                   @close="clearFiltersExecutor"
                   >{{ this.filters.executor.username }}</el-tag
                 >
@@ -894,7 +897,7 @@
       ></xm-menu-select>
     </el-drawer>
 
- 			<xm-group-dialog ref="xmGroupDialog" :isSelectSingleUser="true" :sel-project="selProject" :xm-product="filters.xmProduct" @user-confirm="selectCreateUserConfirm">
+ 			<xm-group-dialog ref="xmGroupDialog" :isSelectSingleUser="true" :sel-project="filters.selProject" :xm-product="filters.xmProduct" @user-confirm="selectCreateUserConfirm">
 			</xm-group-dialog>  
     <el-drawer
       append-to-body
@@ -1543,7 +1546,8 @@ export default {
     showAdd: function (ntype) {
       if(!this.checkCanAdd()){
         return;
-      } 
+      }  
+      this.parentTask = null;
       this.addForm.ntype=ntype;
       this.addFormVisible = true;
     },
@@ -1662,11 +1666,11 @@ export default {
     showMenuStory() {
       this.menuStory = true;
     },
-    showMenuGroupUser() {
-      this.menuGroupUser = true;
+    showMenuGroupUser() { 
+      this.$refs.xmGroupDialog.open({data:null,action:'filtersCreateUserid'})
     },
-    showMenuExecutor() {
-      this.menuExecutor = true;
+    showMenuExecutor() { 
+      this.$refs.xmGroupDialog.open({data:null,action:'filtersExecutorUserid'})
     },
     skillTagClear(skill) {
       this.filters.skillTags = this.filters.skillTags.filter(
@@ -2101,13 +2105,20 @@ export default {
           var user= groupUsers[0];
           this.editXmTaskSomeFields(option.data,option.action,user)
         }  
-      }else{
+      }else if(option.action=='filtersCreateUserid'){
         if (groupUsers && groupUsers.length > 0) {
           this.filters.createUser = groupUsers[0];
         } else {
           this.filters.createUser = null;
         }
         this.searchXmTasks(); 
+      }else{
+        if (groupUsers && groupUsers.length > 0) {
+          this.filters.executor = groupUsers[0];
+        } else {
+          this.filters.executor = null;
+        }
+        this.searchXmTasks(); 
       }
       
     },
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue
index 1a56f200..13b4c428 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue
@@ -8,8 +8,8 @@
 				<el-row v-if="editForm.ntype==='0'">
 					
 					<el-col :span="6">
-						<el-form-item label="原估工时" prop="initBudgetWorkload">
-							{{editForm.initBudgetWorkload?editForm.initBudgetWorkload:'0'}} &nbsp;小时
+						<el-form-item label="原估工时" prop="initWorkload">
+							{{editForm.initWorkload?editForm.initWorkload:'0'}} &nbsp;小时
 						</el-form-item> 
 					</el-col>  
 					<el-col :span="6">
@@ -26,8 +26,8 @@
 				<el-row v-else>
 					
 					<el-col :span="6">
-						<el-form-item label="原估工时" prop="initBudgetWorkload">
-							{{editForm.initBudgetWorkload?editForm.initBudgetWorkload:'0'}} &nbsp;小时
+						<el-form-item label="原估工时" prop="initWorkload">
+							{{editForm.initWorkload?editForm.initWorkload:'0'}} &nbsp;小时
 						</el-form-item> 
 					</el-col>  
 					<el-col :span="6">