From 9b1c0c9b365e5f0a1099c67f00342cedf93320fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 25 Jun 2022 22:03:28 +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/XmEpicFeatures.vue   |  2 +-
 src/views/xm/core/xmMenu/XmMenuMng.vue        |  2 +-
 .../xm/core/xmMenuWorkItem/XmSubMenuList.vue  | 95 ++-----------------
 .../xm/core/xmMenuWorkItem/XmSubTaskList.vue  | 13 ++-
 4 files changed, 21 insertions(+), 91 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index ac434d7b..f89034e7 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -120,7 +120,7 @@
 
 					</el-row>
 				<!--编辑 XmMenu xm_project_menu界面-->
-				<el-dialog :title="'编辑'+(editForm&&editForm.dclass=='1'?'史诗':'特性')" :visible.sync="editFormVisible"  width="80%" top="20px"    append-to-body   :close-on-click-modal="false" >
+				<el-dialog :title="'编辑'+(editForm&&editForm.dclass=='1'?'史诗':'特性')" :visible.sync="editFormVisible"  width="90%" top="20px"    append-to-body   :close-on-click-modal="false" >
 					<xm-menu-edit :xm-menu="editForm" :sel-project="selProject" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit" @add-sub-menu="onAddSubMenu" @edit-fields="onEditSomeFields"></xm-menu-edit>
 				</el-dialog>
 
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 9c76926d..4846daea 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -345,7 +345,7 @@
 
 					</el-row>
 				<!--编辑 XmMenu xm_project_menu界面-->
-				<el-dialog title="编辑故事" :visible.sync="editFormVisible" :with-header="false" width="80%" top="20px"    append-to-body   :close-on-click-modal="false" >
+				<el-dialog title="编辑故事" :visible.sync="editFormVisible" :with-header="false" width="90%" top="20px"    append-to-body   :close-on-click-modal="false" >
 					<xm-menu-edit :xm-menu="editForm" :sel-project="selProject" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit" @add-sub-menu="onAddSubMenu" @edit-fields="onEditSomeFields"></xm-menu-edit>
 				</el-dialog>
 
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
index e66abece..0161f55e 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
@@ -30,7 +30,7 @@
           <el-table-column prop="status" label="状态"  min-width="80"  sortable>
 								<template slot-scope="scope">
 									<div class="cell-text">
-										<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>
+										<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'menuStatus',scope.row.status)" :key="index" :type="item.className">{{item.name}}</el-tag>
 									</div>
 									<span class="cell-bar">
 										 <el-select @visible-change="selectVisible(scope.row,$event)"   v-model="scope.row.status" placeholder="需求状态"  style="display:block;"  @change="editXmMenuSomeFields(scope.row,'status',$event)">
@@ -42,8 +42,8 @@
 							<el-table-column prop="priority"  label="优先级" width="100" sortable>
 								<template slot-scope="scope">
 									<div class="cell-text">
-										<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>
+										<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'priority',scope.row.priority)" :key="index" :type="item.className">{{item.name}}</el-tag>
+  									</div>
 									<span class="cell-bar">
 										 <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>
@@ -106,8 +106,8 @@
           </div>
       </el-dialog>
 	<!--编辑 XmMenu xm_project_menu界面-->
-	<el-dialog title="编辑故事" :visible.sync="editFormVisible" :with-header="false" width="80%" top="20px"    append-to-body   :close-on-click-modal="false" >
-		<xm-menu-edit :xm-menu="editForm"   :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit" @add-sub-menu="onAddSubMenu" @edit-fields="onEditSomeFields"></xm-menu-edit>
+	<el-dialog title="编辑故事" :visible.sync="editFormVisible" :with-header="false" width="90%" top="20px"    append-to-body   :close-on-click-modal="false" >
+		<xm-menu-edit :xm-menu="editForm"   :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit" @edit-fields="afterEditSubmit"></xm-menu-edit>
 	</el-dialog>
   </section>
 </template>
