Browse Source

优化

master
陈裕财 3 years ago
parent
commit
ac3dc51920
  1. 12
      src/views/xm/core/xmMenu/XmMenuAdd.vue
  2. 1
      src/views/xm/core/xmMenu/XmMenuMng.vue
  3. 1
      src/views/xm/core/xmTask/XmPhase.vue
  4. 13
      src/views/xm/core/xmTask/XmTaskAdd.vue
  5. 2
      src/views/xm/core/xmTask/XmTaskMng.vue

12
src/views/xm/core/xmMenu/XmMenuAdd.vue

@ -99,7 +99,8 @@
</el-row>
<el-row class="padding">
<el-button @click.native="handleCancel">关闭</el-button>
<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>
<el-button v-loading="load.add" type="primary" @click.native="addSubmit(1)" :disabled="load.add==true">提交(关闭窗口)</el-button>
<el-button v-loading="load.add" type="primary" @click.native="addSubmit(2)" :disabled="load.add==true">提交(继续新增)</el-button>
</el-row>
<el-dialog title="上级需求详情" :visible.sync="pmenuFormVisible" :with-header="false" width="90%" top="20px" append-to-body :close-on-click-modal="false" >
<xm-menu-edit v-if="pmenuFormVisible" :reload="true" :xm-menu="{menuId:addForm.pmenuId}" :sel-project="selProject" :visible="pmenuFormVisible" @cancel="pmenuFormVisible=false"></xm-menu-edit>
@ -203,7 +204,7 @@
this.$emit('cancel');
},
//XmMenu @submit="afterAddSubmit"
addSubmit: function () {
addSubmit: function (submitType) {
if(this.addForm.productId==null){
this.$notify({position:'bottom-left',showClose:true,message: '请选择产品/或者上级需求进行新增', type:'error' });
return;
@ -239,6 +240,13 @@
var tips=res.data.tips;
if(tips.isOk){
this.$emit('submit',res.data.data);// @submit="afterAddSubmit"
if(submitType==1){
this.handleCancel()
}else{
var seqNos=this.addForm.seqNo.split(".")
seqNos[seqNos.length-1]=parseInt(seqNos[seqNos.length-1])+1
this.addForm.seqNo=seqNos.join(".");
}
}
this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
}).catch( err => this.load.add=false);

1
src/views/xm/core/xmMenu/XmMenuMng.vue

@ -834,7 +834,6 @@
this.$refs.xmProductMng.showAdd();
},
afterAddSubmit(row){
this.addFormVisible=false;
this.pageInfo.count=true;
this.xmMenus.push(row);
if(this.parentMenu){

1
src/views/xm/core/xmTask/XmPhase.vue

@ -886,6 +886,7 @@ export default {
i.actWorkload = 0;
i.taskState = "0";
i.rate = 0;
i.sortLevel=i.seqNo;
i.taskOut = i.taskOut ? i.taskOut : "0";
i.taskClass = i.taskClass ? i.taskClass : "1";
i.toTaskCenter = i.toTaskCenter ? i.toTaskCenter : "1";

13
src/views/xm/core/xmTask/XmTaskAdd.vue

@ -208,7 +208,8 @@
</el-tabs>
<el-row class="padding" style="float:right;">
<el-button @click.native="handleCancel">取消</el-button>
<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>
<el-button v-loading="load.add" type="primary" @click.native="addSubmit(1)" :disabled="load.add==true">提交(关闭窗口)</el-button>
<el-button v-loading="load.add" type="primary" @click.native="addSubmit(2)" :disabled="load.add==true">提交(继续新增)</el-button>
</el-row>
</el-form>
</el-row>
@ -364,7 +365,7 @@
this.$emit('cancel');
},
//XmTask xm_task @submit="afterAddSubmit"
addSubmit: function () {
addSubmit: function (submitType) {
if(this.addForm.ntype!='1'){
if(this.xmIteration && this.xmIteration.id){
if(!this.addForm.menuId){
@ -409,8 +410,16 @@
var tips=res.data.tips;
if(tips.isOk){
this.$emit('submit',res.data.data);// @submit="afterAddSubmit"
if(submitType==1){
this.handleCancel()
}else{
var sortLevels=this.addForm.sortLevel.split(".")
sortLevels[sortLevels.length-1]=parseInt(sortLevels[sortLevels.length-1])+1
this.addForm.sortLevel=sortLevels.join(".");
}
}
this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
}).catch( err => this.load.add=false);
});
}else{

2
src/views/xm/core/xmTask/XmTaskMng.vue

@ -1408,7 +1408,6 @@ export default {
this.addFormVisible = true;
},
afterAddSubmit(row) {
this.addFormVisible = false;
this.pageInfo.count = true;
this.xmTasks.push(row)
//this.getXmTasks()
@ -1618,6 +1617,7 @@ export default {
i.actWorkload = 0;
i.taskState = "0";
i.rate = 0;
i.sortLevel=i.seqNo
i.taskOut = i.taskOut ? i.taskOut : "0";
i.taskClass = i.taskClass ? i.taskClass : "1";
i.toTaskCenter = i.toTaskCenter ? i.toTaskCenter : "1";

Loading…
Cancel
Save