From 317df4ac79ee0288db79138cd58fea46cd461357 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 02:28:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E5=B7=A5=E4=BD=9C=E9=A1=B9=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmMenuWorkItem/XmSubBugList.vue   | 14 +++++++---
 .../xm/core/xmMenuWorkItem/XmSubMenuList.vue  | 26 ++++++++++++-------
 .../xm/core/xmMenuWorkItem/XmSubTaskList.vue  | 19 ++++++++++----
 3 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
index d442a7dd..0fc93bf3 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
@@ -24,7 +24,7 @@
 										 <el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in [formatterBugStatusDicts(scope.row.bugStatus)]" :key="index">{{item.name}}</el-button>
 									</div>
 									<span class="cell-bar">   
-										 <el-select  v-model="scope.row.bugStatus" placeholder="类型"  style="display:block;"  @change="editXmQuestionSomeFields(scope.row,'bugStatus',$event)">
+										 <el-select @visible-change="selectVisible(scope.row,$event)"   v-model="scope.row.bugStatus" placeholder="类型"  style="display:block;"  @change="editXmQuestionSomeFields(scope.row,'bugStatus',$event)">
 												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.bugStatus" :key="index"></el-option> 
 										 </el-select>  
 									</span> 
@@ -47,7 +47,7 @@
 										<el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in [formatterPriorityDicts(scope.row.priority)]" :key="index">{{item.name}}</el-button>
 									</div>
 									<span class="cell-bar">   
-										 <el-select  v-model="scope.row.priority" placeholder="优先级"  style="display:block;"  @change="editXmQuestionSomeFields(scope.row,'priority',$event)">
+										 <el-select @visible-change="selectVisible(scope.row,$event)"   v-model="scope.row.priority" placeholder="优先级"  style="display:block;"  @change="editXmQuestionSomeFields(scope.row,'priority',$event)">
 												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.priority" :key="index"></el-option> 
 										 </el-select>  
 									</span> 
@@ -59,7 +59,7 @@
 										{{formaterByDicts(scope.row,'solution',scope.row.solution)}}
 									</div>
 									<span class="cell-bar">   
-										 <el-select  v-model="scope.row.solution" placeholder="类型"  style="display:block;"  @change="editXmQuestionSomeFields(scope.row,'solution',$event)">
+										 <el-select @visible-change="selectVisible(scope.row,$event)"   v-model="scope.row.solution" placeholder="类型"  style="display:block;"  @change="editXmQuestionSomeFields(scope.row,'solution',$event)">
 												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.bugSolution" :key="index"></el-option> 
 										 </el-select>  
 									</span> 
@@ -161,11 +161,17 @@ export default {
   }, //end data
   methods: { 
     
+    selectVisible(row,visible){
+      if(visible){
+        this.rowClick(row)
+      }
+    },
 			showGroupUsers:function(userType,row){
  				this.$refs.xmGroupDialog.open({data:row,action:userType})
 			},
 			rowClick: function(row, event, column){
 				this.editForm=row;
+				this.editFormBak=Object.assign({},this.editForm)
 			},
 			//选择行xmQuestion
 			selsChange: function (sels) {
@@ -283,7 +289,9 @@ export default {
 						}else{ 
 							Object.assign(row,params) 
 						}
+						Object.assign(this.editFormBak,this.editForm)
 					}else{
+						Object.assign(this.editForm,this.editFormBak)
 						this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
 					}
 				})
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
index 9c0434c2..34faff83 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
@@ -31,7 +31,7 @@
 										<el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in formatterMenuStatusDicts(scope.row.status)" :key="index">{{item.name}}</el-button>
 									</div>
 									<span class="cell-bar">
-										 <el-select  v-model="scope.row.status" placeholder="需求状态"  style="display:block;"  @change="editXmMenuSomeFields(scope.row,'status',$event)">
+										 <el-select @visible-change="selectVisible(scope.row,$event)"   v-model="scope.row.status" placeholder="需求状态"  style="display:block;"  @change="editXmMenuSomeFields(scope.row,'status',$event)">
 												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.menuStatus" :key="index"></el-option>
 										 </el-select>
 									</span>
