From c0c4f5a80aef6e91b0a356db5416e2cea6f38606 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, 28 Mar 2022 06:21:37 +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  | 29 ++++++++++++++++++++++++-
 src/views/xm/core/xmMenu/XmMenuEdit.vue | 22 +++++++++++++++++--
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue
index ef796386..6659c692 100644
--- a/src/views/xm/core/xmMenu/XmMenuAdd.vue
+++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue
@@ -49,6 +49,27 @@
 									</el-form-item>   
 								</el-col>
 						</el-row> 
+						
+						<el-row gutter="10">
+							<el-col :span="8">
+								<el-form-item label="需求状态" prop="status"> 
+									<el-select style="display:block;width:100px;" v-model="addForm.status">
+										<el-option v-for="i in this.dicts.menuStatus" :label="i.name" :key="i.id" :value="i.id"></el-option>
+									</el-select>  
+								</el-form-item>
+							</el-col> 
+							<el-col :span="8">
+								<el-form-item label="进度" prop="finishRate">  
+									<el-progress     :percentage="addForm.mactRate"></el-progress> 
+								</el-form-item>
+							</el-col> 
+							<el-col :span="8">
+								<el-form-item label="截止时间" prop="startTime">  
+									 <el-date-picker style="width:220px;" type="daterange" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" v-model="dateRanger"></el-date-picker>
+								  
+								</el-form-item>
+							</el-col> 
+						</el-row> 
 					<el-tabs value="1"  >
 					<el-tab-pane label="基本信息'" name="1" >
 						
@@ -261,6 +282,7 @@
 				},
 				proposerSelectVisible:false,
 				mmUserSelectVisible:false,
+				dateRanger:[],
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				
 				/**end 在上面加自定义属性**/
@@ -294,6 +316,11 @@
 							if(params.remark=='作为   ，我需要   ，以便我能够   。'){
 								params.remark=""
 							}
+							
+							if(this.dateRanger.length>1){
+								params.startTime=this.dateRanger[0]
+								params.endTime=this.dateRanger[1]
+							}
 							addXmMenu(params).then((res) => {
 								this.load.add=false
 								var tips=res.data.tips;
@@ -351,7 +378,7 @@
 		},
 		mounted() {
 			
- 			initSimpleDicts('all',['demandSource','demandLvl','demandType','priority'] ).then(res=>{
+ 			initSimpleDicts('all',['demandSource','demandLvl','demandType','priority','menuStatus'] ).then(res=>{
 				this.dicts=res.data.data;
 			})
 			this.addForm=Object.assign(this.addForm, this.xmMenu);  
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index ca1bc833..ea02312b 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -60,7 +60,13 @@
 							</el-col> 
 							<el-col :span="8">
 								<el-form-item label="进度" prop="finishRate">  
-									<el-progress :text-inside="true" :stroke-width="26" :percentage="editForm.finishRate" status="success"></el-progress> 
+									<el-progress    :percentage="editForm.finishRate"></el-progress> 
+								</el-form-item>
+							</el-col> 
+							<el-col :span="8">
+								<el-form-item label="截止时间" prop="startTime">  
+									 <el-date-picker type="daterange" style="width:220px;" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" v-model="dateRanger"></el-date-picker>
+								  
 								</el-form-item>
 							</el-col> 
 						</el-row> 
@@ -245,7 +251,10 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
 	      },
 	      'visible':function(visible) {
 	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
+	      		if(this.editForm.startTime && this.editForm.endTime){
+					this.dateRanger.push(this.editForm.startTime) 
+					this.dateRanger.push(this.editForm.endTime)
+				}
 	      	}
 	      }, 
 			'editForm.mactWorkload':function(val,oldVal){
@@ -314,6 +323,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
 					]
 				},
 				tagSelectVisible:false,
+				dateRanger:[],
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 
 				/**end 在上面加自定义属性**/
@@ -337,6 +347,10 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
 						this.$confirm('确认提交吗？', '提示', {}).then(() => {
 							this.load.edit=true
 							let params = Object.assign({}, this.editForm);
+							if(this.dateRanger.length>1){
+								params.startTime=this.dateRanger[0]
+								params.endTime=this.dateRanger[1]
+							}
 							editXmMenu(params).then((res) => {
 								this.load.edit=false
 								var tips=res.data.tips;
@@ -414,6 +428,10 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
 				this.dicts=res.data.data;
 			})
 			this.editForm=Object.assign(this.editForm, this.xmMenu);
+			if(this.editForm.startTime && this.editForm.endTime){
+				this.dateRanger.push(this.editForm.startTime) 
+				this.dateRanger.push(this.editForm.endTime)
+			}
 			/**在下面写其它函数***/
 
 		}//end mounted