diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index dd42c2dc..1e116881 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -74,12 +74,9 @@
-
-
-
-
-
-
+
+
+
@@ -103,7 +100,7 @@
-
+
@@ -273,8 +270,11 @@
},//end data
methods: {
selectVisible(row,visible){
- if(visible){
- this.rowClick(row)
+ if(visible==true){
+ this.$refs.table.setCurrentRow(row);
+ this.editForm = row;
+ this.editFormBak=Object.assign({},row)
+ this.$emit('row-click',row,);// @row-click="rowClick"
}
},
handleSizeChange(pageSize) {
@@ -448,12 +448,16 @@
//显示编辑界面 XmMenu xm_project_menu
showEdit: function ( row,index ) {
+ this.$refs.table.setCurrentRow(row)
+ if(this.editForm && row.menuId!=this.editForm.menuId){
+ this.$refs.table.setCurrentRow(row);
+ this.$emit("row-click",row)
+ }
this.editForm =row
this.editFormVisible = true;
},
//显示新增界面 XmMenu xm_project_menu
- showAdd: function (dclass) {
- ;
+ showAdd: function (dclass) {
Object.assign(this.addForm,this.addFormInit)
if(this.filters.product && this.filters.product.id){
this.parentMenu=null;
@@ -478,12 +482,17 @@
//this.addForm=Object.assign({}, this.editForm);
},
showSubAdd:function(row){
-
+ this.$refs.table.setCurrentRow(row)
+ if(this.editForm && row.menuId!=this.editForm.menuId){
+ this.$refs.table.setCurrentRow(row);
+ this.$emit("row-click",row)
+ }
this.addForm={...this.addFormInit}
this.editForm=row
this.parentMenu=row
this.expandRowKeysCpd.push(row.pmenuId);
- this.addForm.productId=row.productId
+ this.addForm.productId=row.productId
+
if(this.filters.product && row.productId==this.filters.product.id){
this.addForm.productName=this.filters.product.productName
}else{
@@ -590,8 +599,14 @@
},
rowClick: function(row, event, column){
+ if(this.editForm && row.menuId===this.editForm.menuId){
+ this.editForm=null;
+ this.$emit('row-click',null)
+ this.$refs.table.setCurrentRow();
+ return;
+ }
this.editForm=row
- this.editFormBak=Object.assign({},row)
+ this.editFormBak=Object.assign({},row)
this.$emit('row-click',row, event, column);// @row-click="rowClick"
},
handleExport() {
diff --git a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
index 91cdaf3c..c4653234 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
@@ -329,6 +329,12 @@
},
rowClick: function(row, event, column){
+ if(this.editForm && row.menuId===this.editForm.menuId){
+ this.editForm=null;
+ this.$emit('row-click',null)
+ this.$refs.table.setCurrentRow();
+ return;
+ }
this.editForm=row
this.$emit('row-click',row, event, column);// @row-click="rowClick"
},
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 1817d9fd..c322a123 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -635,12 +635,13 @@ export default {
},
//显示编辑界面 XmTask xm_task
showEdit: function (row, index) {
- this.editFormVisible = true;
+
if(this.editForm && row.id!=this.editForm.id){
this.$refs.table.setCurrentRow(row);
this.$emit("row-click",row)
}
this.editForm=row
+ this.editFormVisible = true;
},
showTaskTemplate: function (row) {
if(!this.checkCanAdd(row)){
@@ -788,11 +789,10 @@ export default {
.catch((err) => (this.load.del = false));
});
},
- rowClick: function (row,column) {
-
- if(this.editForm && row.id===this.editForm.id && column.label!='状态'){
- this.editForm=null;
+ rowClick: function (row,column) {
+ if(this.editForm && row.id===this.editForm.id){
this.$emit('row-click',null)
+ this.editForm=null
this.$refs.table.setCurrentRow();
return;
}
@@ -1161,7 +1161,7 @@ export default {
});
})
},
- initData(){
+ initData(){
if (this.selProject) {
this.filters.selProject = this.selProject;
}
diff --git a/src/views/xm/core/xmTask/XmPhaseSelect.vue b/src/views/xm/core/xmTask/XmPhaseSelect.vue
index 2b94bb3c..1aae1887 100644
--- a/src/views/xm/core/xmTask/XmPhaseSelect.vue
+++ b/src/views/xm/core/xmTask/XmPhaseSelect.vue
@@ -346,6 +346,12 @@ export default {
},
rowClick: function (row) {
+ if(this.editForm && row.menuId===this.editForm.menuId){
+ this.editForm=null;
+ this.$emit('row-click',null)
+ this.$refs.table.setCurrentRow();
+ return;
+ }
this.editForm = row;
this.editFormBak=Object.assign({},row)
this.$emit('row-click',row,);// @row-click="rowClick"
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 450fde65..5011fb15 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -157,16 +157,7 @@
-
-
-
-
-
-
-
-
-
@@ -184,6 +175,16 @@
+
+
+
+
+
+
+
+
+
+
是否需要结算