From 7a8920cd22441a8b14174e4dfad42be591b3725f Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期二, 17 三月 2020 09:28:04 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs
---
src/components/popup/newProject.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/components/popup/newProject.vue b/src/components/popup/newProject.vue
index 395d8e0..3f62450 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: [
@@ -135,9 +136,9 @@
},
mounted() {
if(this.rowData.id) {
- this.ruleForm = this.rowData;
this.xmId = this.rowData.id;
}
+ this.ruleForm = this.rowData;
this.userId = localStorage.getItem('userId');
this.assign = localStorage.getItem('assign');
},
@@ -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_fz.length > 0) {
+ form_obj.startTime = form_obj.items_fz[0];
+ form_obj.endTime = form_obj.items_fz[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