@@ -176,6 +176,7 @@ export default {
     }
   }, //end data
   methods: { 
+	...util,
     selectVisible(row,visible){
       if(visible){
         this.rowClick(row)
@@ -185,91 +186,15 @@ export default {
 	selsChange: function (sels) {
 		this.sels = sels;
 	},
-
+	afterEditSubmit(row){
+		Object.assign(this.editForm,row)
+	},
 
 	rowClick: function(row, event, column){ 
         this.editForm=row
 		this.editFormBak=Object.assign({},this.editForm)
       },
-      
-
-			formaterByDicts(row,property,cellValue){
-				var property=property
-				var dict=null;
-				if(property=='source'){
-					dict=this.dicts['demandSource']
-				}else if(property=='dlvl'){
-					dict=this.dicts['demandLvl']
-				}else if(property=='dtype'){
-					dict=this.dicts['demandType']
-				}else if(property=='priority'){
-					dict=this.dicts['priority']
-				}
-				if(!dict){
-					return cellValue;
-				}else{
-					var item=dict.find(i=>i.id==cellValue)
-					return item?item.name:cellValue;
-				}
-			},
-			formatterPriorityDicts(cellValue){
-				if(!cellValue && cellValue!=='0'){
-					return []
-				}
-				var key="priority";
-				if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0   ){
-					return [{id:cellValue,name:cellValue,className:'primary'}];
-				}
-				var list=this.dicts[key].filter(i=>i.id==cellValue)
-				if(list.length>0){
-					var data= {...list[0],className:'primary'}
-					if(data.id=='0'){
-						data.className='danger'
-					}else if(data.id=='1'){
-						data.className='warning'
-					}else if(data.id=='2'){
-						data.className='success'
-					}else if(data.id=='3'){
-						data.className='primary'
-					}else if(data.id=='4'){
-						data.className='info'
-					}else{
-						data.className='primary'
-					}
-					return [data];
-				}else{
-					return [{id:cellValue,name:cellValue,className:'primary'}]
-				}
-
-			},
-			formatterMenuStatusDicts: function(cellValue){
-				if(!cellValue && cellValue!=='0'){
-					return []
-				}
-				var key="menuStatus";
-				if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0   ){
-					return [{id:cellValue,name:cellValue,className:'primary'}];
-				}
-				var list=this.dicts[key].filter(i=>i.id==cellValue)
-				if(list.length>0){
-					var data= {...list[0],className:'primary'}
-					if(data.id=='0'){
-						data.className='primary'
-					}else if(data.id=='1'){
-						data.className='warning'
-					}else if(data.id=='2'){
-						data.className='success'
-					}else if(data.id=='3'){
-						data.className='info'
-					} else{
-						data.className='danger'
-					}
-					return [data];
-				}else{
-					return [{id:cellValue,name:cellValue,className:'primary'}]
-				}
-
-			},
+       
     getXmMenus(){
       listXmMenuWithState({pmenuId:this.parentXmMenu.menuId}).then(res=>{
         var tips = res.data.tips;
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
index 8a5f2fd2..8d212f21 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
@@ -104,11 +104,9 @@
         :xm-project="{id:editForm.projectId,name:editForm.projectName}"
         :xm-task="editForm"
         :visible="editFormVisible"
-        @cancel="editFormVisible = false"
-        @after-add-submit="afterExecEditSubmit"
-        @after-edit-submit="afterExecEditSubmit"
+        @cancel="editFormVisible = false" 
         @submit="afterEditSubmit"
-        @edit-fields="onEditSomeFields"
+        @edit-fields="afterEditSubmit"
       ></xm-task-edit> 
       </el-dialog>
       <el-dialog title="新增任务" :visible.sync="addFormVisible" append-to-body modal-append-to-body>
@@ -306,6 +304,10 @@ export default {
       this.editForm=row
       this.editFormVisible=true
     },
+    
+    afterEditSubmit(row){
+      Object.assign(this.editForm,row)
+    },
     //查询时选择责任人
     selectCreateUserConfirm(groupUsers,option) {
       if(option && option.action==='createUserid'){
@@ -465,6 +467,9 @@ export default {
 			},
       afterWorkloadSubmit(xmTask){
 
+      },
+      afterEditSubmit(row){
+        Object.assign(this.editForm,row)
       },
       
 			onEditXmTaskSomeFields(data){