From f7914f4f545dea79019327c30800a5cfdc349f78 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期四, 09 十一月 2023 15:27:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/project/Project-AddOrUpdate.vue | 304 +++++++++++++---
web/src/views/modules/project/Project.vue | 91 ++--
web/src/views/modules/olderForm/weiTuoDan.vue | 673 ++++++++++++++++++-------------------
3 files changed, 623 insertions(+), 445 deletions(-)
diff --git a/web/src/views/modules/olderForm/weiTuoDan.vue b/web/src/views/modules/olderForm/weiTuoDan.vue
index 8771d78..29f8cb3 100644
--- a/web/src/views/modules/olderForm/weiTuoDan.vue
+++ b/web/src/views/modules/olderForm/weiTuoDan.vue
@@ -1,375 +1,359 @@
<template>
<div class="fa-card-a" style="height: calc(100vh - 130px);overflow-y: auto">
<el-form ref="form" :inline="true" :model="dataForm" label-width="120px" class="weiTuoDanAuto">
- <div class="DManageForm el-border-bottom">
+ <div class="DManageForm">
<el-form-item label-width="60px" label="缂栧彿:" style="width: 99%">
<span>{{dataForm.code}}</span>
</el-form-item>
</div>
- <div class="el-flex el-border-bottom">
- <div class="DWidth DAlign DHold">
+ <div style="border: 1px solid">
+ <div class="el-flex el-border-bottom">
+ <div class="DPadding1 DAlign DHold">
濮旀墭鏂�
- </div>
- <div class="el-border-left">
- <div class="el-flex el-border-bottom">
- <div class="DWidth DAlign DHold">
- 濮旀墭鍗曚綅
- </div>
- <div class="DOldForm el-border-left">
- <!-- 鍗曚綅鍚嶇О -->
- <el-form-item label="鍗曚綅鍚嶇О" style="width: 49%">
- <el-input v-model="dataForm.delegateUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
- </el-form-item>
- <!-- 鑱旂郴浜� -->
- <el-form-item label="鑱旂郴浜�" style="width: 49%">
- <el-input v-model="dataForm.delegateUnitContactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
- </el-form-item>
- <!-- 璇︾粏鍦板潃 -->
- <el-form-item label="璇︾粏鍦板潃" style="width: 49%">
- <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
- </el-form-item>
- <!-- 鑱旂郴鏂瑰紡 -->
- <el-form-item label="鑱旂郴鏂瑰紡" style="width: 49%">
- <el-input v-model="dataForm.delegateUnitContact" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"></el-input>
- </el-form-item>
- </div>
</div>
- <div class="el-flex el-border-bottom">
- <div class="DWidth DAlign DHold">
- 寮�鍙戝崟浣�
- </div>
- <div class="DOldForm el-border-left">
- <!-- 鍗曚綅鍚嶇О -->
- <el-form-item label="鍗曚綅鍚嶇О" style="width: 49%">
- <el-input v-model="dataForm.developmentUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
- </el-form-item>
- <!-- 鑱旂郴浜� -->
- <el-form-item label="鑱旂郴浜�" style="width: 49%">
- <el-input v-model="dataForm.developmentContactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
- </el-form-item>
- <!-- 璇︾粏鍦板潃 -->
- <el-form-item label="璇︾粏鍦板潃" style="width: 49%">
- <el-input v-model="dataForm.developmentAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
- </el-form-item>
- <!-- 鑱旂郴鏂瑰紡 -->
- <el-form-item label="鑱旂郴鏂瑰紡" style="width: 49%">
- <el-input v-model="dataForm.developmentContact" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"></el-input>
- </el-form-item>
- </div>
- </div>
- <div class="el-flex el-border-bottom">
- <div class="DWidth-Unt DAlign DHold">
- 琚祴浠朵俊鎭�
- </div>
- <div class="DOldForm el-border-left">
- <!-- 鍗曚綅鍚嶇О -->
- <el-form-item label="杞欢鍚嶇О" style="width: 49%">
- <el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�"></el-input>
- </el-form-item>
- <!-- 鑱旂郴浜� -->
- <el-form-item label="杞欢鏍囪瘑" style="width: 49%">
- <el-input v-model="dataForm.identification" placeholder="璇疯緭鍏ヨ蒋浠舵爣璇�"></el-input>
- </el-form-item>
- <!-- 璇︾粏鍦板潃 -->
- <el-form-item label="瀵嗙骇" style="width: 49%">
- <el-input v-model="dataForm.secretClass" placeholder="璇疯緭鍏ュ瘑绾�"></el-input>
- </el-form-item>
- <!-- <zt-form-item label="淇濆瘑绾у埆" prop="secretClass" style="width: 25%">-->
- <!-- <zt-dict v-model="datadataForm.secretClass" dict="secret_class" placeholder="淇濆瘑绾у埆" style="width:200px"></zt-dict>-->
- <!-- </zt-form-item>-->
- <!-- 鑱旂郴鏂瑰紡 -->
- <el-form-item label="鍏抽敭绛夌骇" style="width: 49%">
- <zt-dict v-model="dataForm.criticalLevel" :radio="true" placeholder="鍏抽敭绛夌骇" dict="critical_level" clearable></zt-dict>
- </el-form-item>
- <el-form-item label="杩愯鐜" style="width: 49%">
- <el-input v-model="dataForm.runtimeEnvironment" placeholder="璇疯緭鍏ヨ繍琛岀幆澧�"></el-input>
- </el-form-item>
- <el-form-item label="缂栫▼璇█" style="width: 49%">
- <el-input v-model="dataForm.programmingLanguage" placeholder="璇疯緭鍏ョ紪绋嬭瑷�"></el-input>
- </el-form-item>
- <div class="el-flex el-border-top-and-bottom">
- <div class="DWidth DAlign DHold">
- 琚祴浠跺強鍏朵粬鐩稿叧鐗╁搧娓呭崟
- </div>
- <div style="width: calc(100% - 120px);padding: 5px">
- <el-table class="el-software" height="230" border :data="dataForm.tableData"
- stripe>
- <el-table-column prop="code" align="center" width="80" label="搴忓彿"></el-table-column>
- <el-table-column prop="name" min-width="300" label="鍚嶇О"></el-table-column>
- <el-table-column prop="identification" align="center" width="180" label="鏍囪瘑/鐗堟湰"></el-table-column>
- <el-table-column label="鏄惁琚祴浠�" width="180" align="center">
- <template slot-scope="scope">
- <el-radio-group v-model="scope.row.isTested">
- <el-radio :label="1">鏄�</el-radio>
- <el-radio :label="0">鍚�</el-radio>
- </el-radio-group>
- </template>
- </el-table-column>
- </el-table>
- </div>
+ <div class="el-border-left">
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 濮旀墭鍗曚綅
</div>
- <div class="el-flex" style="height: 40px;">
- <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>
- </div>
- </div>
- </div>
- <div class="el-flex el-border-bottom">
- <div class="DWidth DAlign DHold">
- 娴嬭瘯瑕佹眰
- </div>
- <div class="el-border-left" style="width: 100%;">
- <div class="el-flex el-border-bottom">
- <div class="DWidth DAlign DHold">
- 娴嬭瘯渚濇嵁
- </div>
- <div class="el-border-left" style="width: 98%">
- <el-form-item style="width: 20%;padding-left:5%;">
- <el-checkbox-group v-model="dataForm.checkList">
- <el-checkbox :label="0">GB/T 25000.51-2016</el-checkbox>
- <el-checkbox :label="1">GJB/Z 141-2004</el-checkbox>
- <el-checkbox :label="2">鍏朵粬锛歿{dataForm.other}}</el-checkbox>
- </el-checkbox-group>
- </el-form-item>
- </div>
- </div>
- <div class="el-flex el-border-bottom">
- <div class="DWidth DAlign DHold">
- 娴嬭瘯绫诲瀷
- </div>
- <div class="el-border-left" style="width: 98%">
- <el-form-item style="width: 20%;padding-left:5%;">
- <zt-dict-checkbox v-model="dataForm.testType" column="2" dict="test_type1" clearable></zt-dict-checkbox>
- </el-form-item>
-<!-- <el-form-item style="width: 15%">-->
-<!-- <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 :label="3">缁存姢鎬�</el-checkbox>-->
-<!-- </el-checkbox-group>-->
-<!-- </el-form-item>-->
- <el-form-item style="width: 20%;padding-left: 15%;border-left: 1px solid;">
- <zt-dict-checkbox v-model="dataForm.testType" dict="test_type2" clearable></zt-dict-checkbox>
- </el-form-item>
-<!-- <el-form-item style="width: 20%;padding-left: 20%">-->
-<!-- <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 :label="3">鍐呭瓨缂洪櫡娴嬭瘯</el-checkbox>-->
-<!-- <el-checkbox :label="4">杈圭晫娴嬭瘯</el-checkbox>-->
-<!-- <el-checkbox :label="5">寮哄害娴嬭瘯</el-checkbox>-->
-<!-- <el-checkbox :label="6">鎭㈠鎬ф祴璇�</el-checkbox>-->
-<!-- </el-checkbox-group>-->
-<!-- </el-form-item>-->
- </div>
- </div>
- <div class="el-flex el-border-bottom">
- <div class="DWidth DAlign DHold">
- 娴嬭瘯鐩稿叧鏍囧噯/瑕佹眰
- </div>
- <div class="el-border-left" style="width: 98%">
- <el-form-item style="width: 20%;padding-left:5%;">
- <el-checkbox-group v-model="dataForm.checkList">
- <el-checkbox :label="0">GJB 438B-2009銆婂啗鐢ㄨ蒋浠跺紑鍙戞枃妗ｉ�氱敤瑕佹眰銆�</el-checkbox>
- <el-checkbox :label="1">HJB 754-2017 銆婃捣鍐涘啗鐢ㄨ蒋浠跺畾鍨嬫祴璇勫ぇ绾茬紪鍒惰姹傘��</el-checkbox>
- <el-checkbox :label="2">HJB 753-2017 銆婃捣鍐涘啗鐢ㄨ蒋浠跺畾鍨嬫祴璇勬姤鍛婄紪鍒惰姹傘��</el-checkbox>
- <el-checkbox :label="3">銆婃捣鍐涜澶囪蒋浠舵祴璇曠粏鍒欍��</el-checkbox>
- <el-checkbox :label="4">鍏朵粬锛歿{dataForm.other}}</el-checkbox>
- </el-checkbox-group>
- </el-form-item>
- </div>
- </div>
- <div class="el-flex el-border-bottom">
- <div class="DWidth DAlign DHold">
- 娴嬭瘯绾у埆
- </div>
- <div class="el-border-left" style="width: 98%">
- <el-form-item style="padding-left:5%;">
- <el-checkbox-group v-model="dataForm.checkList">
- <el-checkbox :label="0">閰嶇疆椤规祴璇�</el-checkbox>
- <el-checkbox :label="1">绯荤粺娴嬭瘯</el-checkbox>
- </el-checkbox-group>
- </el-form-item>
- </div>
- </div>
- <div class="DOldForm">
- <el-form-item label="寮�濮嬫棩鏈�" style="width: 49%">
+ <div class="DOldForm el-border-left">
+ <!-- 鍗曚綅鍚嶇О -->
+ <el-form-item label="鍗曚綅鍚嶇О" style="width: 49%">
<el-input v-model="dataForm.delegateUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
</el-form-item>
<!-- 鑱旂郴浜� -->
- <el-form-item label="缁撴潫鏃ユ湡" style="width: 49%">
+ <el-form-item label="鑱旂郴浜�" style="width: 49%">
<el-input v-model="dataForm.delegateUnitContactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
</el-form-item>
- </div>
- <div class="DOldForm el-border-bottom">
- <el-form-item label="娴嬭瘯鍦哄湴" style="width: 98%">
- <el-input v-model="dataForm.delegateUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ <!-- 璇︾粏鍦板潃 -->
+ <el-form-item label="璇︾粏鍦板潃" style="width: 49%">
+ <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <!-- 鑱旂郴鏂瑰紡 -->
+ <el-form-item label="鑱旂郴鏂瑰紡" style="width: 49%">
+ <el-input v-model="dataForm.delegateUnitContact" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"></el-input>
</el-form-item>
</div>
- <div class="el-flex">
- <div class="DWidth DAlign DHold">
- 鍏朵粬瑕佹眰
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 寮�鍙戝崟浣�
+ </div>
+ <div class="DOldForm el-border-left">
+ <!-- 鍗曚綅鍚嶇О -->
+ <el-form-item label="鍗曚綅鍚嶇О" style="width: 49%">
+ <el-input v-model="dataForm.developmentUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ </el-form-item>
+ <!-- 鑱旂郴浜� -->
+ <el-form-item label="鑱旂郴浜�" style="width: 49%">
+ <el-input v-model="dataForm.developmentContactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
+ </el-form-item>
+ <!-- 璇︾粏鍦板潃 -->
+ <el-form-item label="璇︾粏鍦板潃" style="width: 49%">
+ <el-input v-model="dataForm.developmentAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <!-- 鑱旂郴鏂瑰紡 -->
+ <el-form-item label="鑱旂郴鏂瑰紡" style="width: 49%">
+ <el-input v-model="dataForm.developmentContact" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"></el-input>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth-Unt DAlign DHold">
+ 琚祴浠朵俊鎭�
+ </div>
+ <div class="DOldForm el-border-left">
+ <!-- 鍗曚綅鍚嶇О -->
+ <el-form-item label="杞欢鍚嶇О" style="width: 49%">
+ <el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�"></el-input>
+ </el-form-item>
+ <!-- 鑱旂郴浜� -->
+ <el-form-item label="杞欢鏍囪瘑" style="width: 49%">
+ <el-input v-model="dataForm.identification" placeholder="璇疯緭鍏ヨ蒋浠舵爣璇�"></el-input>
+ </el-form-item>
+ <!-- 璇︾粏鍦板潃 -->
+ <el-form-item label="瀵嗙骇" style="width: 49%">
+ <el-input v-model="dataForm.secretClass" placeholder="璇疯緭鍏ュ瘑绾�"></el-input>
+ </el-form-item>
+ <!-- <zt-form-item label="淇濆瘑绾у埆" prop="secretClass" style="width: 25%">-->
+ <!-- <zt-dict v-model="datadataForm.secretClass" dict="secret_class" placeholder="淇濆瘑绾у埆" style="width:200px"></zt-dict>-->
+ <!-- </zt-form-item>-->
+ <!-- 鑱旂郴鏂瑰紡 -->
+ <el-form-item label="鍏抽敭绛夌骇" style="width: 49%">
+ <zt-dict v-model="dataForm.criticalLevel" :radio="true" placeholder="鍏抽敭绛夌骇" dict="critical_level" clearable></zt-dict>
+ </el-form-item>
+ <el-form-item label="杩愯鐜" style="width: 49%">
+ <el-input v-model="dataForm.runtimeEnvironment" placeholder="璇疯緭鍏ヨ繍琛岀幆澧�"></el-input>
+ </el-form-item>
+ <el-form-item label="缂栫▼璇█" style="width: 49%">
+ <el-input v-model="dataForm.programmingLanguage" placeholder="璇疯緭鍏ョ紪绋嬭瑷�"></el-input>
+ </el-form-item>
+ <div class="el-flex el-border-top-and-bottom">
+ <div class="DWidth DAlign DHold">
+ 琚祴浠跺強鍏朵粬鐩稿叧鐗╁搧娓呭崟
+ </div>
+ <div style="width: calc(100% - 120px);padding: 5px">
+ <el-table class="el-software" height="230" border :data="dataForm.tableData"
+ stripe>
+ <el-table-column prop="code" align="center" width="80" label="搴忓彿"></el-table-column>
+ <el-table-column prop="name" min-width="300" label="鍚嶇О"></el-table-column>
+ <el-table-column prop="identification" align="center" width="180" label="鏍囪瘑/鐗堟湰"></el-table-column>
+ <el-table-column label="鏄惁琚祴浠�" width="180" align="center">
+ <template slot-scope="scope">
+ <el-radio-group v-model="scope.row.isTested">
+ <el-radio :label="1">鏄�</el-radio>
+ <el-radio :label="0">鍚�</el-radio>
+ </el-radio-group>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
</div>
- <div class="el-border-left" style="width: 98%">
- <el-form-item label="鏄惁鐩朇NAS绔�" label-width="107px" style="padding-left:5%;">
+ <div class="el-flex" style="height: 40px;">
+ <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">鍏朵粬锛歿{dataForm.other}}</el-checkbox>
+ <el-checkbox :label="0">閫氱敤搴旂敤杞欢</el-checkbox>
+ <el-checkbox :label="1">琛屼笟搴旂敤杞欢</el-checkbox>
+ <el-checkbox :label="2">宓屽叆寮忚蒋浠�</el-checkbox>
</el-checkbox-group>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 娴嬭瘯瑕佹眰
+ </div>
+ <div class="el-border-left" style="width: 100%;">
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 娴嬭瘯渚濇嵁
+ </div>
+ <div class="el-border-left" style="width: 98%">
+ <el-form-item style="width: 20%;padding-left:5%;">
+ <el-checkbox-group v-model="dataForm.checkList">
+ <el-checkbox :label="0">GB/T 25000.51-2016</el-checkbox>
+ <el-checkbox :label="1">GJB/Z 141-2004</el-checkbox>
+ <el-checkbox :label="2">鍏朵粬锛歿{dataForm.other}}</el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 娴嬭瘯绫诲瀷
+ </div>
+ <div class="el-border-left" style="width: 98%">
+ <el-form-item style="width: 40%;padding-left:5%;">
+ <zt-dict-checkbox v-model="dataForm.testType" column="2" dict="test_type1" clearable></zt-dict-checkbox>
+ </el-form-item>
+ <el-form-item style="width: 60%;padding-left: 15%;border-left: 1px solid;">
+ <zt-dict-checkbox v-model="dataForm.testType" dict="test_type2" clearable></zt-dict-checkbox>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 娴嬭瘯鐩稿叧鏍囧噯/瑕佹眰
+ </div>
+ <div class="el-border-left" style="width: 98%">
+ <el-form-item style="width: 20%;padding-left:5%;">
+ <el-checkbox-group v-model="dataForm.checkList">
+ <el-checkbox :label="0">GJB 438B-2009銆婂啗鐢ㄨ蒋浠跺紑鍙戞枃妗ｉ�氱敤瑕佹眰銆�</el-checkbox>
+ <el-checkbox :label="1">HJB 754-2017 銆婃捣鍐涘啗鐢ㄨ蒋浠跺畾鍨嬫祴璇勫ぇ绾茬紪鍒惰姹傘��</el-checkbox>
+ <el-checkbox :label="2">HJB 753-2017 銆婃捣鍐涘啗鐢ㄨ蒋浠跺畾鍨嬫祴璇勬姤鍛婄紪鍒惰姹傘��</el-checkbox>
+ <el-checkbox :label="3">銆婃捣鍐涜澶囪蒋浠舵祴璇曠粏鍒欍��</el-checkbox>
+ <el-checkbox :label="4">鍏朵粬锛歿{dataForm.other}}</el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 娴嬭瘯绾у埆
+ </div>
+ <div class="el-border-left" style="width: 98%">
+ <el-form-item style="padding-left:5%;">
+ <el-checkbox-group v-model="dataForm.checkList">
+ <el-checkbox :label="0">閰嶇疆椤规祴璇�</el-checkbox>
+ <el-checkbox :label="1">绯荤粺娴嬭瘯</el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="DOldForm">
+ <el-form-item label="寮�濮嬫棩鏈�" style="width: 49%">
+ <el-input v-model="dataForm.delegateUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
</el-form-item>
+ <!-- 鑱旂郴浜� -->
+ <el-form-item label="缁撴潫鏃ユ湡" style="width: 49%">
+ <el-input v-model="dataForm.delegateUnitContactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
+ </el-form-item>
+ </div>
+ <div class="DOldForm el-border-bottom">
+ <el-form-item label="娴嬭瘯鍦哄湴" style="width: 98%">
+ <el-input v-model="dataForm.delegateUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ </el-form-item>
+ </div>
+ <div class="el-flex">
+ <div class="DWidth DAlign DHold">
+ 鍏朵粬瑕佹眰
+ </div>
+ <div class="el-border-left" style="width: 98%">
+ <el-form-item label="鏄惁鐩朇NAS绔�" label-width="107px" style="padding-left:5%;">
+ <el-checkbox-group v-model="dataForm.checkList">
+ <el-checkbox :label="0">鏄�</el-checkbox>
+ <el-checkbox :label="1">鍚�</el-checkbox>
+ <el-checkbox :label="2">鍏朵粬锛歿{dataForm.other}}</el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="el-flex">
+ <div class="DWidth DAlign DHold">
+ 濮旀墭鏂圭瀛楋細
+ </div>
+ <div class="" style="width: 100%;">
+ <div class="el-flex " style="height: 40px">
+ <div style="width: 50%">
+ <span>{{dataForm.write}}</span>
+ </div>
+ <div class="el-flex">
+ <div style="width: 120px;text-align: center">{{dataForm.year}}</div>骞�
+ <div style="width: 80px;text-align: center">{{dataForm.month}}</div>鏈�
+ <div style="width: 80px;text-align: center">{{dataForm.day}}</div>鏃�
+ </div>
</div>
</div>
</div>
</div>
- <div class="el-flex">
- <div class="DWidth DAlign DHold">
- 濮旀墭鏂圭瀛楋細
- </div>
- <div class="" style="width: 100%;">
- <div class="el-flex " style="height: 40px">
- <div style="width: 50%">
- <span>{{dataForm.write}}</span>
- </div>
+ </div>
+ <div class="el-flex">
+ <div class="DPadding2 DAlign DHold">
+ 鎵挎墭鏂�
+ </div>
+ <div class="el-border-left">
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth-Unt DAlign DHold">
+ 娴嬭瘯淇℃伅
+ </div>
+ <div class="DOldForm el-border-left">
+ <!-- 鍗曚綅鍚嶇О -->
+ <el-form-item label="娴嬭瘯鏃ユ湡" style="width: 49%">
+ <el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ユ祴璇曟棩鏈�"></el-input>
+ </el-form-item>
+ <!-- 鑱旂郴浜� -->
+ <el-form-item label="浜や粯鏃ユ湡" style="width: 49%">
+ <el-input v-model="dataForm.identification" placeholder="璇疯緭鍏ヤ氦浠樻棩鏈�"></el-input>
+ </el-form-item>
+ <!-- 璇︾粏鍦板潃 -->
+ <el-form-item label="妫�娴嬭垂鐢�" style="width: 98%">
+ <el-input v-model="dataForm.secretClass" placeholder="璇疯緭鍏ユ娴嬭垂鐢�"></el-input>
+ </el-form-item>
+ <!-- <zt-form-item label="淇濆瘑绾у埆" prop="secretClass" style="width: 25%">-->
+ <!-- <zt-dict v-model="datadataForm.secretClass" dict="secret_class" placeholder="淇濆瘑绾у埆" style="width:200px"></zt-dict>-->
+ <!-- </zt-form-item>-->
+ <!-- 鑱旂郴鏂瑰紡 -->
+ <el-form-item class="el-border-bottom" label="鐗╁搧鎬ц川" style="width: 98%">
+ <el-radio-group v-model="dataForm.criticalLevel">
+ <el-radio :label="0">鐜板満妫�娴�</el-radio>
+ <el-radio :label="1">瀹㈡埛閫佹牱</el-radio>
+ <el-radio :label="2">鍏朵粬锛歿{dataForm.other}}</el-radio>
+ </el-radio-group>
+ </el-form-item>
<div class="el-flex">
- <div style="width: 120px;text-align: center">{{dataForm.year}}</div>骞�
- <div style="width: 80px;text-align: center">{{dataForm.month}}</div>鏈�
- <div style="width: 80px;text-align: center">{{dataForm.day}}</div>鏃�
+ <div class="DWidth DAlign DHold">
+ 鏍峰搧鐘舵��
+ </div>
+ <div class="el-border-left" style="width: 98%">
+ <el-form-item label="鏄惁婊¤冻娴嬭瘯瑕佹眰:" label-width="140px">
+ <el-radio-group v-model="dataForm.checkList">
+ <el-radio :label="0">鏄�</el-radio>
+ <el-radio :label="1">鍚�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flex el-border-top">
+ <div class="DWidth DAlign DHold">
+ 浜や粯鐗╂竻鍗�
+ </div>
+ <div style="width: calc(100% - 120px);padding: 5px">
+ <el-table class="el-software" height="230" border :data="dataForm.tableData"
+ stripe>
+ <el-table-column prop="code" align="center" width="80" label="搴忓彿"></el-table-column>
+ <el-table-column prop="name" min-width="300" label="鍚嶇О"></el-table-column>
+ <el-table-column prop="identification" align="center" width="380" label="鏍囪瘑/鐗堟湰"></el-table-column>
+ </el-table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 娴嬭瘯鏈烘瀯淇℃伅
+ </div>
+ <div class="el-border-left DOldForm" style="width: 100%;">
+ <el-form-item label-width="120px" label="娴嬭瘎鏈烘瀯鍚嶇О" style="width: 98%">
+ <el-input v-model="dataForm.delegateUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ </el-form-item>
+ <!-- 鑱旂郴浜� -->
+ <el-form-item label-width="120px" label="鍦板潃" style="width: 98%">
+ <el-input v-model="dataForm.delegateUnitContactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
+ </el-form-item>
+ <!-- 璇︾粏鍦板潃 -->
+ <el-form-item label-width="120px" label="涓氬姟鑱旂郴" style="width: 49%">
+ <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <el-form-item label-width="120px" label="涓氬姟鎶曡瘔" style="width: 49%">
+ <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <el-form-item label-width="120px" label="瀹為獙瀹よ仈绯讳汉" style="width: 49%">
+ <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <el-form-item label-width="120px" label="瀹為獙瀹よ仈绯荤數璇�" style="width: 49%">
+ <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <el-form-item label-width="120px" label="閭斂缂栫爜" style="width: 49%">
+ <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <el-form-item label-width="120px" label="浼犵湡" style="width: 49%">
+ <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <el-form-item label-width="120px" label="鍦板潃" style="width: 98%">
+ <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <el-form-item label-width="120px" label="涓氬姟鎶曡瘔" style="width: 98%">
+ <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flex">
+ <div class="DWidth DAlign DHold">
+ 鎵挎墭鏂圭瀛楋細
+ </div>
+ <div class="" style="width: 100%;">
+ <div class="el-flex" style="height: 40px">
+ <div style="width: 50%">
+ <span>{{dataForm.write}}</span>
+ </div>
+ <div class="el-flex">
+ <div style="width: 120px;text-align: center">{{dataForm.year}}</div>骞�
+ <div style="width: 80px;text-align: center">{{dataForm.month}}</div>鏈�
+ <div style="width: 80px;text-align: center">{{dataForm.day}}</div>鏃�
+ </div>
</div>
</div>
</div>
</div>
</div>
</div>
- <div class="el-flex">
- <div class="DWidth DAlign DHold">
- 鎵挎墭鏂�
- </div>
- <div class="el-border-left">
- <div class="el-flex el-border-bottom">
- <div class="DWidth-Unt DAlign DHold">
- 娴嬭瘯淇℃伅
- </div>
- <div class="DOldForm el-border-left">
- <!-- 鍗曚綅鍚嶇О -->
- <el-form-item label="娴嬭瘯鏃ユ湡" style="width: 49%">
- <el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ユ祴璇曟棩鏈�"></el-input>
- </el-form-item>
- <!-- 鑱旂郴浜� -->
- <el-form-item label="浜や粯鏃ユ湡" style="width: 49%">
- <el-input v-model="dataForm.identification" placeholder="璇疯緭鍏ヤ氦浠樻棩鏈�"></el-input>
- </el-form-item>
- <!-- 璇︾粏鍦板潃 -->
- <el-form-item label="妫�娴嬭垂鐢�" style="width: 98%">
- <el-input v-model="dataForm.secretClass" placeholder="璇疯緭鍏ユ娴嬭垂鐢�"></el-input>
- </el-form-item>
- <!-- <zt-form-item label="淇濆瘑绾у埆" prop="secretClass" style="width: 25%">-->
- <!-- <zt-dict v-model="datadataForm.secretClass" dict="secret_class" placeholder="淇濆瘑绾у埆" style="width:200px"></zt-dict>-->
- <!-- </zt-form-item>-->
- <!-- 鑱旂郴鏂瑰紡 -->
- <el-form-item class="el-border-bottom" label="鐗╁搧鎬ц川" style="width: 98%">
- <el-radio-group v-model="dataForm.criticalLevel">
- <el-radio :label="0">鐜板満妫�娴�</el-radio>
- <el-radio :label="1">瀹㈡埛閫佹牱</el-radio>
- <el-radio :label="2">鍏朵粬锛歿{dataForm.other}}</el-radio>
- </el-radio-group>
- </el-form-item>
- <div class="el-flex">
- <div class="DWidth DAlign DHold">
- 鏍峰搧鐘舵��
- </div>
- <div class="el-border-left" style="width: 98%">
- <el-form-item label="鏄惁婊¤冻娴嬭瘯瑕佹眰:" label-width="140px">
- <el-radio-group v-model="dataForm.checkList">
- <el-radio :label="0">鏄�</el-radio>
- <el-radio :label="1">鍚�</el-radio>
- </el-radio-group>
- </el-form-item>
- </div>
- </div>
- <div class="el-flex el-border-top-and-bottom">
- <div class="DWidth DAlign DHold">
- 浜や粯鐗╂竻鍗�
- </div>
- <div style="width: calc(100% - 120px);padding: 5px">
- <el-table class="el-software" height="230" border :data="dataForm.tableData"
- stripe>
- <el-table-column prop="code" align="center" width="80" label="搴忓彿"></el-table-column>
- <el-table-column prop="name" min-width="300" label="鍚嶇О"></el-table-column>
- <el-table-column prop="identification" align="center" width="380" label="鏍囪瘑/鐗堟湰"></el-table-column>
- </el-table>
- </div>
- </div>
- </div>
- </div>
- <div class="el-flex el-border-bottom">
- <div class="DWidth DAlign DHold">
- 娴嬭瘯鏈烘瀯淇℃伅
- </div>
- <div class="el-border-left DOldForm" style="width: 100%;">
- <el-form-item label-width="120px" label="娴嬭瘎鏈烘瀯鍚嶇О" style="width: 98%">
- <el-input v-model="dataForm.delegateUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
- </el-form-item>
- <!-- 鑱旂郴浜� -->
- <el-form-item label-width="120px" label="鍦板潃" style="width: 98%">
- <el-input v-model="dataForm.delegateUnitContactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
- </el-form-item>
- <!-- 璇︾粏鍦板潃 -->
- <el-form-item label-width="120px" label="涓氬姟鑱旂郴" style="width: 49%">
- <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
- </el-form-item>
- <el-form-item label-width="120px" label="涓氬姟鎶曡瘔" style="width: 49%">
- <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
- </el-form-item>
- <el-form-item label-width="120px" label="瀹為獙瀹よ仈绯讳汉" style="width: 49%">
- <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
- </el-form-item>
- <el-form-item label-width="120px" label="瀹為獙瀹よ仈绯荤數璇�" style="width: 49%">
- <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
- </el-form-item>
- <el-form-item label-width="120px" label="閭斂缂栫爜" style="width: 49%">
- <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
- </el-form-item>
- <el-form-item label-width="120px" label="浼犵湡" style="width: 49%">
- <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
- </el-form-item>
- <el-form-item label-width="120px" label="鍦板潃" style="width: 98%">
- <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
- </el-form-item>
- <el-form-item label-width="120px" label="涓氬姟鎶曡瘔" style="width: 98%">
- <el-input v-model="dataForm.delegateUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
- </el-form-item>
- </div>
- </div>
- <div class="el-flex">
- <div class="DWidth DAlign DHold">
- 鎵挎墭鏂圭瀛楋細
- </div>
- <div class="" style="width: 100%;">
- <div class="el-flex" style="height: 40px">
- <div style="width: 50%">
- <span>{{dataForm.write}}</span>
- </div>
- <div class="el-flex">
- <div style="width: 120px;text-align: center">{{dataForm.year}}</div>骞�
- <div style="width: 80px;text-align: center">{{dataForm.month}}</div>鏈�
- <div style="width: 80px;text-align: center">{{dataForm.day}}</div>鏃�
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
+
</el-form>
</div>
</template>
@@ -430,7 +414,7 @@
<style>
.weiTuoDanAuto {
width: 70%;
- border: 1px solid;
+ //border: 1px solid;
margin: 0 auto;
}
.zt .weiTuoDanAuto .el-form-item.el-form-item--default{
@@ -448,7 +432,12 @@
.DWidth-Unt {
width: 100px;
}
-
+.DPadding1{
+ padding: 6px;
+}
+.DPadding2{
+ padding: 7px;
+}
.DAlign {
text-align: center;
}
diff --git a/web/src/views/modules/project/Project-AddOrUpdate.vue b/web/src/views/modules/project/Project-AddOrUpdate.vue
index 529c85e..ffc6944 100644
--- a/web/src/views/modules/project/Project-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Project-AddOrUpdate.vue
@@ -1,64 +1,175 @@
<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-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>
+ </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>
+
+ <!-- 璇︾粏鍦板潃 -->
+ <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 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>
+ </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>
+ </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>
@@ -76,13 +187,13 @@
developUnitAddress: '',
developUnitContact: '',
developUnitContWay: '',
- softwareName: '',
+ checkList:[0,1],
+ software: '',
code: '',
identity: '',
secretClass: '',
criticalLevel: '',
testLevel: '',
- softwareType: '',
projectLeader: '',
projectTesters: '',
projectReviewer: '',
@@ -93,7 +204,7 @@
methods: {
// 鑾峰彇淇℃伅
async getInfo() {
- let res = await this.$http.get(`/project/Project/${this.dataForm.id}`)
+ let res = await this.$http.get(`/project/Project//${this.dataForm.id}`)
this.dataForm = {
...this.dataForm,
...res.data
@@ -101,7 +212,7 @@
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
- let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project/Project/', this.dataForm)
+ 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()
@@ -111,3 +222,70 @@
}
}
</script>
+<style>
+.projectAuto {
+ width: 70%;
+ border: 1px solid;
+}
+
+.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;
+ width: 100%;
+}
+.el-border-left{
+ border-left: 1px solid;
+}
+.DOldForm {
+ width: 100%;
+}
+.el-border-top-and-bottom{
+ border-top: 1px solid;
+ border-bottom: 1px solid;
+}
+.DSTOld-1-Form {
+ border-left: 1px solid;
+ 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;
+}
+
+.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;
+}
+</style>
diff --git a/web/src/views/modules/project/Project.vue b/web/src/views/modules/project/Project.vue
index 4007f79..d2515bd 100644
--- a/web/src/views/modules/project/Project.vue
+++ b/web/src/views/modules/project/Project.vue
@@ -2,26 +2,32 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-project-project}">
<zt-table-wraper query-url="/project/Project/page" delete-url="/project/Project" v-slot="{ table }">
- <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
+ <el-form :inline="true" class="form-input-width-1" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�" clearable></el-input>
+
+ </el-form-item>
+ <el-form-item >
+ <zt-dict v-model="dataForm.secretClass" placeholder="瀵嗙骇" dict="secret_class" clearable></zt-dict>
+
+ </el-form-item>
+ <el-form-item >
+ <zt-dict v-model="dataForm.criticalLevel" placeholder="鍏抽敭绛夌骇" dict="critical_level" clearable></zt-dict>
+
</el-form-item>
<el-form-item>
- <zt-dict v-model="dataForm.secretClass" dict="secret_class" placeholder="璇烽�夋嫨瀵嗙骇" clearable></zt-dict>
+ <zt-dict v-model="dataForm.testLevel" placeholder="娴嬭瘯绾у埆" dict="test_level" clearable></zt-dict>
+
</el-form-item>
- <el-form-item>
- <zt-dict v-model="dataForm.criticalLevel" dict="critical_level" placeholder="璇烽�夋嫨鍏抽敭绛夌骇" clearable></zt-dict>
+ <el-form-item >
+ <zt-dict v-model="dataForm.softwareType" placeholder="杞欢绫诲瀷" dict="software_type" clearable></zt-dict>
+
</el-form-item>
- <el-form-item>
- <zt-dict v-model="dataForm.testLevel" dict="test_level" placeholder="璇烽�夋嫨娴嬭瘯绾у埆" clearable></zt-dict>
+ <el-form-item >
+ <zt-dict v-model="dataForm.isContract" placeholder="鏄惁绛剧讲鍚堝悓" dict="is_or_not" clearable></zt-dict>
+
</el-form-item>
- <el-form-item>
- <zt-dict v-model="dataForm.softwareType" dict="software_type" placeholder="璇烽�夋嫨杞欢绫诲瀷" clearable></zt-dict>
- </el-form-item>
- <el-form-item>
- <zt-dict v-model="dataForm.isContract" dict="is_or_not" placeholder="璇烽�夋嫨鏄惁绛剧讲鍚堝悓" clearable></zt-dict>
- </el-form-item>
- <el-form-item>
+ <el-form-item style="float: right">
<zt-button type="query" @click="table.query()"/>
<zt-button type="add" perm="project:add" @click="table.editHandle()"/>
<zt-button type="delete" perm="project:delete" @click="table.deleteHandle()"/>
@@ -29,18 +35,18 @@
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40"/>
- <el-table-column prop="entrustUnitName" label="濮旀墭鍗曚綅鍚嶇О"/>
- <el-table-column prop="developUnitName" label="寮�鍙戝崟浣嶅悕绉�"/>
- <el-table-column prop="softwareName" label="杞欢鍚嶇О"/>
- <el-table-column prop="code" label="椤圭洰缂栧彿"/>
- <el-table-column prop="identity" label="椤圭洰鏍囪瘑"/>
- <zt-table-column-dict prop="secretClass" label="瀵嗙骇" dict="secret_class"/>
- <zt-table-column-dict prop="criticalLevel" label="鍏抽敭绛夌骇" dict="critical_level"/>
- <zt-table-column-dict prop="testLevel" label="娴嬭瘯绾у埆" dict="test_level"/>
- <zt-table-column-dict prop="softwareType" label="杞欢绫诲瀷" dict="software_type"/>
- <el-table-column prop="projectLeader" label="椤圭洰璐熻矗浜�"/>
- <zt-table-column-dict prop="isContract" label="鏄惁绛剧讲鍚堝悓" dict="is_or_not"/>
- <zt-table-column-handle :table="table" edit-perm="project:update" delete-perm="project::delete"/>
+ <el-table-column prop="entrustUnitName" label="濮旀墭鍗曚綅鍚嶇О"/>
+ <el-table-column prop="developUnitName" label="寮�鍙戝崟浣嶅悕绉�"/>
+ <el-table-column prop="softwareName" label="杞欢鍚嶇О"/>
+ <el-table-column prop="code" label="椤圭洰缂栧彿"/>
+ <el-table-column prop="identity" label="椤圭洰鏍囪瘑"/>
+ <zt-table-column-dict prop="secretClass" label="瀵嗙骇" dict="secret_class"/>
+ <zt-table-column-dict prop="criticalLevel" label="鍏抽敭绛夌骇" dict="critical_level"/>
+ <zt-table-column-dict prop="testLevel" label="娴嬭瘯绾у埆" dict="test_level"/>
+ <zt-table-column-dict prop="softwareType" label="杞欢绫诲瀷" dict="software_type"/>
+ <el-table-column prop="projectLeader" label="椤圭洰璐熻矗浜�"/>
+ <zt-table-column-dict prop="isContract" label="鏄惁绛剧讲鍚堝悓" dict="is_or_not"/>
+ <zt-table-column-handle :table="table" edit-perm="project:update" delete-perm="project::delete"/>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update @refreshDataList="table.query"/>
@@ -50,22 +56,27 @@
</template>
<script>
- import AddOrUpdate from './Project-AddOrUpdate'
- export default {
- data() {
- return {
- dataForm: {
- softwareName: '',
- secretClass: '',
- criticalLevel: '',
- testLevel: '',
- softwareType: '',
- isContract: '',
- }
+import AddOrUpdate from './Project-AddOrUpdate'
+export default {
+ data() {
+ return {
+ dataForm: {
+ softwareName: '',
+ secretClass: '',
+ criticalLevel: '',
+ testLevel: '',
+ softwareType: '',
+ isContract: '',
}
- },
- components: {
- AddOrUpdate
}
+ },
+ components: {
+ AddOrUpdate
}
+}
</script>
+<style>
+.form-input-width-1 .el-form-item>.el-form-item__content .el-input{
+ width: 150px;
+}
+</style>
--
Gitblit v1.9.1