From 0f49a23a9d4dc7d3eb9a7309f8cd85a316cd4d97 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期四, 30 四月 2020 17:39:22 +0800
Subject: [PATCH] 功能调整
---
src/components/popup/newProject.vue | 130 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 120 insertions(+), 10 deletions(-)
diff --git a/src/components/popup/newProject.vue b/src/components/popup/newProject.vue
index b004a5e..4ba4b18 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: 45vh; padding:0px; box-sizing:boder-box; overflow: auto;">
+ <div style="height: 400px; 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">
@@ -36,9 +36,20 @@
</el-date-picker>
</el-form-item>
- <el-form-item label="椤圭洰鎻忚堪:" prop="desp" style="width: 50%;">
- <el-input type="textarea" v-model="ruleForm.desp"></el-input>
+ <el-form-item label="椤圭洰寮曡繘浜�:" prop="desp" style="width: 50%;">
+ <el-cascader
+ style="width: 100%;"
+ :options="options_leadUserId"
+ :props="props_"
+ @change="leadUserIdChange"
+ v-model="ruleForm.leadUserList"
+ clearable>
+ </el-cascader>
</el-form-item>
+
+ <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>
@@ -109,6 +120,7 @@
}
};
return {
+ props_: {multiple: true},
userId: undefined,
assign: undefined,
add_Step: 0,
@@ -122,6 +134,8 @@
totalItems: null,
showData_: null,
form_objs: null,
+
+ options_leadUserId: [],
options_objectives: [
{
value: "骞查鎬х郴缁熻瘎浠�",
@@ -169,15 +183,81 @@
}
},
+
+ created() {
+ this.getUsers();
+ },
mounted() {
if(this.rowData.id) {
this.xmId = this.rowData.id;
+ let url = "/api/scheme/get/" + this.rowData.id;
+ this.$axios.get(url).then(data_ => {
+ window.console.log(data_);
+ let selected_ = data_.data.data;
+ this.ruleForm = {
+ id:selected_.id,
+ desp:selected_.desp,
+ name: selected_.name,
+ beginDate: selected_.beginDate,
+ endDate: selected_.endDate,
+ objective:selected_.reseachType,
+ leadUserId: selected_.leadUserId,
+ leadUserList: selected_.leadUserList,
+ items:[this.$moment(selected_.startTime).format('YYYY-MM-DD'),this.$moment(selected_.endTime).format('YYYY-MM-DD')]
+ }
+
+ }).catch(error =>{
+
+ })
+
}
- this.ruleForm = this.rowData;
+ else {
+ this.ruleForm = this.rowData;
+ }
+
this.userId = localStorage.getItem('userId');
this.assign = localStorage.getItem('assign');
},
methods:{
+ getUsers() {
+ let me = this;
+ let url = "/api/sysRoleMapping/all";
+ this.$axios.get(url)
+ .then(data_ => {
+ let list = data_.data.data;
+ let parId = "";
+ let obj = {};
+ let result = [];
+
+ list.map(el => {
+ obj[el.id] = el;
+ })
+ for(let i=0, len = list.length; i < len; i++) {
+ let id = list[i].roleName;
+ //璁剧疆鏄剧ず瀛楁
+ list[i].value = list[i].id;
+ list[i].label = list[i].name;
+
+ if(id == parId || !id) {
+ if(!obj[list[i].id].children) {
+ obj[list[i].id].children = [];
+ }
+ result.push(list[i]);
+ continue;
+ }
+ if(obj[id].children) {
+ obj[id].children.push(list[i]);
+ } else {
+ obj[id].children = [list[i]];
+ }
+ }
+
+ me.options_leadUserId = result;
+ }).catch(error =>{
+
+ })
+ },
+
Cancel() {
this.add_Step = 0;
this.nextStepName = "涓嬩竴姝�";
@@ -208,8 +288,8 @@
}
});
if(is_null1) {
- // this.loading_nextStep = true;
- // this.saveStep1();
+ this.loading_nextStep = true;
+ this.saveStep1();
}
// this.xmId = "c3b7f55c800e4726b53fdc18dd994603";
@@ -240,7 +320,8 @@
endTime: items2,
id: me.xmId,
desp:ruleForm_.desp,
- userId: me.userId
+ userId: me.userId,
+ leadUserId: ruleForm_.leadUserId
};
if (this.rowData.parentid) {
@@ -318,6 +399,21 @@
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.parttimeUser && form_obj.parttimeUser.length>0) {
+ let parttimeUser_ = "";
+ for (let i = 0; i<form_obj.parttimeUser.length; i++) {
+ if (parttimeUser_ == "") {
+ parttimeUser_ = form_obj.parttimeUser[i];
+ }
+ else {
+ parttimeUser_ = parttimeUser_ + ";" + form_obj.parttimeUser[i];
+ }
+ }
+
+ form_obj.parttimeUser = parttimeUser_;
+ }
+
if (form_obj.userIds) {
let leng = form_obj.userIds.length;
@@ -335,12 +431,10 @@
let datas = "?datas=" + encodeURI(JSON.stringify(form_array));
let url = "/api/detail/updates";
this.$axios.get(url + datas).then(data_ => {
- console.log(data_);
this.add_Step = 2;
this.nextStepName = "瀹� 鎴�";
}).catch(error =>{
- console.log(error);
})
}
},
@@ -355,9 +449,25 @@
this.$message({message:'椤圭洰鍚姩澶辫触', type: 'warning'});
}
}).catch(error =>{
- console.log(error);
})
},
+
+ leadUserIdChange(val) {
+ let aa = val;
+ let s_ = "";
+ for (let i=0; i<val.length; i++) {
+ if (i == 0) {
+ let val_ = val[i];
+ s_ = val_[val_.length - 1];
+ }
+ else {
+ let val_ = val[i];
+ s_ = s_ + ";" + val_[val_.length - 1];
+ }
+ }
+ this.ruleForm.leadUserId = s_;
+ },
+
}
}
</script>
--
Gitblit v1.8.0