From b52656f254b5d81d49aed544ed51b26a7b932f06 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期二, 17 三月 2020 15:33:55 +0800
Subject: [PATCH] 调整

---
 src/components/popup/newProject.vue |   67 ++++++++++++++++++++++++---------
 1 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/src/components/popup/newProject.vue b/src/components/popup/newProject.vue
index 3f62450..f4edffe 100644
--- a/src/components/popup/newProject.vue
+++ b/src/components/popup/newProject.vue
@@ -191,30 +191,61 @@
 		},
 		
 		saveStep1() {
+			let me = this;
 			let ruleForm_ = this.ruleForm;
 			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 listId = "";
+			let params_ = {
+				reseachType: ruleForm_.objective,
+				name: ruleForm_.name,
+				startTime: items1,
+				endTime: items2,
+				id: me.xmId,
+				desp:ruleForm_.desp,
+				userId: me.userId
+			};
 			
-			let url = "/api/scheme/addOrUpdate";
-			let me = this;
-			this.$axios.get(url,{
-			  params: {
-			    reseachType: ruleForm_.objective,
-			    name: ruleForm_.name,
-					startTime: items1,
-					endTime: items2,
-					id: me.xmId,
-					desp:ruleForm_.desp,
-					userId: me.userId
-			  }
-			}).then(data_ => {
-				me.xmId = data_.data.data;
-				me.totalItems = ruleForm_.items;
-				me.add_Step = 1;
-			}).catch(error =>{
-			})
+			if (this.rowData.parentid) {
+				listId = this.rowData.parentid;
+			}
+			
+			if (!me.xmId && this.rowData.parentid) {
+				let url_ = "/api/scheme/addOrUpdate";
+				this.$axios.get(url_,{
+				  params: params_
+				}).then(data_ => {
+					me.xmId = data_.data.data;
+					me.totalItems = ruleForm_.items;
+					let url = "/api/topic/exam/" + listId;
+					this.$axios.get(url,{
+						params: {
+							projectId: me.xmId
+						}
+					}).then(data_1 => {
+						if(data_1.data.success) {
+							me.add_Step = 1;
+						}else {
+							this.$message({message:'鍒涘缓椤圭洰澶辫触', type: 'warning'});
+						}
+					}).catch(error => {
+					})
+				}).catch(error =>{
+				})
+			}
+			else {
+				let url_ = "/api/scheme/addOrUpdate";
+				this.$axios.get(url_,{
+				  params: params_
+				}).then(data_ => {
+					me.xmId = data_.data.data;
+					me.totalItems = ruleForm_.items;
+					me.add_Step = 1;
+				}).catch(error =>{
+				})
+			}
 		},
 		
 		saveStep2() {

--
Gitblit v1.8.0