From 1534d75bc0321b0f215d0652982993e96555dabd Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Sat, 29 Jun 2024 11:32:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E9=9D=9E=E5=86=9C=E4=B8=9A=E4=BA=BA?=
 =?UTF-8?q?=E5=8F=A3=E6=89=B9=E5=A4=8D=E5=AD=98=E6=A0=B9=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dangan-ui/src/views/dangan/zfnyhkcg/index.vue | 111 +++++++++---------
 1 file changed, 54 insertions(+), 57 deletions(-)

diff --git a/dangan-ui/src/views/dangan/zfnyhkcg/index.vue b/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
index 0885c9f..430e6e0 100644
--- a/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
+++ b/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
@@ -103,7 +103,7 @@
       <el-table-column label="档案目录路径" align="center" fixed prop="muPath" min-width="180" show-overflow-tooltip/>
       <el-table-column label="编号" align="center" prop="num" fixed min-width="120" show-overflow-tooltip/>
       <el-table-column label="申请人姓名" align="center" prop="name" min-width="120" show-overflow-tooltip/>
-      <el-table-column label="住址" align="center" prop="address" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="住址或单位" align="center" prop="address" min-width="100" show-overflow-tooltip/>
       <el-table-column label="与申请人关系1" align="center" prop="relation1" min-width="110" show-overflow-tooltip/>
       <el-table-column label="姓名1" align="center" prop="name1" min-width="100" show-overflow-tooltip/>
       <el-table-column label="性别1" align="center" prop="sex1" min-width="100" show-overflow-tooltip/>
@@ -119,8 +119,8 @@
       <el-table-column label="与申请人关系5" align="center" prop="relation5" min-width="110" show-overflow-tooltip/>
       <el-table-column label="姓名5" align="center" prop="name5" min-width="100" show-overflow-tooltip/>
       <el-table-column label="性别5" align="center" prop="sex5" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="机关1" align="center" prop="jg1" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="机关2" align="center" prop="jg2" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="批复机关1" align="center" prop="jg1" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="批复机关2" align="center" prop="jg2" min-width="100" show-overflow-tooltip/>
       <el-table-column label="承办人" align="center" prop="cbr" min-width="100" show-overflow-tooltip/>
       <el-table-column label="承办日期" align="center" prop="cbDate" min-width="100" show-overflow-tooltip/>
       <el-table-column label="识别图片" align="center" prop="pictures">
@@ -200,117 +200,117 @@
           <el-col :span="16">
             <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="编号" prop="num" label-width="60px">
+                <el-form-item label="编号" prop="num" label-width="40px">
                   <el-input v-model="form.num" placeholder="请输入编号" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="申请人姓名" prop="name" label-width="100px">
+                <el-form-item label="申请人姓名" prop="name" label-width="85px">
                   <el-input v-model="form.name" placeholder="请输入申请人姓名" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="24">
-                <el-form-item label="住址" prop="address" label-width="60px">
-                  <el-input v-model="form.address" placeholder="请输入住址" />
+                <el-form-item label="住址或单位" prop="address" label-width="85px">
+                  <el-input v-model="form.address" placeholder="请输入住址或单位" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="10">
-                <el-form-item label="与申请人关系1" prop="relation1" label-width="110px">
+                <el-form-item label="与申请人关系1" prop="relation1" label-width="105px">
                   <el-input v-model="form.relation1" placeholder="请输入与申请人关系1" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="姓名1" prop="name1" label-width="60px">
+                <el-form-item label="姓名1" prop="name1" label-width="50px">
                   <el-input v-model="form.name1" placeholder="请输入姓名1" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="性别1" prop="sex1" label-width="60px">
+                <el-form-item label="性别1" prop="sex1" label-width="50px">
                   <el-input v-model="form.sex1" placeholder="请输入性别1" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="10">
-                <el-form-item label="与申请人关系2" prop="relation2" label-width="110px">
+                <el-form-item label="与申请人关系2" prop="relation2" label-width="105px">
                   <el-input v-model="form.relation2" placeholder="请输入与申请人关系2" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="姓名2" prop="name2" label-width="60px">
+                <el-form-item label="姓名2" prop="name2" label-width="50px">
                   <el-input v-model="form.name2" placeholder="请输入姓名2" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="性别2" prop="sex2" label-width="60px">