@@ -43,7 +43,7 @@
 										<el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in formatterPriorityDicts(scope.row.priority)" :key="index">{{item.name}}</el-button>
  									</div>
 									<span class="cell-bar">
-										 <el-select  v-model="scope.row.priority" placeholder="优先级"  style="display:block;" @change="editXmMenuSomeFields(scope.row,'priority',$event)">
+										 <el-select @visible-change="selectVisible(scope.row,$event)"   v-model="scope.row.priority" placeholder="优先级"  style="display:block;" @change="editXmMenuSomeFields(scope.row,'priority',$event)">
 												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.priority" :key="index"> </el-option>
 										 </el-select>
 									</span>
@@ -165,15 +165,20 @@ export default {
     }
   }, //end data
   methods: { 
-    
-			//选择行xmMenu
-			selsChange: function (sels) {
-				this.sels = sels;
-			},
-      
+    selectVisible(row,visible){
+      if(visible){
+        this.rowClick(row)
+      }
+    },
+	//选择行xmMenu
+	selsChange: function (sels) {
+		this.sels = sels;
+	},
+
 
-			rowClick: function(row, event, column){ 
+	rowClick: function(row, event, column){ 
         this.editForm=row
+		this.editFormBak=Object.assign({},this.editForm)
       },
       
 
@@ -345,7 +350,10 @@ export default {
 						}else{
 							  Object.assign(row,params)
 						}
+						Object.assign(this.editFormBak,this.editForm)
 					}else{
+						
+						Object.assign(this.editForm,this.editFormBak)
 						this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
 					}
 				})
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
index 5ac39ff8..75d0ea11 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
@@ -26,7 +26,7 @@
 										<el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in formatterTaskStateDicts(scope.row.taskState)" :key="index">{{item.name}}</el-button>
 									</div>
 									<span class="cell-bar">
-										 <el-select  v-model="scope.row.taskState" placeholder="任务状态"  style="display:block;"  @change="editXmTaskSomeFields(scope.row,'taskState',$event)">
+										 <el-select @visible-change="selectVisible(scope.row,$event)"   v-model="scope.row.taskState" placeholder="任务状态"  style="display:block;"  @change="editXmTaskSomeFields(scope.row,'taskState',$event)">
 												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.taskState" :key="index"></el-option>
 										 </el-select>
 									</span>
@@ -55,7 +55,7 @@
 										<el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in formatterPriorityDicts(scope.row.level)" :key="index">{{item.name}}</el-button>
 									</div>
 									<span class="cell-bar">
-										 <el-select  v-model="scope.row.level" placeholder="优先级"  style="display:block;"  @change="editXmTaskSomeFields(scope.row,'level',$event)">
+										 <el-select  @visible-change="selectVisible(scope.row,$event)"   v-model="scope.row.level" placeholder="优先级"  style="display:block;"  @change="editXmTaskSomeFields(scope.row,'level',$event)">
 												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.priority" :key="index"></el-option>
 										 </el-select>
 									</span>
@@ -169,8 +169,12 @@ export default {
 
     }
   }, //end data
-  methods: { 
-    
+  methods: {  
+    selectVisible(row,visible){
+      if(visible){
+        this.rowClick(row)
+      }
+    },
     //选择行xmTask
     selsChange: function (sels) {
       this.sels = sels;
@@ -284,8 +288,12 @@ export default {
 							 })
 						}else{
 							  Object.assign(row,params)
+                
 						}
+            Object.assign(this.editFormBak,this.editForm)
 					}else{
+            
+            Object.assign(this.editForm,this.editFormBak)
 						this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
 					}
 				})
@@ -318,7 +326,8 @@ export default {
       });
     },
     rowClick: function (row) {
-      this.editForm = row;
+      this.editForm = row; 
+		  this.editFormBak=Object.assign({},this.editForm)
       // this.$emit('row-click',row,);//  @row-click="rowClick"
     },