From 5d8c028ff37838e0628d5852e41b19efc80e4be1 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 27 十一月 2023 15:09:41 +0800
Subject: [PATCH] Changes
---
web/src/views/modules/project/Project-AddOrUpdate.vue | 303 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 236 insertions(+), 67 deletions(-)
diff --git a/web/src/views/modules/project/Project-AddOrUpdate.vue b/web/src/views/modules/project/Project-AddOrUpdate.vue
index 529c85e..0376700 100644
--- a/web/src/views/modules/project/Project-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Project-AddOrUpdate.vue
@@ -1,64 +1,130 @@
<template>
<zt-dialog ref="dialog" column="2" @confirm="formSubmit">
- <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="160px">
- <zt-form-item label="濮旀墭鍗曚綅鍚嶇О" prop="entrustUnitName" rules="required">
- <el-input v-model="dataForm.entrustUnitName"></el-input>
- </zt-form-item>
- <zt-form-item label="濮旀墭鍗曚綅鍦板潃" prop="entrustUnitAddress" rules="required">
- <el-input v-model="dataForm.entrustUnitAddress"></el-input>
- </zt-form-item>
- <zt-form-item label="濮旀墭鍗曚綅鑱旂郴浜�" prop="entrustUnitContact" rules="required">
- <el-input v-model="dataForm.entrustUnitContact"></el-input>
- </zt-form-item>
- <zt-form-item label="濮旀墭鍗曚綅鑱旂郴鏂瑰紡" prop="entrustUnitContWay" rules="required">
- <el-input v-model="dataForm.entrustUnitContWay"></el-input>
- </zt-form-item>
- <zt-form-item label="寮�鍙戝崟浣嶅悕绉�" prop="developUnitName" rules="required">
- <el-input v-model="dataForm.developUnitName"></el-input>
- </zt-form-item>
- <zt-form-item label="寮�鍙戝崟浣嶅湴鍧�" prop="developUnitAddress" rules="required">
- <el-input v-model="dataForm.developUnitAddress"></el-input>
- </zt-form-item>
- <zt-form-item label="寮�鍙戝崟浣嶈仈绯讳汉" prop="developUnitContact" rules="required">
- <el-input v-model="dataForm.developUnitContact"></el-input>
- </zt-form-item>
- <zt-form-item label="寮�鍙戝崟浣嶈仈绯绘柟寮�" prop="developUnitContWay" rules="required">
- <el-input v-model="dataForm.developUnitContWay"></el-input>
- </zt-form-item>
- <zt-form-item label="杞欢鍚嶇О" prop="softwareName" rules="required">
- <el-input v-model="dataForm.softwareName"></el-input>
- </zt-form-item>
- <zt-form-item label="椤圭洰缂栧彿" prop="code" rules="required">
- <el-input v-model="dataForm.code"></el-input>
- </zt-form-item>
- <zt-form-item label="椤圭洰鏍囪瘑" prop="identity" rules="required">
- <el-input v-model="dataForm.identity"></el-input>
- </zt-form-item>
- <zt-form-item label="瀵嗙骇" prop="secretClass" rules="required">
- <zt-dict v-model="dataForm.secretClass" dict="secret_class"></zt-dict>
- </zt-form-item>
- <zt-form-item label="鍏抽敭绛夌骇" prop="criticalLevel" rules="required">
- <zt-dict v-model="dataForm.criticalLevel" dict="critical_level"></zt-dict>
- </zt-form-item>
- <zt-form-item label="娴嬭瘯绾у埆" prop="testLevel" rules="required">
- <zt-dict v-model="dataForm.testLevel" dict="test_level"></zt-dict>
- </zt-form-item>
- <zt-form-item label="杞欢绫诲瀷" prop="softwareType" rules="required">
- <zt-dict v-model="dataForm.softwareType" dict="software_type"></zt-dict>
- </zt-form-item>
- <zt-form-item label="椤圭洰璐熻矗浜�" prop="projectLeader" rules="required">
- <el-input v-model="dataForm.projectLeader"></el-input>
- </zt-form-item>
- <zt-form-item label="椤圭洰娴嬭瘯浜哄憳" prop="projectTesters" rules="required">
- <el-input v-model="dataForm.projectTesters"></el-input>
- </zt-form-item>
- <zt-form-item label="椤圭洰瀹℃牳浜哄憳" prop="projectReviewer" rules="required">
- <el-input v-model="dataForm.projectReviewer"></el-input>
- </zt-form-item>
- <zt-form-item label="鏄惁绛剧讲鍚堝悓" prop="isContract" rules="required">
- <zt-dict v-model="dataForm.isContract" dict="is_or_not"></zt-dict>
- </zt-form-item>
- </el-form>
+<!-- <div class="fa-card-a fa-box-a" style="height: calc(100vh - 130px)">-->
+ <el-form ref="dataForm" style="padding: 0" :inline="true" :disabled="dataForm.disabled" :model="dataForm" label-width="120px"
+ class="projectAuto">
+ <div class="DManageForm">
+ <el-form-item label-width="80px" label="椤圭洰缂栧彿" prop="code" style="width: 99%;margin-bottom:-5px" readonly>
+ <span>{{dataForm.code}}</span>
+ </el-form-item>
+ </div>
+ <div style="border: 1px solid rgba(0,0,0,.2)">
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 濮旀墭鍗曚綅
+ </div>
+ <div class="DSTOld-1-Form">
+ <!-- 鍗曚綅鍚嶇О -->
+ <zt-form-item class="marginTopAndMarginBottom" label="鍗曚綅鍚嶇О" prop="entrustUnitName" style="width: 49%" rules="required">
+ <el-input v-model="dataForm.entrustUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ </zt-form-item>
+ <!-- 鑱旂郴浜� -->
+ <zt-form-item class="marginTopAndMarginBottom" label="鑱旂郴浜�" prop="entrustUnitContact" style="width: 49%" rules="required">
+ <el-input v-model="dataForm.entrustUnitContact" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
+ </zt-form-item>
+
+ <!-- 璇︾粏鍦板潃 -->
+ <zt-form-item label="璇︾粏鍦板潃" prop="entrustUnitAddress" style="width: 49%" rules="required">
+ <el-input v-model="dataForm.entrustUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </zt-form-item>
+ <!-- 鑱旂郴鏂瑰紡 -->
+ <zt-form-item label="鑱旂郴鏂瑰紡" prop="entrustUnitContWay" style="width: 49%" rules="required">
+ <el-input v-model="dataForm.entrustUnitContWay" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"></el-input>
+ </zt-form-item>
+ </div>
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 寮�鍙戝崟浣�
+ </div>
+ <div class="DSTOld-1-Form">
+ <!-- 鍗曚綅鍚嶇О -->
+ <zt-form-item class="marginTopAndMarginBottom" label="鍗曚綅鍚嶇О" prop="developUnitName" style="width: 49%" rules="required">
+ <el-input v-model="dataForm.developUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ </zt-form-item>
+ <!-- 鑱旂郴浜� -->
+ <zt-form-item class="marginTopAndMarginBottom" label="鑱旂郴浜�" prop="developUnitContact" style="width: 49%" rules="required">
+ <el-input v-model="dataForm.developUnitContact" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
+ </zt-form-item>
+ <!-- 璇︾粏鍦板潃 -->
+ <zt-form-item label="璇︾粏鍦板潃" prop="developUnitAddress" style="width: 49%" rules="required">
+ <el-input v-model="dataForm.developUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </zt-form-item>
+ <!-- 鑱旂郴鏂瑰紡 -->
+ <zt-form-item label="鑱旂郴鏂瑰紡" prop="developUnitContWay" style="width: 49%" rules="required">
+ <el-input v-model="dataForm.developUnitContWay" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"></el-input>
+ </zt-form-item>
+ </div>
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth-Unt DAlign DHold">
+ 琚祴浠朵俊鎭�
+ </div>
+ <div class="DSTOld-1-Form">
+ <!-- 鍗曚綅鍚嶇О -->
+ <zt-form-item class="marginTopAndMarginBottom" label="杞欢鍚嶇О" prop="softwareName" style="width: 49%" rules="required">
+ <el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�"></el-input>
+ </zt-form-item>
+ <!-- 鑱旂郴浜� -->
+ <zt-form-item class="marginTopAndMarginBottom" label="杞欢鏍囪瘑" prop="softwareIdentity" style="width: 49%" rules="required">
+ <el-input v-model="dataForm.softwareIdentity" placeholder="璇疯緭鍏ヨ蒋浠舵爣璇�"></el-input>
+ </zt-form-item>
+ <!-- 璇︾粏鍦板潃 -->
+ <zt-form-item label="瀵嗙骇" prop="secretClass" style="width: 49%" rules="required">
+ <zt-dict v-model="dataForm.secretClass" dict="secret_class"></zt-dict>
+ </zt-form-item>
+ <!-- <zt-form-item label="淇濆瘑绾у埆" prop="secretClass" style="width: 25%">-->
+ <!-- <zt-dict v-model="dataForm.secretClass" dict="secret_class" placeholder="淇濆瘑绾у埆" style="width:200px"></zt-dict>-->
+ <!-- </zt-form-item>-->
+ <!-- 鑱旂郴鏂瑰紡 -->
+ <zt-form-item label="鍏抽敭绛夌骇" prop="criticalLevel" style="width: 49%" rules="required">
+ <zt-dict v-model="dataForm.criticalLevel" dict="critical_level"></zt-dict>
+ </zt-form-item>
+ <div class="el-flex" style="height: 40px;border-top:1px solid rgba(0,0,0,.2)">
+ <div class="DWidth DAlign DHold">
+ 杞欢绫诲瀷
+ </div>
+ <div style="width: calc(100% - 120px);">
+ <zt-dict v-model="dataForm.softwareType" :radio="true" dict="software_type" clearable></zt-dict>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="el-flex ">
+ <div class="DWidth DAlign DHold">
+ 椤圭洰璐ｄ换浜�
+ </div>
+ <div class="DSTOld-1-Form">
+ <!-- 椤圭洰璐熻矗浜� -->
+ <zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="椤圭洰璐熻矗浜�" prop="projectLeader" style="width: 48%" rules="required">
+ <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>-->
+ <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>-->
+ <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">
+ <zt-dict v-model="dataForm.isContract" dict="is_or_not"></zt-dict>
+ </zt-form-item>
+ </div>
+ </div>
+ </div>
+ </el-form>
</zt-dialog>
</template>
@@ -76,38 +142,141 @@
developUnitAddress: '',
developUnitContact: '',
developUnitContWay: '',
+ softwareType: '',
softwareName: '',
code: '',
- identity: '',
+ softwareIdentity: '',
secretClass: '',
criticalLevel: '',
testLevel: '',
- softwareType: '',
projectLeader: '',
projectTesters: '',
projectReviewer: '',
- isContract: ''
+ isContract: '',
}
}
},
methods: {
// 鑾峰彇淇℃伅
async getInfo() {
- let res = await this.$http.get(`/project/Project/${this.dataForm.id}`)
- this.dataForm = {
- ...this.dataForm,
- ...res.data
+ let res = await this.$http.get(`/project/Project//${this.dataForm.id}`)
+ if (res.success) {
+ this.dataForm = {
+ ...this.dataForm,
+ ...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() {
- let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project/Project/', this.dataForm)
+ 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)
+ }
}
}
}
}
</script>
+<style>
+.projectAuto {
+ width: 70%;
+}
+
+.el-flex {
+ display: flex;
+ align-items: center;
+}
+
+.DWidth {
+ width: 100px;
+}
+
+.DWidth-Unt {
+ width: 100px;
+}
+
+.DAlign {
+ text-align: center;
+}
+
+.DSTOld-1-Form,
+.DSTOld-1-Form{
+ border-left: 1px solid rgba(0,0,0,.2);
+ width: 100%;
+}
+.el-border-left{
+ border-left: 1px solid rgba(0,0,0,.2);
+}
+.DOldForm {
+ width: 100%;
+}
+.el-border-top-and-bottom{
+ border-top: 1px solid rgba(0,0,0,.2);
+ border-bottom: 1px solid rgba(0,0,0,.2);
+}
+.DSTOld-1-Form {
+ border-left: 1px solid rgba(0,0,0,.2);
+ width: 100%;
+}
+
+.DSTOld-1-Form > .el-form-item>.el-form-item__content {
+ width: calc(100% - 120px);
+}
+.DManageForm > .el-form-item>.el-form-item__content {
+ width: calc(100% - 120px);
+}
+.el-border-bottom {
+ border-bottom: 1px solid rgba(0,0,0,.2);
+}
+
+.zt .el-table.el-software th {
+ background: transparent;
+}
+
+.zt .el-table.el-software th > .cell {
+ font-weight: 500;
+}
+.DHold{
+ font-weight: 600;
+}
+.zt .el-table.el-software{
+ font-size: 14px;
+}
+.projectAuto .marginTopAndMarginBottom {
+ margin-top: 10px !important;
+ margin-bottom: 0 !important;
+}
+
+.projectAuto .marginTopAndMarginBottom2 {
+ margin-top: -10px !important;
+ margin-bottom: 10px !important;
+}
+</style>
--
Gitblit v1.9.1