From f6904bf35cc23c0531a531b6fc98c473777fc48a Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期三, 22 一月 2020 17:34:38 +0800
Subject: [PATCH] 用户

---
 src/components/popup/newProject.vue |   58 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/components/popup/newProject.vue b/src/components/popup/newProject.vue
index a81cc58..d93a4e0 100644
--- a/src/components/popup/newProject.vue
+++ b/src/components/popup/newProject.vue
@@ -35,8 +35,8 @@
 							</el-date-picker>
 					  </el-form-item>
 						
-					  <el-form-item label="椤圭洰鎻忚堪:" prop="desc" style="width: 50%;">
-					    <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+					  <el-form-item label="椤圭洰鎻忚堪:" prop="desp" style="width: 50%;">
+					    <el-input type="textarea" v-model="ruleForm.desp"></el-input>
 					  </el-form-item>
 					</el-form>
         </div>
@@ -63,6 +63,12 @@
 import substepReadOnly from './portion/substepReadOnly.vue'
 export default {
   name: 'dataImport',
+  props:{
+	  rowData:{
+		  type: Object,
+		  required: true
+	  }
+  },
 	components: {
 	  substep,
 		substepReadOnly
@@ -125,7 +131,12 @@
 			
 		}
   },
-	
+mounted() {
+	if(this.rowData.id) {
+		this.ruleForm = this.rowData;
+		this.xmId = this.rowData.id;
+	}
+},
   methods:{
 		Cancel() {
 			this.add_Step = 0;
@@ -171,14 +182,16 @@
 			//	this.nextStepName = "瀹� 鎴�";
 			}
 			else if (this.add_Step == 2) {
-				this.Cancel();
+				this.saveStep3();
 			}
 		},
 		
 		saveStep1() {
 			let ruleForm_ = this.ruleForm;
-			let items1 = new Date(ruleForm_.items[0]).Format("yyyy-MM-dd").toLocaleString();
-			let items2 = new Date(ruleForm_.items[1]).Format("yyyy-MM-dd").toLocaleString();
+			var items1 = this.$moment(ruleForm_.items[0]).format('YYYY-MM-DD');
+			var items2 = this.$moment(ruleForm_.items[1]).format('YYYY-MM-DD');
+			//let items1 = new Date(ruleForm_.items[0]).Format("yyyy-MM-dd").toLocaleString();
+		//	let items2 = new Date(ruleForm_.items[1]).Format("yyyy-MM-dd").toLocaleString();
 			
 			let url = "/api/scheme/addOrUpdate";
 			this.$axios.get(url,{
@@ -187,7 +200,8 @@
 			    name: ruleForm_.name,
 					startTime: items1,
 					endTime: items2,
-					id: this.xmId
+					id: this.xmId,
+					desp:ruleForm_.desp
 			  }
 			}).then(data_ => {
 			  console.log(data_);
@@ -220,15 +234,18 @@
 					form_obj.mustAttach = false;
 				}
 				if (form_obj.startTime) {
-					form_obj.startTime = new Date(form_obj.startTime).Format("yyyy-MM-dd").toLocaleString();
+					form_obj.startTime = this.$moment(form_obj.startTime).format('YYYY-MM-DD');
+			//		form_obj.startTime = new Date(form_obj.startTime).Format("yyyy-MM-dd").toLocaleString();
 				}
 				if (form_obj.endTime) {
-					form_obj.endTime = new Date(form_obj.endTime).Format("yyyy-MM-dd").toLocaleString();
+					form_obj.endTime = this.$moment(form_obj.endTime).format('YYYY-MM-DD');
+				//	form_obj.endTime = new Date(form_obj.endTime).Format("yyyy-MM-dd").toLocaleString();
 				}
-				if (form_obj.userId) {
-					let leng = form_obj.userId.length;
+				if (form_obj.userIds) {
+					let leng = form_obj.userIds.length;
 					
-					form_obj.userId = form_obj.userId[leng-1];
+					form_obj.roleName = form_obj.userIds[leng-2];
+					form_obj.userId = form_obj.userIds[leng-1];
 				}
 				form_obj.type = itm_k;
 				form_obj.parentId = this.xmId;
@@ -239,7 +256,7 @@
 			
 			if (is_null1) {
 				let datas = "?datas=" + encodeURI(JSON.stringify(form_array));
-				let url = "/api/schemeDetail/updates";
+				let url = "/api/detail/updates";
 				this.$axios.get(url + datas).then(data_ => {
 					console.log(data_);
 					
@@ -250,7 +267,20 @@
 				})
 			}
 		},
-		
+		saveStep3() {
+			let url = "/api/scheme/working/" + this.ruleForm.id;
+			this.$axios.get(url + datas).then(data_ => {
+				if(data_.data.success) {
+					this.$message('椤圭洰鍚姩鎴愬姛');
+					this.Cancel();
+				}else {
+					
+					this.$message({message:'椤圭洰鍚姩澶辫触', type: 'warning'});
+				}
+			}).catch(error =>{
+					console.log(error);
+			})
+		},
   }
 }
 </script>

--
Gitblit v1.8.0