From de02e2ab7f6b63ce92f712bf81de829c97289ca8 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 15 十一月 2023 15:50:23 +0800
Subject: [PATCH] Changes
---
web/src/views/modules/project/Project-AddOrUpdate.vue | 302 +++++++++++++++++++++----------------------------
1 files changed, 129 insertions(+), 173 deletions(-)
diff --git a/web/src/views/modules/project/Project-AddOrUpdate.vue b/web/src/views/modules/project/Project-AddOrUpdate.vue
index ffc6944..ef6e6ce 100644
--- a/web/src/views/modules/project/Project-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Project-AddOrUpdate.vue
@@ -1,175 +1,120 @@
<template>
<zt-dialog ref="dialog" column="2" @confirm="formSubmit">
<!-- <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-border-bottom">
- <zt-form-item label-width="60px" label="椤圭洰缂栧彿" prop="code" style="width: 99%" rules="required">
- <el-input v-model="dataForm.code"></el-input>
- </zt-form-item>
+ <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 class="el-flex el-border-bottom">
- <div class="DWidth DAlign DHold">
- 濮旀墭鍗曚綅
- </div>
- <div class="DSTOld-1-Form">
- <!-- 鍗曚綅鍚嶇О -->
- <zt-form-item label="鍗曚綅鍚嶇О" prop="entrustUnitName" style="width: 49%" rules="required">
- <el-input v-model="dataForm.entrustUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
- </zt-form-item>
- <!-- 鑱旂郴浜� -->
- <zt-form-item label="鑱旂郴浜�" prop="entrustUnitContact" style="width: 49%" rules="required">
- <el-input v-model="dataForm.entrustUnitContact" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
- </zt-form-item>
+ <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>
+ <!-- 璇︾粏鍦板潃 -->
+ <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>
- <div class="el-flex el-border-bottom">
- <div class="DWidth DAlign DHold">
- 寮�鍙戝崟浣�
+ <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="DSTOld-1-Form">
- <!-- 鍗曚綅鍚嶇О -->
- <zt-form-item label="鍗曚綅鍚嶇О" prop="developUnitName" style="width: 49%" rules="required">
- <el-input v-model="dataForm.developUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
- </zt-form-item>
- <!-- 鑱旂郴浜� -->
- <zt-form-item 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 label="杞欢鍚嶇О" prop="software" style="width: 49%" rules="required">
- <el-input v-model="dataForm.software" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�"></el-input>
- </zt-form-item>
- <!-- 鑱旂郴浜� -->
- <zt-form-item label="杞欢鏍囪瘑" prop="identity" style="width: 49%" rules="required">
- <el-input v-model="dataForm.identity" 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">
- <div class="DWidth DAlign DHold">
- 杞欢绫诲瀷
- </div>
- <div style="width: calc(100% - 120px);">
- <el-checkbox-group v-model="dataForm.checkList">
- <el-checkbox :label="0">閫氱敤搴旂敤杞欢</el-checkbox>
- <el-checkbox :label="1">琛屼笟搴旂敤杞欢</el-checkbox>
- <el-checkbox :label="2">宓屽叆寮忚蒋浠�</el-checkbox>
- </el-checkbox-group>
+ <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>
- <div class="el-flex ">
- <div class="DWidth DAlign DHold">
- 椤圭洰璐ｄ换浜�
- </div>
- <div class="DSTOld-1-Form">
- <!-- 鍗曚綅鍚嶇О -->
- <zt-form-item label-width="120px" label="椤圭洰璐熻矗浜�" prop="projectLeader" style="width: 48%" rules="required">
- <el-input v-model="dataForm.projectLeader" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
- </zt-form-item>
- <!-- 鑱旂郴浜� -->
- <zt-form-item label-width="120px" label="椤圭洰娴嬭瘯浜哄憳" prop="projectTesters" style="width: 48%" rules="required">
- <el-input v-model="dataForm.projectTesters" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
- </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-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 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">
+ <el-input v-model="dataForm.projectLeader" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ </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-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-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>
-<!-- </div>-->
-<!-- <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">-->
-<!-- <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="software" rules="required">-->
-<!-- <el-input v-model="dataForm.software"></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="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>-->
</zt-dialog>
</template>
@@ -187,17 +132,17 @@
developUnitAddress: '',
developUnitContact: '',
developUnitContWay: '',
- checkList:[0,1],
- software: '',
+ softwareType: '',
+ softwareName: '',
code: '',
- identity: '',
+ softwareIdentity: '',
secretClass: '',
criticalLevel: '',
testLevel: '',
projectLeader: '',
projectTesters: '',
projectReviewer: '',
- isContract: ''
+ isContract: '',
}
}
},
@@ -205,10 +150,13 @@
// 鑾峰彇淇℃伅
async getInfo() {
let res = await this.$http.get(`/project/Project//${this.dataForm.id}`)
- this.dataForm = {
- ...this.dataForm,
- ...res.data
+ if (res.success) {
+ this.dataForm = {
+ ...this.dataForm,
+ ...res.data
+ }
}
+ console.log(this.dataForm,'this.dataForm')
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
@@ -225,7 +173,6 @@
<style>
.projectAuto {
width: 70%;
- border: 1px solid;
}
.el-flex {
@@ -247,21 +194,21 @@
.DSTOld-1-Form,
.DSTOld-1-Form{
- border-left: 1px solid;
+ border-left: 1px solid rgba(0,0,0,.2);
width: 100%;
}
.el-border-left{
- border-left: 1px solid;
+ border-left: 1px solid rgba(0,0,0,.2);
}
.DOldForm {
width: 100%;
}
.el-border-top-and-bottom{
- border-top: 1px solid;
- border-bottom: 1px solid;
+ 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;
+ border-left: 1px solid rgba(0,0,0,.2);
width: 100%;
}
@@ -272,7 +219,7 @@
width: calc(100% - 120px);
}
.el-border-bottom {
- border-bottom: 1px solid;
+ border-bottom: 1px solid rgba(0,0,0,.2);
}
.zt .el-table.el-software th {
@@ -288,4 +235,13 @@
.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