+                <el-form-item label="性别2" prop="sex2" label-width="50px">
                   <el-input v-model="form.sex2" placeholder="请输入性别2" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="10">
-                <el-form-item label="与申请人关系3" prop="relation3" label-width="110px">
+                <el-form-item label="与申请人关系3" prop="relation3" label-width="105px">
                   <el-input v-model="form.relation3" placeholder="请输入与申请人关系3" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="姓名3" prop="name3" label-width="60px">
+                <el-form-item label="姓名3" prop="name3" label-width="50px">
                   <el-input v-model="form.name3" placeholder="请输入姓名3" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="性别3" prop="sex3" label-width="60px">
+                <el-form-item label="性别3" prop="sex3" label-width="50px">
                   <el-input v-model="form.sex3" placeholder="请输入性别3" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="10">
-                <el-form-item label="与申请人关系4" prop="relation4" label-width="110px">
+                <el-form-item label="与申请人关系4" prop="relation4" label-width="105px">
                   <el-input v-model="form.relation4" placeholder="请输入与申请人关系4" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="姓名4" prop="name4" label-width="60px">
+                <el-form-item label="姓名4" prop="name4" label-width="50px">
                   <el-input v-model="form.name4" placeholder="请输入姓名4" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="性别4" prop="sex4" label-width="60px">
+                <el-form-item label="性别4" prop="sex4" label-width="50px">
                   <el-input v-model="form.sex4" placeholder="请输入性别4" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="10">
-                <el-form-item label="与申请人关系5" prop="relation5" label-width="110px">
+                <el-form-item label="与申请人关系5" prop="relation5" label-width="105px">
                   <el-input v-model="form.relation5" placeholder="请输入与申请人关系5" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="姓名5" prop="name5" label-width="60px">
+                <el-form-item label="姓名5" prop="name5" label-width="50px">
                   <el-input v-model="form.name5" placeholder="请输入姓名5" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="性别5" prop="sex5" label-width="60px">
+                <el-form-item label="性别5" prop="sex5" label-width="50px">
                   <el-input v-model="form.sex5" placeholder="请输入性别5" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="机关1" prop="jg1" label-width="60px">
-                  <el-input v-model="form.jg1" placeholder="请输入机关1" />
+                <el-form-item label="批复机关1" prop="jg1" label-width="80px">
+                  <el-input v-model="form.jg1" placeholder="请输入批复机关1" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="机关2" prop="jg2" label-width="60px">
-                  <el-input v-model="form.jg2" placeholder="请输入机关2" />
+                <el-form-item label="批复机关2" prop="jg2" label-width="80px">
+                  <el-input v-model="form.jg2" placeholder="请输入批复机关2" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -321,14 +321,14 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="承办日期" prop="cbDate" label-width="80px">
+                <el-form-item label="承办日期" prop="cbDate" label-width="70px">
                   <el-input v-model="form.cbDate" placeholder="请输入承办日期" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="24">
-                <el-form-item label="备注" prop="remark" label-width="60px">
+                <el-form-item label="备注" prop="remark" label-width="45px">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
@@ -374,117 +374,117 @@
           <el-col :span="16">
             <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="编号" prop="num" label-width="60px">
+                <el-form-item label="编号" prop="num" label-width="40px">
                   <el-input v-model="form.num" placeholder="请输入编号" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="申请人姓名" prop="name" label-width="100px">
+                <el-form-item label="申请人姓名" prop="name" label-width="85px">
                   <el-input v-model="form.name" placeholder="请输入申请人姓名" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="24">
-                <el-form-item label="住址" prop="address" label-width="60px">
-                  <el-input v-model="form.address" placeholder="请输入住址" />
+                <el-form-item label="住址或单位" prop="address" label-width="85px">
+                  <el-input v-model="form.address" placeholder="请输入住址或单位" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="10">
-                <el-form-item label="与申请人关系1" prop="relation1" label-width="110px">
+                <el-form-item label="与申请人关系1" prop="relation1" label-width="105px">
                   <el-input v-model="form.relation1" placeholder="请输入与申请人关系1" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="姓名1" prop="name1" label-width="60px">
