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 | 85 +++++++++++++++++++++++++++++++-----------
1 files changed, 62 insertions(+), 23 deletions(-)
diff --git a/src/components/popup/newProject.vue b/src/components/popup/newProject.vue
index a81cc58..3f62450 100644
--- a/src/components/popup/newProject.vue
+++ b/src/components/popup/newProject.vue
@@ -5,7 +5,7 @@
<el-step title="鏂规璁捐" description="纭珛鏂规"></el-step>
<el-step title="棰勮" description=""></el-step>
</el-steps>
- <div style="height: 55vh; padding:0px; box-sizing:boder-box; overflow: auto;">
+ <div style="height: 45vh; padding:0px; box-sizing:boder-box; overflow: auto;">
<div v-if="add_Step == 0" style="width: 100%; height: 100%;" align="center">
<div style="padding-top: 5%; box-sizing:boder-box">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
@@ -35,14 +35,14 @@
</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>
</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>
@@ -63,13 +63,21 @@
import substepReadOnly from './portion/substepReadOnly.vue'
export default {
name: 'dataImport',
+ props:{
+ rowData:{
+ type: Object,
+ required: true
+ }
+ },
components: {
substep,
substepReadOnly
},
data () {
return {
- add_Step: 0,
+ userId: undefined,
+ assign: undefined,
+ add_Step: 0,
loading_nextStep: false,
nextStepName: "涓嬩竴姝�",
loading_cancel: false,
@@ -77,6 +85,7 @@
ruleForm: {},
xmId: null,
+ totalItems: null,
showData_: null,
form_objs: null,
options_objectives: [
@@ -125,7 +134,14 @@
}
},
-
+mounted() {
+ if(this.rowData.id) {
+ this.xmId = this.rowData.id;
+ }
+ this.ruleForm = this.rowData;
+ this.userId = localStorage.getItem('userId');
+ this.assign = localStorage.getItem('assign');
+},
methods:{
Cancel() {
this.add_Step = 0;
@@ -153,7 +169,6 @@
if (valid) {
is_null1 = true;
} else {
- console.log('error submit!!');
return false;
}
});
@@ -171,31 +186,34 @@
// 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";
+ let me = this;
this.$axios.get(url,{
params: {
reseachType: ruleForm_.objective,
name: ruleForm_.name,
startTime: items1,
endTime: items2,
- id: this.xmId
+ id: me.xmId,
+ desp:ruleForm_.desp,
+ userId: me.userId
}
}).then(data_ => {
- console.log(data_);
- this.xmId = data_.data.data;
-
- this.add_Step = 1;
+ me.xmId = data_.data.data;
+ me.totalItems = ruleForm_.items;
+ me.add_Step = 1;
}).catch(error =>{
- console.log(error);
})
},
@@ -219,16 +237,24 @@
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 = 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 +265,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 +276,20 @@
})
}
},
-
+ saveStep3() {
+ let url = "/api/scheme/working/" + this.xmId;
+ this.$axios.get(url).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