From ac3dc51920f138ff3e96269c50dcd27240d9abbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 3 Apr 2023 18:07:16 +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/XmMenuAdd.vue | 12 ++++++++++--
 src/views/xm/core/xmMenu/XmMenuMng.vue |  3 +--
 src/views/xm/core/xmTask/XmPhase.vue   |  1 +
 src/views/xm/core/xmTask/XmTaskAdd.vue | 13 +++++++++++--
 src/views/xm/core/xmTask/XmTaskMng.vue |  4 ++--
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue
index 67c8a81c..2e481e66 100644
--- a/src/views/xm/core/xmMenu/XmMenuAdd.vue
+++ b/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);
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 958cb2a0..bc16e0c9 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -833,8 +833,7 @@
 			showProdcutAdd:function(){
 				this.$refs.xmProductMng.showAdd();
 			},
-			afterAddSubmit(row){
-				this.addFormVisible=false;
+			afterAddSubmit(row){ 
 				this.pageInfo.count=true; 
 				this.xmMenus.push(row); 
 				if(this.parentMenu){
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 21930972..42497ca4 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/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";
diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index aae5c3de..71c3a259 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/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{
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 13b36ef9..49761f4f 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -1407,8 +1407,7 @@ export default {
       this.addForm.ntype=ntype;
       this.addFormVisible = true;
     },
-    afterAddSubmit(row) {
-      this.addFormVisible = false;
+    afterAddSubmit(row) { 
       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";