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/olderForm/weiTuoDan.vue |  673 +++++++++++++++++++++++++++----------------------------
 1 files changed, 331 insertions(+), 342 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">浠g爜瀹℃煡</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銆婂啗鐢ㄨ蒋浠跺紑鍙戞枃妗i�氱敤瑕佹眰銆�</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銆婂啗鐢ㄨ蒋浠跺紑鍙戞枃妗i�氱敤瑕佹眰銆�</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;
 }

--
Gitblit v1.9.1