From 7748cd8a79548e94299d24e080c4650924a215da Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期二, 28 十一月 2023 09:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/project/Project-AddOrUpdate.vue | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/web/src/views/modules/project/Project-AddOrUpdate.vue b/web/src/views/modules/project/Project-AddOrUpdate.vue
index 939e641..0376700 100644
--- a/web/src/views/modules/project/Project-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Project-AddOrUpdate.vue
@@ -97,15 +97,25 @@
<div class="DSTOld-1-Form">
<!-- 椤圭洰璐熻矗浜� -->
<zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="椤圭洰璐熻矗浜�" prop="projectLeader" style="width: 48%" rules="required">
- <el-input v-model="dataForm.projectLeader" placeholder="璇疯緭鍏ラ」鐩礋璐ｄ汉"></el-input>
+ <zt-select v-model="dataForm.projectLeader" url="/sys/userEx/getUsersList" placeholder="椤圭洰璐熻矗浜�"/>
+<!-- <el-input v-model="dataForm.projectLeader" placeholder="璇疯緭鍏ラ」鐩礋璐ｄ汉"></el-input>-->
+<!-- <el-select v-model="dataForm.projectLeader" placeholder="椤圭洰璐熻矗浜�" style="width: 100%">-->
+<!-- <el-option v-for="data in dataList"></el-option>-->
+<!-- </el-select>-->
+<!-- <el-select v-model="dataForm.projectLeader" clearable placeholder="椤圭洰璐熻矗浜�">-->
+<!-- <el-option v-for="item in dataList" :key="item.value" :label="item.label"-->
+<!-- :value="item.value"/>-->
+<!-- </el-select>-->
</zt-form-item>
<!-- 椤圭洰娴嬭瘯浜哄憳 -->
<zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="椤圭洰娴嬭瘯浜哄憳" prop="projectTesters" style="width: 48%" rules="required">
- <el-input v-model="dataForm.projectTesters" placeholder="璇疯緭鍏ラ」鐩祴璇曚汉鍛�"></el-input>
+<!-- <el-input v-model="dataForm.projectTesters" placeholder="璇疯緭鍏ラ」鐩祴璇曚汉鍛�"></el-input>-->
+ <zt-select v-model="dataForm.projectTesters" url="/sys/userEx/getUsersList" :multiple="true" :clearable="true" placeholder="椤圭洰娴嬭瘯浜哄憳"/>
</zt-form-item>
<!-- 椤圭洰瀹℃牳浜� -->
<zt-form-item label-width="120px" label="椤圭洰瀹℃牳浜�" prop="projectReviewer" style="width: 48%" rules="required">
- <el-input v-model="dataForm.projectReviewer" placeholder="璇疯緭鍏ラ」鐩鏍镐汉"></el-input>
+<!-- <el-input v-model="dataForm.projectReviewer" placeholder="璇疯緭鍏ラ」鐩鏍镐汉"></el-input>-->
+ <zt-select v-model="dataForm.projectReviewer" url="/sys/userEx/getUsersList" :multiple="true" :clearable="true" placeholder="椤圭洰瀹℃牳浜�"/>
</zt-form-item>
<!-- 鏄惁绛剧讲鍚堝悓 -->
<zt-form-item label-width="120px" label="鏄惁绛剧讲鍚堝悓" prop="isContract" style="width: 48%" rules="required">
@@ -156,15 +166,40 @@
...res.data
}
}
+ if(this.dataForm && this.dataForm.projectTesters){
+ this.dataForm.projectTesters=this.dataForm.projectTesters.split(',')
+ console.log(this.dataForm.projectTesters)
+ }
+ if(this.dataForm && this.dataForm.projectReviewer){
+ this.dataForm.projectReviewer=this.dataForm.projectReviewer.split(',')
+ console.log(this.dataForm.projectReviewer)
+ }
console.log(this.dataForm,'this.dataForm')
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
+ if(this.dataForm && this.dataForm.projectTesters){
+ this.dataForm.projectTesters=this.dataForm.projectTesters.join(',')
+ console.log(this.dataForm.projectTesters)
+ }
+ if(this.dataForm && this.dataForm.projectReviewer){
+ this.dataForm.projectReviewer=this.dataForm.projectReviewer.join(',')
+ console.log(this.dataForm.projectReviewer)
+ }
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project/Project//', this.dataForm)
if (res.success) {
await this.$tip.success()
this.$refs.dialog.close()
this.$emit('refreshDataList')
+ }else {
+ if(this.dataForm && this.dataForm.projectTesters){
+ this.dataForm.projectTesters=this.dataForm.projectTesters.split(',')
+ console.log(this.dataForm.projectTesters)
+ }
+ if(this.dataForm && this.dataForm.projectReviewer){
+ this.dataForm.projectReviewer=this.dataForm.projectReviewer.split(',')
+ console.log(this.dataForm.projectReviewer)
+ }
}
}
}
--
Gitblit v1.9.1