From fb897b38980a0d8e043c0415e84f3677e7e0cef0 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期二, 11 二月 2020 17:23:26 +0800
Subject: [PATCH] 时间调整

---
 src/components/popup/newProject.vue |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/popup/newProject.vue b/src/components/popup/newProject.vue
index 395d8e0..7d042cf 100644
--- a/src/components/popup/newProject.vue
+++ b/src/components/popup/newProject.vue
@@ -42,7 +42,7 @@
         </div>
       </div>
       <div v-if="add_Step == 1" style="width: 100%; height: 100%;" align="center">
-				<substep ref="substep_zj" v-bind:xmId="xmId"></substep>
+				<substep ref="substep_zj" v-bind:xmId="xmId" v-bind:totalItems="totalItems"></substep>
       </div>
       <div v-if="add_Step == 2" style="width: 100%; height: 100%;" align="center">
         <substepReadOnly v-bind:form_objs="form_objs" v-bind:showData_="showData_"></substepReadOnly>
@@ -85,6 +85,7 @@
 			
 			ruleForm: {},
 			xmId: null,
+			totalItems: null,
 			showData_: null,
 			form_objs: null,
 			options_objectives: [
@@ -210,7 +211,7 @@
 			  }
 			}).then(data_ => {
 				me.xmId = data_.data.data;
-				
+				me.totalItems = ruleForm_.items;
 				me.add_Step = 1;
 			}).catch(error =>{
 			})
@@ -236,6 +237,11 @@
 				if (!form_obj.mustAttach) {
 					form_obj.mustAttach = false;
 				}
+				if (form_obj.items.length > 0) {
+					form_obj.startTime = form_obj.items[0];
+					form_obj.endTime = form_obj.items[1];
+				}
+				
 				if (form_obj.startTime) {
 					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();

--
Gitblit v1.8.0