+                <el-form-item label="姓名1" prop="name1" label-width="50px">
                   <el-input v-model="form.name1" placeholder="请输入姓名1" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="性别1" prop="sex1" label-width="60px">
+                <el-form-item label="性别1" prop="sex1" label-width="50px">
                   <el-input v-model="form.sex1" placeholder="请输入性别1" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="10">
-                <el-form-item label="与申请人关系2" prop="relation2" label-width="110px">
+                <el-form-item label="与申请人关系2" prop="relation2" label-width="105px">
                   <el-input v-model="form.relation2" placeholder="请输入与申请人关系2" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="姓名2" prop="name2" label-width="60px">
+                <el-form-item label="姓名2" prop="name2" label-width="50px">
                   <el-input v-model="form.name2" placeholder="请输入姓名2" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="性别2" prop="sex2" label-width="60px">
+                <el-form-item label="性别2" prop="sex2" label-width="50px">
                   <el-input v-model="form.sex2" placeholder="请输入性别2" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="10">
-                <el-form-item label="与申请人关系3" prop="relation3" label-width="110px">
+                <el-form-item label="与申请人关系3" prop="relation3" label-width="105px">
                   <el-input v-model="form.relation3" placeholder="请输入与申请人关系3" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="姓名3" prop="name3" label-width="60px">
+                <el-form-item label="姓名3" prop="name3" label-width="50px">
                   <el-input v-model="form.name3" placeholder="请输入姓名3" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="性别3" prop="sex3" label-width="60px">
+                <el-form-item label="性别3" prop="sex3" label-width="50px">
                   <el-input v-model="form.sex3" placeholder="请输入性别3" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="10">
-                <el-form-item label="与申请人关系4" prop="relation4" label-width="110px">
+                <el-form-item label="与申请人关系4" prop="relation4" label-width="105px">
                   <el-input v-model="form.relation4" placeholder="请输入与申请人关系4" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="姓名4" prop="name4" label-width="60px">
+                <el-form-item label="姓名4" prop="name4" label-width="50px">
                   <el-input v-model="form.name4" placeholder="请输入姓名4" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="性别4" prop="sex4" label-width="60px">
+                <el-form-item label="性别4" prop="sex4" label-width="50px">
                   <el-input v-model="form.sex4" placeholder="请输入性别4" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="10">
-                <el-form-item label="与申请人关系5" prop="relation5" label-width="110px">
+                <el-form-item label="与申请人关系5" prop="relation5" label-width="105px">
                   <el-input v-model="form.relation5" placeholder="请输入与申请人关系5" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="姓名5" prop="name5" label-width="60px">
+                <el-form-item label="姓名5" prop="name5" label-width="50px">
                   <el-input v-model="form.name5" placeholder="请输入姓名5" />
                 </el-form-item>
               </el-col>
               <el-col :span="7">
-                <el-form-item label="性别5" prop="sex5" label-width="60px">
+                <el-form-item label="性别5" prop="sex5" label-width="50px">
                   <el-input v-model="form.sex5" placeholder="请输入性别5" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="机关1" prop="jg1" label-width="60px">
-                  <el-input v-model="form.jg1" placeholder="请输入机关1" />
+                <el-form-item label="批复机关1" prop="jg1" label-width="80px">
+                  <el-input v-model="form.jg1" placeholder="请输入批复机关1" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="机关2" prop="jg2" label-width="60px">
-                  <el-input v-model="form.jg2" placeholder="请输入机关2" />
+                <el-form-item label="批复机关2" prop="jg2" label-width="80px">
+                  <el-input v-model="form.jg2" placeholder="请输入批复机关2" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -495,14 +495,14 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="承办日期" prop="cbDate" label-width="80px">
+                <el-form-item label="承办日期" prop="cbDate" label-width="70px">
                   <el-input v-model="form.cbDate" placeholder="请输入承办日期" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="10">
               <el-col :span="24">
-                <el-form-item label="备注" prop="remark" label-width="60px">
+                <el-form-item label="备注" prop="remark" label-width="45px">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
@@ -699,10 +699,7 @@ export default {
       rules: {
         muPath: [
           { required: true, message: "档案目录路径不能为空", trigger: "blur" }
-        ],
-        num: [
-          { required: true, message: "编号不能为空", trigger: "blur" }
-        ],
+        ]
       },
       // 审核
       shenHe:{