From 8a5fc1071e78d48c904c20da856faed1eb54593c Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Tue, 18 Jun 2024 13:59:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=90=88=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dangan-ui/src/views/dangan/birthDJ/index.vue  |  99 +++---
 dangan-ui/src/views/dangan/czrkdj/index.vue   |  24 +-
 .../src/views/dangan/pictureRecard/index.vue  | 317 +++++++++++-------
 dangan-ui/src/views/dangan/qyz/index.vue      | 163 +++++----
 dangan-ui/src/views/dangan/ytzm/index.vue     | 166 ++++-----
 dangan-ui/src/views/dangan/zfnyhkcg/index.vue | 234 ++++++-------
 dangan-ui/src/views/dangan/zqz/index.vue      | 112 ++-----
 7 files changed, 522 insertions(+), 593 deletions(-)

diff --git a/dangan-ui/src/views/dangan/birthDJ/index.vue b/dangan-ui/src/views/dangan/birthDJ/index.vue
index 2f0cd09..5a0907c 100644
--- a/dangan-ui/src/views/dangan/birthDJ/index.vue
+++ b/dangan-ui/src/views/dangan/birthDJ/index.vue
@@ -297,8 +297,8 @@
     />
 
     <!-- 纠错 -->
-    <el-dialog title="纠错" :visible.sync="open_jc" width="1400px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-dialog title="纠错" :visible.sync="open_jc" width="1200px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="10">
           <el-col :span="8">
             <el-carousel height="600px" v-if="form.pictures" :autoplay="false">
@@ -310,7 +310,7 @@
             </el-carousel>
           </el-col>
           <el-col :span="16">
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
                 <el-form-item label="出生证编号" prop="birthNum">
                   <el-input v-model="form.birthNum" placeholder="请输入出生证编号" />
@@ -322,7 +322,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
                 <el-form-item label="出生时间" prop="birthday">
                   <el-input v-model="form.birthday" placeholder="请输入出生时间" />
@@ -334,33 +334,33 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
                 <el-form-item label="出生地点" prop="bornAddress">
                   <el-input v-model="form.bornAddress" placeholder="请输入出生地点" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="8">
-                <el-form-item label="母亲姓名" prop="mName">
+                <el-form-item label="母亲姓名" prop="mName" label-width="70px">
                   <el-input v-model="form.mName" placeholder="请输入母亲姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="母亲年龄" prop="mAge">
+                <el-form-item label="母亲年龄" prop="mAge" label-width="70px">
                   <el-input v-model="form.mAge" placeholder="请输入母亲年龄" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="母亲国籍" prop="mGj">
+                <el-form-item label="母亲国籍" prop="mGj" label-width="70px">
                   <el-input v-model="form.mGj" placeholder="请输入母亲国籍" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="母亲民族" prop="mNation">
+                <el-form-item label="母亲民族" prop="mNation" label-width="80px">
                   <el-input v-model="form.mNation" placeholder="请输入母亲民族" />
                 </el-form-item>
               </el-col>
@@ -370,26 +370,26 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="8">
-                <el-form-item label="父亲姓名" prop="fName">
+                <el-form-item label="父亲姓名" prop="fName" label-width="80px">
                   <el-input v-model="form.fName" placeholder="请输入父亲姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="父亲年龄" prop="fAge">
+                <el-form-item label="父亲年龄" prop="fAge" label-width="80px">
                   <el-input v-model="form.fAge" placeholder="请输入父亲年龄" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="父亲国籍" prop="fGj">
+                <el-form-item label="父亲国籍" prop="fGj" label-width="80px">
                   <el-input v-model="form.fGj" placeholder="请输入父亲国籍" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="父亲民族" prop="fNation">
+                <el-form-item label="父亲民族" prop="fNation" label-width="80px">
                   <el-input v-model="form.fNation" placeholder="请输入父亲民族" />
                 </el-form-item>
               </el-col>
@@ -399,9 +399,9 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="家庭住址" prop="homeAddress">
+                <el-form-item label="家庭住址" prop="homeAddress" label-width="80px">
                   <el-input v-model="form.homeAddress" placeholder="请输入家庭住址" />
                 </el-form-item>
               </el-col>
@@ -411,19 +411,19 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
                 <el-form-item label="接生人员签字" prop="jsrySign">
                   <el-input v-model="form.jsrySign" placeholder="请输入接生人员签字" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="接生单位" prop="jsUnit">
+                <el-form-item label="接生单位" prop="jsUnit" label-width="80px">
                   <el-input v-model="form.jsUnit" placeholder="请输入接生单位" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
                 <el-form-item label="备注" prop="remark">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -441,9 +441,9 @@
     </el-dialog>
 
     <!--    新增手动识别-->
-    <el-dialog title="新增手动识别" :visible.sync="open_add" width="1400px" append-to-body>
+    <el-dialog title="新增手动识别" :visible.sync="open_add" width="1200px" append-to-body>
 
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
 
         <el-row :gutter="20">
           <el-col :span="12">
@@ -469,8 +469,7 @@
             </el-carousel>
           </el-col>
           <el-col :span="16">
-
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
                 <el-form-item label="出生证编号" prop="birthNum">
                   <el-input v-model="form.birthNum" placeholder="请输入出生证编号" />
@@ -482,7 +481,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
                 <el-form-item label="出生时间" prop="birthday">
                   <el-input v-model="form.birthday" placeholder="请输入出生时间" />
@@ -494,33 +493,33 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
                 <el-form-item label="出生地点" prop="bornAddress">
                   <el-input v-model="form.bornAddress" placeholder="请输入出生地点" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="8">
-                <el-form-item label="母亲姓名" prop="mName">
+                <el-form-item label="母亲姓名" prop="mName" label-width="70px">
                   <el-input v-model="form.mName" placeholder="请输入母亲姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="母亲年龄" prop="mAge">
+                <el-form-item label="母亲年龄" prop="mAge" label-width="70px">
                   <el-input v-model="form.mAge" placeholder="请输入母亲年龄" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="母亲国籍" prop="mGj">
+                <el-form-item label="母亲国籍" prop="mGj" label-width="70px">
                   <el-input v-model="form.mGj" placeholder="请输入母亲国籍" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="母亲民族" prop="mNation">
+                <el-form-item label="母亲民族" prop="mNation" label-width="80px">
                   <el-input v-model="form.mNation" placeholder="请输入母亲民族" />
                 </el-form-item>
               </el-col>
@@ -530,26 +529,26 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="8">
-                <el-form-item label="父亲姓名" prop="fName">
+                <el-form-item label="父亲姓名" prop="fName" label-width="80px">
                   <el-input v-model="form.fName" placeholder="请输入父亲姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="父亲年龄" prop="fAge">
+                <el-form-item label="父亲年龄" prop="fAge" label-width="80px">
                   <el-input v-model="form.fAge" placeholder="请输入父亲年龄" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="父亲国籍" prop="fGj">
+                <el-form-item label="父亲国籍" prop="fGj" label-width="80px">
                   <el-input v-model="form.fGj" placeholder="请输入父亲国籍" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="父亲民族" prop="fNation">
+                <el-form-item label="父亲民族" prop="fNation" label-width="80px">
                   <el-input v-model="form.fNation" placeholder="请输入父亲民族" />
                 </el-form-item>
               </el-col>
@@ -559,9 +558,9 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="家庭住址" prop="homeAddress">
+                <el-form-item label="家庭住址" prop="homeAddress" label-width="80px">
                   <el-input v-model="form.homeAddress" placeholder="请输入家庭住址" />
                 </el-form-item>
               </el-col>
@@ -571,26 +570,25 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
                 <el-form-item label="接生人员签字" prop="jsrySign">
                   <el-input v-model="form.jsrySign" placeholder="请输入接生人员签字" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="接生单位" prop="jsUnit">
+                <el-form-item label="接生单位" prop="jsUnit" label-width="80px">
                   <el-input v-model="form.jsUnit" placeholder="请输入接生单位" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
                 <el-form-item label="备注" prop="remark">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
             </el-row>
-
           </el-col>
 
         </el-row>
@@ -670,9 +668,9 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dalsInfo.loading" :data="dalsInfo.list" border height="500" @selection-change="dalsInfoDblclick">
-        <el-table-column type="selection" width="50" align="center" fixed/>
-        <el-table-column label="档案目录ID" align="center" prop="muId" fixed min-width="50"/>
-        <el-table-column label="档案目录路径" align="center" prop="muPath" fixed min-width="100" show-overflow-tooltip/>
+        <el-table-column type="selection" width="50" align="center"/>
+        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="50"/>
+        <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="100" show-overflow-tooltip/>
         <el-table-column label="物理书架路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
         <el-table-column label="是否已经识别" align="center" prop="recognize" >
           <template slot-scope="scope">
@@ -803,9 +801,6 @@ export default {
         muId: [
           { required: true, message: "档案目录ID不能为空", trigger: "blur" }
         ],
-        birthNum: [
-          { required: true, message: "出生证编号不能为空", trigger: "blur" }
-        ],
         name: [
           { required: true, message: "婴儿姓名不能为空", trigger: "blur" }
         ],
diff --git a/dangan-ui/src/views/dangan/czrkdj/index.vue b/dangan-ui/src/views/dangan/czrkdj/index.vue
index 5654042..bbd8ef2 100644
--- a/dangan-ui/src/views/dangan/czrkdj/index.vue
+++ b/dangan-ui/src/views/dangan/czrkdj/index.vue
@@ -25,14 +25,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="出生日期" prop="birthday">
+<!--      <el-form-item label="出生日期" prop="birthday">
         <el-date-picker clearable
                         v-model="queryParams.birthday"
                         type="date"
                         value-format="yyyy-MM-dd"
                         placeholder="请选择出生日期">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item>-->
 <!--      <el-form-item label="出生地址" prop="address">
         <el-input
           v-model="queryParams.address"
@@ -331,11 +331,7 @@
       <el-table-column label="与户主关系" align="center" prop="relation" min-width="100" show-overflow-tooltip/>
       <el-table-column label="别名" align="center" prop="otherName" min-width="100" show-overflow-tooltip/>
       <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
       <el-table-column label="出生地址" align="center" prop="address" min-width="100" show-overflow-tooltip/>
       <el-table-column label="原籍" align="center" prop="yj" min-width="100" show-overflow-tooltip />
       <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>
@@ -463,12 +459,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="出生日期" prop="birthday">
-                  <el-date-picker clearable style="width:100%;"
-                                  v-model="form.birthday"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择出生日期">
-                  </el-date-picker>
+                  <el-input v-model="form.birthday" placeholder="请输入出生日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -705,12 +696,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="出生日期" prop="birthday">
-                  <el-date-picker clearable style="width:100%;"
-                                  v-model="form.birthday"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择出生日期">
-                  </el-date-picker>
+                  <el-input v-model="form.birthday" placeholder="请输入出生日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
diff --git a/dangan-ui/src/views/dangan/pictureRecard/index.vue b/dangan-ui/src/views/dangan/pictureRecard/index.vue
index 38178db..050b852 100644
--- a/dangan-ui/src/views/dangan/pictureRecard/index.vue
+++ b/dangan-ui/src/views/dangan/pictureRecard/index.vue
@@ -1,129 +1,159 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="档案目录ID" prop="muId">
-        <el-input
-          v-model="queryParams.muId"
-          placeholder="请输入档案目录ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="档案目录路径" prop="muPath">
-        <el-input
-          v-model="queryParams.muPath"
-          placeholder="请输入档案目录路径"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="图片名称" prop="picName">
-        <el-input
-          v-model="queryParams.picName"
-          placeholder="请输入图片名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物理书架ID" prop="wlsjId">
-        <el-input
-          v-model="queryParams.wlsjId"
-          placeholder="请输入物理书架ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物理书架路径" prop="wlsjPath">
-        <el-input
-          v-model="queryParams.wlsjPath"
-          placeholder="请输入物理书架路径"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否已经识别" prop="recognize">
-        <el-select
-          v-model="queryParams.recognize"
-          placeholder="是否已经识别"
-          clearable
-          style="width:100%"
-        >
-          <el-option
-            v-for="dict in dict.type.recognize"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
 
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+    <el-tabs tab-position="left" v-model="queryParams.ywType" style="width: 300px;" @tab-click="handleQuery">
+      <el-tab-pane v-for="dict in dict.type.yw_type" :label="dict.label" :name="dict.value"></el-tab-pane>
+    </el-tabs>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="2">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['dangan:pictureRecard:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="22" style="display: flex; align-items: center; justify-content: end">
-        <el-checkbox v-model="isSuangMian" style="margin-right: 10px;">双面</el-checkbox>
-        <el-button icon="el-icon-full-screen" type="primary" @click="OCRRecognition">OCR识别</el-button>
-      </el-col>
-    </el-row>
+    <div>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item label="档案目录ID" prop="muId">
+          <el-input
+            v-model="queryParams.muId"
+            placeholder="请输入档案目录ID"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="档案目录路径" prop="muPath">
+          <el-input
+            v-model="queryParams.muPath"
+            placeholder="请输入档案目录路径"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="图片名称" prop="picName">
+          <el-input
+            v-model="queryParams.picName"
+            placeholder="请输入图片名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="物理书架ID" prop="wlsjId">
+          <el-input
+            v-model="queryParams.wlsjId"
+            placeholder="请输入物理书架ID"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="物理书架路径" prop="wlsjPath">
+          <el-input
+            v-model="queryParams.wlsjPath"
+            placeholder="请输入物理书架路径"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="是否已经识别" prop="recognize">
+          <el-select
+            v-model="queryParams.recognize"
+            placeholder="是否已经识别"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.recognize"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
 
-    <el-table v-loading="loading" :data="pictureRecardList" @selection-change="handleSelectionChange" border>
-      <el-table-column type="selection" width="50" align="center" fixed/>
-      <el-table-column label="档案目录ID" align="center" prop="muId" fixed min-width="50"/>
-      <el-table-column label="档案目录路径" align="center" prop="muPath" fixed min-width="100" show-overflow-tooltip/>
-      <el-table-column label="物理书架ID" align="center" prop="wlsjId" />
-      <el-table-column label="物理书架路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="是否已经识别" align="center" prop="recognize" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="上传时间" align="center" prop="createTime" />
-      <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="图片路径" align="center" prop="picUrl">
-        <template slot-scope="scope">
-          <image-preview :src="scope.row.picUrl" :width="50" :height="50"/>
-        </template>
-      </el-table-column>
-<!--      <el-table-column label="备注" align="center" prop="remark" />-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
           <el-button
-            size="mini"
-            type="text"
+            type="danger"
+            plain
             icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
             v-hasPermi="['dangan:pictureRecard:remove']"
           >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['dangan:pictureRecard:export']"
+          >导出</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExportImage"
+            v-hasPermi="['dangan:pictureRecard:export']"
+          >导出图片</el-button>
+        </el-col>
+        <el-col :span="22" style="display: flex; align-items: center; justify-content: end">
+          <el-button icon="el-icon-full-screen" type="primary" @click="OCRRecognition">OCR识别</el-button>
+        </el-col>
+      </el-row>
+
+      <el-table v-loading="loading" :data="pictureRecardList" @selection-change="handleSelectionChange" border>
+        <el-table-column type="selection" width="50" align="center" fixed/>
+        <el-table-column label="档案目录ID" align="center" prop="muId" fixed min-width="80"/>
+        <el-table-column label="业务类型" align="center" prop="ywType" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="物理书架ID" align="center" prop="wlsjId" min-width="80"/>
+        <el-table-column label="物理书架路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
+        <el-table-column label="是否已经识别" align="center" prop="recognize" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="上传时间" align="center" prop="createTime" min-width="100" show-overflow-tooltip/>
+        <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>
+        <el-table-column label="图片路径" align="center" prop="picUrl">
+          <template slot-scope="scope">
+            <image-preview :src="scope.row.picUrl" :width="50" :height="50"/>
+          </template>
+        </el-table-column>
+        <!--      <el-table-column label="备注" align="center" prop="remark" />-->
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['dangan:pictureRecard:remove']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
 
-    <div class="myProgress" v-show="openProgress">
-      <el-progress type="circle" :percentage="percentage"></el-progress>
-      <div style="margin-top:20px;">拼命识别中...</div>
+      <div class="myProgress" v-show="openProgress">
+        <el-progress type="circle" :percentage="percentage"></el-progress>
+        <div style="margin-top:20px;">拼命识别中...</div>
+      </div>
     </div>
 
   </div>
@@ -131,11 +161,12 @@
 
 <script>
 import { listPictureRecard, delPictureRecard } from "@/api/dangan/pictureRecard";
-import { collectRecongnize, collectProgress, collectRecongnizeZu } from "@/api/dangan/collection";
+import { collectRecongnize } from "@/api/dangan/collection";
+import axios from 'axios'
 
 export default {
   name: "PictureRecard",
-  dicts: ['recognize'],
+  dicts: ['recognize', 'yw_type'],
   data() {
     return {
       // 遮罩层
@@ -156,6 +187,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        ywType:'option1',
         picName: null,
         picUrl: null,
         wlsjId: null,
@@ -166,10 +198,9 @@ export default {
       },
       percentage: 0,
       openProgress: false,
-      // 是否双面
-      isSuangMian: false,
       // 选中记录
-      selectionList: []
+      selectionList: [],
+      Interval : null
     };
   },
   created() {
@@ -217,7 +248,7 @@ export default {
     OCRRecognition(){
       let arr = [];
       let singeOrDouble = 0
-      if(this.isSuangMian){
+      if(this.queryParams.ywType==='option1'){
         singeOrDouble = 1
       }
       this.selectionList.forEach(item => {
@@ -227,26 +258,62 @@ export default {
       if(arr.length>0){
         collectRecongnize(arr).then(response => {
           this.selectionList = [];
+          clearInterval(this.Interval);
+          this.openProgress = false;
           this.$modal.msgSuccess("操作成功");
           this.getList();
+        }).catch(()=>{
+          clearInterval(this.Interval);
+          this.openProgress = false;
         });
+
+        this.Interval = setInterval(()=> {
+          if(this.percentage===100||this.percentage>100){
+            clearInterval(this.Interval);
+            this.Interval = null;
+          }else {
+            this.getProgress()
+          }
+        }, 5000);
+
       }else {
         this.$alert(`请先选择需要识别的档案！`, `提示`, {
           type: 'warning'
         });
       }
     },
-    /** 查询目录列表 */
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('dangan/pictureRecard/export', {
+        ...this.queryParams
+      }, `上传历史记录_${new Date().getTime()}.xlsx`)
+    },
+    /** 导出图片按钮操作 */
+    handleExportImage() {
+      this.download('dangan/pictureRecard/exportImage', {
+        ...this.queryParams
+      }, `上传历史记录图片_${new Date().getTime()}.zip`)
+    },
+    /** 查询识别进度 */
     getProgress() {
-      collectProgress().then(response => {
-        this.percentage = response*100;
-      });
+      // 向给定ID的用户发起请求
+      axios.get('http://123.57.142.195:443/get_file_count')
+        .then(function (response) {
+          this.percentage = (response.data.file_counts/this.selectionList.length)*100
+        }).catch(function (error) {
+        // 处理错误情况
+        console.log(error);
+      })
     },
   }
 };
 </script>
 
 <style lang="scss">
+.app-container{
+  display: flex;
+}
+
 .myProgress{
   position: absolute;
   top:0;
diff --git a/dangan-ui/src/views/dangan/qyz/index.vue b/dangan-ui/src/views/dangan/qyz/index.vue
index 4231dad..11f7436 100644
--- a/dangan-ui/src/views/dangan/qyz/index.vue
+++ b/dangan-ui/src/views/dangan/qyz/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="档案目录ID" prop="muId">
         <el-input
           v-model="queryParams.muId"
@@ -145,7 +145,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="签发有效时间起" prop="sDate">
+<!--      <el-form-item label="签发有效时间起" prop="sDate">
         <el-date-picker clearable
                         v-model="queryParams.sDate"
                         type="date"
@@ -160,7 +160,7 @@
                         value-format="yyyy-MM-dd"
                         placeholder="签发有效时间止">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item>-->
 <!--      <el-form-item label="承办人" prop="cbr">
         <el-input
           v-model="queryParams.cbr"
@@ -314,20 +314,20 @@
     />
 
     <!-- 纠错 -->
-    <el-dialog title="纠错" :visible.sync="open_jc" width="1400px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-dialog title="纠错" :visible.sync="open_jc" width="1200px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="10">
           <el-col :span="8">
             <el-carousel height="600px" v-if="form.pictures" :autoplay="false">
               <el-carousel-item v-for="item in form.pictures.split(',')" :key="item">
                 <div style="height: 600px; overflow: auto">
-                  <el-image style="height:850px; width: 100%" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
+                  <el-image style="width:380px" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
                 </div>
               </el-carousel-item>
             </el-carousel>
           </el-col>
           <el-col :span="16">
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
                 <el-form-item label="发文单位" prop="fwUnit">
                   <el-input v-model="form.fwUnit" placeholder="请输入发文单位" />
@@ -339,75 +339,75 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="姓名1" prop="name1">
+            <el-row :gutter="10">
+              <el-col :span="7">
+                <el-form-item label="姓名1" prop="name1" label-width="60px">
                   <el-input v-model="form.name1" placeholder="请输入姓名1" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别1" prop="sex1">
+              <el-col :span="7">
+                <el-form-item label="性别1" prop="sex1" label-width="60px">
                   <el-input v-model="form.sex1" placeholder="请输入性别1" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="居民身份证编号1" prop="cardId1">
+              <el-col :span="10">
+                <el-form-item label="居民身份证编号1" prop="cardId1" label-width="120px">
                   <el-input v-model="form.cardId1" placeholder="请输入居民身份证编号1" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="姓名2" prop="name2">
+            <el-row :gutter="10">
+              <el-col :span="7">
+                <el-form-item label="姓名2" prop="name2" label-width="60px">
                   <el-input v-model="form.name2" placeholder="请输入姓名2" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别2" prop="sex2">
+              <el-col :span="7">
+                <el-form-item label="性别2" prop="sex2" label-width="60px">
                   <el-input v-model="form.sex2" placeholder="请输入性别2" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="居民身份证编号2" prop="cardId2">
+              <el-col :span="10">
+                <el-form-item label="居民身份证编号2" prop="cardId2" label-width="120px">
                   <el-input v-model="form.cardId2" placeholder="请输入居民身份证编号2" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="姓名3" prop="name3">
+            <el-row :gutter="10">
+              <el-col :span="7">
+                <el-form-item label="姓名3" prop="name3" label-width="60px">
                   <el-input v-model="form.name3" placeholder="请输入姓名3" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别3" prop="sex3">
+              <el-col :span="7">
+                <el-form-item label="性别3" prop="sex3" label-width="60px">
                   <el-input v-model="form.sex3" placeholder="请输入性别3" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="居民身份证编号3" prop="cardId3">
+              <el-col :span="10">
+                <el-form-item label="居民身份证编号3" prop="cardId3" label-width="120px">
                   <el-input v-model="form.cardId3" placeholder="请输入居民身份证编号3" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="姓名4" prop="name4">
+            <el-row :gutter="10">
+              <el-col :span="7">
+                <el-form-item label="姓名4" prop="name4" label-width="60px">
                   <el-input v-model="form.name4" placeholder="请输入姓名4" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别4" prop="sex4">
+              <el-col :span="7">
+                <el-form-item label="性别4" prop="sex4" label-width="60px">
                   <el-input v-model="form.sex4" placeholder="请输入性别4" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="居民身份证编号4" prop="cardId4">
+              <el-col :span="10">
+                <el-form-item label="居民身份证编号4" prop="cardId4" label-width="120px">
                   <el-input v-model="form.cardId4" placeholder="请输入居民身份证编号4" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
                 <el-form-item label="迁移原因" prop="qyReason">
                   <el-input v-model="form.qyReason" placeholder="请输入迁移原因" />
@@ -419,31 +419,31 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
                 <el-form-item label="迁往地址" prop="qwAddress">
                   <el-input v-model="form.qwAddress" placeholder="请输入迁往地址" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="8">
-                <el-form-item label="签发有效时间起" prop="sDate">
+                <el-form-item label="签发有效时间起" prop="sDate" label-width="110px">
                   <el-input v-model="form.sDate" placeholder="请输入签发有效时间起" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="签发有效时间止" prop="eDate">
+                <el-form-item label="签发有效时间止" prop="eDate" label-width="110px">
                   <el-input v-model="form.eDate" placeholder="请输入签发有效时间止" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="承办人" prop="cbr">
+                <el-form-item label="承办人" prop="cbr" label-width="70px">
                   <el-input v-model="form.cbr" placeholder="请输入承办人" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
                 <el-form-item label="备注" prop="remark">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -461,9 +461,9 @@
     </el-dialog>
 
 <!--    新增手动识别-->
-    <el-dialog title="新增手动识别" :visible.sync="open_add" width="1400px" append-to-body>
+    <el-dialog title="新增手动识别" :visible.sync="open_add" width="1200px" append-to-body>
 
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
 
         <el-row :gutter="20">
           <el-col :span="12">
@@ -483,13 +483,13 @@
             <el-carousel height="600px" :autoplay="false">
               <el-carousel-item v-for="item in shiBieList" :key="item.id">
                 <div style="height: 600px; overflow: auto">
-                  <el-image style="height:850px; width: 100%" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
+                  <el-image style="width:380px" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
                 </div>
               </el-carousel-item>
             </el-carousel>
           </el-col>
           <el-col :span="16">
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
                 <el-form-item label="发文单位" prop="fwUnit">
                   <el-input v-model="form.fwUnit" placeholder="请输入发文单位" />
@@ -501,75 +501,75 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="姓名1" prop="name1">
+            <el-row :gutter="10">
+              <el-col :span="7">
+                <el-form-item label="姓名1" prop="name1" label-width="60px">
                   <el-input v-model="form.name1" placeholder="请输入姓名1" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别1" prop="sex1">
+              <el-col :span="7">
+                <el-form-item label="性别1" prop="sex1" label-width="60px">
                   <el-input v-model="form.sex1" placeholder="请输入性别1" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="居民身份证编号1" prop="cardId1">
+              <el-col :span="10">
+                <el-form-item label="居民身份证编号1" prop="cardId1" label-width="120px">
                   <el-input v-model="form.cardId1" placeholder="请输入居民身份证编号1" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="姓名2" prop="name2">
+            <el-row :gutter="10">
+              <el-col :span="7">
+                <el-form-item label="姓名2" prop="name2" label-width="60px">
                   <el-input v-model="form.name2" placeholder="请输入姓名2" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别2" prop="sex2">
+              <el-col :span="7">
+                <el-form-item label="性别2" prop="sex2" label-width="60px">
                   <el-input v-model="form.sex2" placeholder="请输入性别2" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="居民身份证编号2" prop="cardId2">
+              <el-col :span="10">
+                <el-form-item label="居民身份证编号2" prop="cardId2" label-width="120px">
                   <el-input v-model="form.cardId2" placeholder="请输入居民身份证编号2" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="姓名3" prop="name3">
+            <el-row :gutter="10">
+              <el-col :span="7">
+                <el-form-item label="姓名3" prop="name3" label-width="60px">
                   <el-input v-model="form.name3" placeholder="请输入姓名3" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别3" prop="sex3">
+              <el-col :span="7">
+                <el-form-item label="性别3" prop="sex3" label-width="60px">
                   <el-input v-model="form.sex3" placeholder="请输入性别3" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="居民身份证编号3" prop="cardId3">
+              <el-col :span="10">
+                <el-form-item label="居民身份证编号3" prop="cardId3" label-width="120px">
                   <el-input v-model="form.cardId3" placeholder="请输入居民身份证编号3" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="姓名4" prop="name4">
+            <el-row :gutter="10">
+              <el-col :span="7">
+                <el-form-item label="姓名4" prop="name4" label-width="60px">
                   <el-input v-model="form.name4" placeholder="请输入姓名4" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别4" prop="sex4">
+              <el-col :span="7">
+                <el-form-item label="性别4" prop="sex4" label-width="60px">
                   <el-input v-model="form.sex4" placeholder="请输入性别4" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="居民身份证编号4" prop="cardId4">
+              <el-col :span="10">
+                <el-form-item label="居民身份证编号4" prop="cardId4" label-width="120px">
                   <el-input v-model="form.cardId4" placeholder="请输入居民身份证编号4" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
                 <el-form-item label="迁移原因" prop="qyReason">
                   <el-input v-model="form.qyReason" placeholder="请输入迁移原因" />
@@ -581,38 +581,37 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
                 <el-form-item label="迁往地址" prop="qwAddress">
                   <el-input v-model="form.qwAddress" placeholder="请输入迁往地址" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="8">
-                <el-form-item label="签发有效时间起" prop="sDate">
+                <el-form-item label="签发有效时间起" prop="sDate" label-width="110px">
                   <el-input v-model="form.sDate" placeholder="请输入签发有效时间起" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="签发有效时间止" prop="eDate">
+                <el-form-item label="签发有效时间止" prop="eDate" label-width="110px">
                   <el-input v-model="form.eDate" placeholder="请输入签发有效时间止" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="承办人" prop="cbr">
+                <el-form-item label="承办人" prop="cbr" label-width="70px">
                   <el-input v-model="form.cbr" placeholder="请输入承办人" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
                 <el-form-item label="备注" prop="remark">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
             </el-row>
-
           </el-col>
 
         </el-row>
diff --git a/dangan-ui/src/views/dangan/ytzm/index.vue b/dangan-ui/src/views/dangan/ytzm/index.vue
index 70d87c6..4c2f7a0 100644
--- a/dangan-ui/src/views/dangan/ytzm/index.vue
+++ b/dangan-ui/src/views/dangan/ytzm/index.vue
@@ -25,15 +25,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="姓名女" prop="wName">
+      <el-form-item label="姓名" prop="wName">
         <el-input
           v-model="queryParams.wName"
-          placeholder="请输入姓名女"
+          placeholder="请输入姓名"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工作单位女" prop="wUnit">
+<!--      <el-form-item label="工作单位女" prop="wUnit">
         <el-input
           v-model="queryParams.wUnit"
           placeholder="请输入工作单位女"
@@ -72,7 +72,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="生育证号" prop="syzh">
         <el-input
           v-model="queryParams.syzh"
@@ -81,7 +81,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="出生日期" prop="birthday">
+<!--      <el-form-item label="出生日期" prop="birthday">
         <el-date-picker clearable
           v-model="queryParams.birthday"
           type="date"
@@ -104,8 +104,8 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="填表日期1" prop="tbDate1">
+      </el-form-item>-->
+<!--      <el-form-item label="填表日期1" prop="tbDate1">
         <el-date-picker clearable
           v-model="queryParams.tbDate1"
           type="date"
@@ -120,7 +120,7 @@
           value-format="yyyy-MM-dd"
           placeholder="请选择填表日期2">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="是否纠错" prop="errorCorrect">
         <el-select
           v-model="queryParams.errorCorrect"
@@ -265,20 +265,20 @@
     />
 
     <!-- 纠错 -->
-    <el-dialog title="纠错" :visible.sync="open_jc" width="1400px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-dialog title="纠错" :visible.sync="open_jc" width="1200px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="60px">
         <el-row :gutter="10">
           <el-col :span="8">
-            <el-carousel height="600px" v-if="form.pictures" :autoplay="false">
+            <el-carousel height="550px" v-if="form.pictures" :autoplay="false">
               <el-carousel-item v-for="item in form.pictures.split(',')" :key="item">
-                <div style="height: 600px; overflow: auto">
-                  <el-image style="height:850px; width: 100%" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
+                <div style="height: 550px; overflow: auto">
+                  <el-image style="width:380px" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
                 </div>
               </el-carousel-item>
             </el-carousel>
           </el-col>
           <el-col :span="16">
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
                 <el-form-item label="年份" prop="year">
                   <el-input v-model="form.year" placeholder="请输入年份" />
@@ -290,104 +290,89 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="8">
                 <el-form-item label="姓名女" prop="wName">
                   <el-input v-model="form.wName" placeholder="请输入姓名女" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="工作单位女" prop="wUnit">
+                <el-form-item label="工作单位女" prop="wUnit" label-width="90px">
                   <el-input v-model="form.wUnit" placeholder="请输入工作单位女" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="身份证号女" prop="wCardId">
+                <el-form-item label="身份证号女" prop="wCardId" label-width="90px">
                   <el-input v-model="form.wCardId" placeholder="请输入身份证号女" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="8">
                 <el-form-item label="姓名男" prop="mName">
                   <el-input v-model="form.mName" placeholder="请输入姓名男" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="工作单位男" prop="mUnit">
+                <el-form-item label="工作单位男" prop="mUnit" label-width="90px">
                   <el-input v-model="form.mUnit" placeholder="请输入工作单位男" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="身份证号男" prop="mCardId">
+                <el-form-item label="身份证号男" prop="mCardId" label-width="90px">
                   <el-input v-model="form.mCardId" placeholder="请输入身份证号男" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="8">
-                <el-form-item label="生育证号" prop="syzh">
+                <el-form-item label="生育证号" prop="syzh" label-width="70px">
                   <el-input v-model="form.syzh" placeholder="请输入生育证号" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="出生日期" prop="birthday">
-                  <el-date-picker clearable
-                                  v-model="form.birthday"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择出生日期">
-                  </el-date-picker>
+                <el-form-item label="出生日期" prop="birthday" label-width="70px">
+                  <el-input v-model="form.birthday" placeholder="请输入出生日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="婴儿性别" prop="babySex">
+                <el-form-item label="婴儿性别" prop="babySex" label-width="70px">
                   <el-input v-model="form.babySex" placeholder="请输入婴儿性别" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
-                <el-form-item label="医院地址" prop="hospital">
+                <el-form-item label="医院地址" prop="hospital" label-width="70px">
                   <el-input v-model="form.hospital" placeholder="请输入医院地址" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="意见" prop="suggest">
+                <el-form-item label="意见" prop="suggest" label-width="45px">
                   <el-input v-model="form.suggest" placeholder="请输入意见" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="派出所位置" prop="pcsAddress">
+                <el-form-item label="派出所位置" prop="pcsAddress" label-width="85px">
                   <el-input v-model="form.pcsAddress" placeholder="请输入派出所位置" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="填表日期1" prop="tbDate1">
-                  <el-date-picker clearable
-                                  v-model="form.tbDate1"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择填表日期1">
-                  </el-date-picker>
+                <el-form-item label="填表日期1" prop="tbDate1" label-width="80px">
+                  <el-input v-model="form.tbDate1" placeholder="请输入填表日期1" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="填表日期2" prop="tbDate2">
-                  <el-date-picker clearable
-                                  v-model="form.tbDate2"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择填表日期2">
-                  </el-date-picker>
+                <el-form-item label="填表日期2" prop="tbDate2" label-width="80px">
+                  <el-input v-model="form.tbDate2" placeholder="请输入填表日期2" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
+                <el-form-item label="备注" prop="remark" label-width="45px">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
@@ -403,13 +388,13 @@
     </el-dialog>
 
     <!-- 新增手动识别-->
-    <el-dialog title="新增手动识别" :visible.sync="open_add" width="1400px" append-to-body>
+    <el-dialog title="新增手动识别" :visible.sync="open_add" width="1200px" append-to-body>
 
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="60px">
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="档案目录ID" prop="muId">
+            <el-form-item label="档案目录ID" prop="muId" label-width="110px">
               <el-input readonly  placeholder="请选择档案目录ID" v-model="form.muId">
                 <el-button slot="append" icon="el-icon-search" @click="muIdChange"></el-button>
               </el-input>
@@ -422,16 +407,16 @@
 
         <el-row :gutter="20" v-if="shiBieList&&shiBieList.length>0">
           <el-col :span="8">
-            <el-carousel height="600px" :autoplay="false">
+            <el-carousel height="550px" :autoplay="false">
               <el-carousel-item v-for="item in shiBieList" :key="item.id">
-                <div style="height: 600px; overflow: auto">
-                  <el-image style="height:850px; width: 100%" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
+                <div style="height: 550px; overflow: auto">
+                  <el-image style="width:380px" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
                 </div>
               </el-carousel-item>
             </el-carousel>
           </el-col>
           <el-col :span="16">
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
                 <el-form-item label="年份" prop="year">
                   <el-input v-model="form.year" placeholder="请输入年份" />
@@ -443,104 +428,89 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="8">
                 <el-form-item label="姓名女" prop="wName">
                   <el-input v-model="form.wName" placeholder="请输入姓名女" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="工作单位女" prop="wUnit">
+                <el-form-item label="工作单位女" prop="wUnit" label-width="90px">
                   <el-input v-model="form.wUnit" placeholder="请输入工作单位女" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="身份证号女" prop="wCardId">
+                <el-form-item label="身份证号女" prop="wCardId" label-width="90px">
                   <el-input v-model="form.wCardId" placeholder="请输入身份证号女" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="8">
                 <el-form-item label="姓名男" prop="mName">
                   <el-input v-model="form.mName" placeholder="请输入姓名男" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="工作单位男" prop="mUnit">
+                <el-form-item label="工作单位男" prop="mUnit" label-width="90px">
                   <el-input v-model="form.mUnit" placeholder="请输入工作单位男" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="身份证号男" prop="mCardId">
+                <el-form-item label="身份证号男" prop="mCardId" label-width="90px">
                   <el-input v-model="form.mCardId" placeholder="请输入身份证号男" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="8">
-                <el-form-item label="生育证号" prop="syzh">
+                <el-form-item label="生育证号" prop="syzh" label-width="70px">
                   <el-input v-model="form.syzh" placeholder="请输入生育证号" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="出生日期" prop="birthday">
-                  <el-date-picker clearable
-                                  v-model="form.birthday"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择出生日期">
-                  </el-date-picker>
+                <el-form-item label="出生日期" prop="birthday" label-width="70px">
+                  <el-input v-model="form.birthday" placeholder="请输入出生日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="婴儿性别" prop="babySex">
+                <el-form-item label="婴儿性别" prop="babySex" label-width="70px">
                   <el-input v-model="form.babySex" placeholder="请输入婴儿性别" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
-                <el-form-item label="医院地址" prop="hospital">
+                <el-form-item label="医院地址" prop="hospital" label-width="70px">
                   <el-input v-model="form.hospital" placeholder="请输入医院地址" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="意见" prop="suggest">
+                <el-form-item label="意见" prop="suggest" label-width="45px">
                   <el-input v-model="form.suggest" placeholder="请输入意见" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="派出所位置" prop="pcsAddress">
+                <el-form-item label="派出所位置" prop="pcsAddress" label-width="85px">
                   <el-input v-model="form.pcsAddress" placeholder="请输入派出所位置" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="填表日期1" prop="tbDate1">
-                  <el-date-picker clearable
-                                  v-model="form.tbDate1"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择填表日期1">
-                  </el-date-picker>
+                <el-form-item label="填表日期1" prop="tbDate1" label-width="80px">
+                  <el-input v-model="form.tbDate1" placeholder="请输入填表日期1" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="填表日期2" prop="tbDate2">
-                  <el-date-picker clearable
-                                  v-model="form.tbDate2"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择填表日期2">
-                  </el-date-picker>
+                <el-form-item label="填表日期2" prop="tbDate2" label-width="80px">
+                  <el-input v-model="form.tbDate2" placeholder="请输入填表日期2" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
+                <el-form-item label="备注" prop="remark" label-width="45px">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
@@ -624,9 +594,9 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dalsInfo.loading" :data="dalsInfo.list" border height="500" @selection-change="dalsInfoDblclick">
-        <el-table-column type="selection" width="50" align="center" fixed/>
-        <el-table-column label="档案目录ID" align="center" prop="muId" fixed min-width="50"/>
-        <el-table-column label="档案目录路径" align="center" prop="muPath" fixed min-width="100" show-overflow-tooltip/>
+        <el-table-column type="selection" width="50" align="center"/>
+        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="50"/>
+        <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="100" show-overflow-tooltip/>
         <el-table-column label="物理书架路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
         <el-table-column label="是否已经识别" align="center" prop="recognize" >
           <template slot-scope="scope">
diff --git a/dangan-ui/src/views/dangan/zfnyhkcg/index.vue b/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
index bac5f92..552089f 100644
--- a/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
+++ b/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
@@ -25,14 +25,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="住址" prop="address">
+<!--      <el-form-item label="住址" prop="address">
         <el-input
           v-model="queryParams.address"
           placeholder="请输入住址"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <!--     <el-form-item label="与申请人关系1" prop="relation1">
         <el-input
           v-model="queryParams.relation1"
@@ -177,14 +177,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="承办日期" prop="cbDate">
+<!--      <el-form-item label="承办日期" prop="cbDate">
         <el-date-picker clearable
           v-model="queryParams.cbDate"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="请选择承办日期">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="是否纠错" prop="errorCorrect">
         <el-select
           v-model="queryParams.errorCorrect"
@@ -268,11 +268,7 @@
       <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" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.cbDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="承办日期" align="center" prop="cbDate" min-width="100" show-overflow-tooltip/>
       <el-table-column label="识别图片" align="center" prop="pictures">
         <template slot-scope="scope">
           <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
@@ -335,155 +331,150 @@
     />
 
     <!-- 纠错 -->
-    <el-dialog title="纠错" :visible.sync="open_jc" width="1400px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-dialog title="纠错" :visible.sync="open_jc" width="1200px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules">
         <el-row :gutter="10">
           <el-col :span="8">
             <el-carousel height="600px" v-if="form.pictures" :autoplay="false">
               <el-carousel-item v-for="item in form.pictures.split(',')" :key="item">
                 <div style="height: 600px; overflow: auto">
-                  <el-image style="height:850px; width: 100%" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
+                  <el-image style="width:380px" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
                 </div>
               </el-carousel-item>
             </el-carousel>
           </el-col>
           <el-col :span="16">
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="编号" prop="num">
+                <el-form-item label="编号" prop="num" label-width="60px">
                   <el-input v-model="form.num" placeholder="请输入编号" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="申请人姓名" prop="name">
+                <el-form-item label="申请人姓名" prop="name" label-width="100px">
                   <el-input v-model="form.name" placeholder="请输入申请人姓名" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
-                <el-form-item label="住址" prop="address">
+                <el-form-item label="住址" prop="address" label-width="60px">
                   <el-input v-model="form.address" placeholder="请输入住址" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="与申请人关系1" prop="relation1">
+            <el-row :gutter="10">
+              <el-col :span="10">
+                <el-form-item label="与申请人关系1" prop="relation1" label-width="110px">
                   <el-input v-model="form.relation1" placeholder="请输入与申请人关系1" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="姓名1" prop="name1">
+              <el-col :span="7">
+                <el-form-item label="姓名1" prop="name1" label-width="60px">
                   <el-input v-model="form.name1" placeholder="请输入姓名1" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别1" prop="sex1">
+              <el-col :span="7">
+                <el-form-item label="性别1" prop="sex1" label-width="60px">
                   <el-input v-model="form.sex1" placeholder="请输入性别1" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="与申请人关系2" prop="relation2">
+            <el-row :gutter="10">
+              <el-col :span="10">
+                <el-form-item label="与申请人关系2" prop="relation2" label-width="110px">
                   <el-input v-model="form.relation2" placeholder="请输入与申请人关系2" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="姓名2" prop="name2">
+              <el-col :span="7">
+                <el-form-item label="姓名2" prop="name2" label-width="60px">
                   <el-input v-model="form.name2" placeholder="请输入姓名2" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别2" prop="sex2">
+              <el-col :span="7">
+                <el-form-item label="性别2" prop="sex2" label-width="60px">
                   <el-input v-model="form.sex2" placeholder="请输入性别2" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="与申请人关系3" prop="relation3">
+            <el-row :gutter="10">
+              <el-col :span="10">
+                <el-form-item label="与申请人关系3" prop="relation3" label-width="110px">
                   <el-input v-model="form.relation3" placeholder="请输入与申请人关系3" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="姓名3" prop="name3">
+              <el-col :span="7">
+                <el-form-item label="姓名3" prop="name3" label-width="60px">
                   <el-input v-model="form.name3" placeholder="请输入姓名3" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别3" prop="sex3">
+              <el-col :span="7">
+                <el-form-item label="性别3" prop="sex3" label-width="60px">
                   <el-input v-model="form.sex3" placeholder="请输入性别3" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="与申请人关系4" prop="relation4">
+            <el-row :gutter="10">
+              <el-col :span="10">
+                <el-form-item label="与申请人关系4" prop="relation4" label-width="110px">
                   <el-input v-model="form.relation4" placeholder="请输入与申请人关系4" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="姓名4" prop="name4">
+              <el-col :span="7">
+                <el-form-item label="姓名4" prop="name4" label-width="60px">
                   <el-input v-model="form.name4" placeholder="请输入姓名4" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别4" prop="sex4">
+              <el-col :span="7">
+                <el-form-item label="性别4" prop="sex4" label-width="60px">
                   <el-input v-model="form.sex4" placeholder="请输入性别4" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="与申请人关系5" prop="relation5">
+            <el-row :gutter="10">
+              <el-col :span="10">
+                <el-form-item label="与申请人关系5" prop="relation5" label-width="110px">
                   <el-input v-model="form.relation5" placeholder="请输入与申请人关系5" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="姓名5" prop="name5">
+              <el-col :span="7">
+                <el-form-item label="姓名5" prop="name5" label-width="60px">
                   <el-input v-model="form.name5" placeholder="请输入姓名5" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别5" prop="sex5">
+              <el-col :span="7">
+                <el-form-item label="性别5" prop="sex5" label-width="60px">
                   <el-input v-model="form.sex5" placeholder="请输入性别5" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="机关1" prop="jg1">
+                <el-form-item label="机关1" prop="jg1" label-width="60px">
                   <el-input v-model="form.jg1" placeholder="请输入机关1" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="机关2" prop="jg2">
+                <el-form-item label="机关2" prop="jg2" label-width="60px">
                   <el-input v-model="form.jg2" placeholder="请输入机关2" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="承办人" prop="cbr">
+                <el-form-item label="承办人" prop="cbr" label-width="60px">
                   <el-input v-model="form.cbr" placeholder="请输入承办人" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="承办日期" prop="cbDate">
-                  <el-date-picker clearable
-                                  v-model="form.cbDate"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择承办日期">
-                  </el-date-picker>
+                <el-form-item label="承办日期" prop="cbDate" label-width="80px">
+                  <el-input v-model="form.cbDate" placeholder="请输入承办日期" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
+                <el-form-item label="备注" prop="remark" label-width="60px">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
@@ -499,7 +490,7 @@
     </el-dialog>
 
     <!--    新增手动识别-->
-    <el-dialog title="新增手动识别" :visible.sync="open_add" width="1400px" append-to-body>
+    <el-dialog title="新增手动识别" :visible.sync="open_add" width="1200px" append-to-body>
 
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 
@@ -521,153 +512,147 @@
             <el-carousel height="600px" :autoplay="false">
               <el-carousel-item v-for="item in shiBieList" :key="item.id">
                 <div style="height: 600px; overflow: auto">
-                  <el-image style="height:850px; width: 100%" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
+                  <el-image style="width:380px" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
                 </div>
               </el-carousel-item>
             </el-carousel>
           </el-col>
           <el-col :span="16">
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="编号" prop="num">
+                <el-form-item label="编号" prop="num" label-width="60px">
                   <el-input v-model="form.num" placeholder="请输入编号" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="申请人姓名" prop="name">
+                <el-form-item label="申请人姓名" prop="name" label-width="100px">
                   <el-input v-model="form.name" placeholder="请输入申请人姓名" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
-                <el-form-item label="住址" prop="address">
+                <el-form-item label="住址" prop="address" label-width="60px">
                   <el-input v-model="form.address" placeholder="请输入住址" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="与申请人关系1" prop="relation1">
+            <el-row :gutter="10">
+              <el-col :span="10">
+                <el-form-item label="与申请人关系1" prop="relation1" label-width="110px">
                   <el-input v-model="form.relation1" placeholder="请输入与申请人关系1" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="姓名1" prop="name1">
+              <el-col :span="7">
+                <el-form-item label="姓名1" prop="name1" label-width="60px">
                   <el-input v-model="form.name1" placeholder="请输入姓名1" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别1" prop="sex1">
+              <el-col :span="7">
+                <el-form-item label="性别1" prop="sex1" label-width="60px">
                   <el-input v-model="form.sex1" placeholder="请输入性别1" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="与申请人关系2" prop="relation2">
+            <el-row :gutter="10">
+              <el-col :span="10">
+                <el-form-item label="与申请人关系2" prop="relation2" label-width="110px">
                   <el-input v-model="form.relation2" placeholder="请输入与申请人关系2" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="姓名2" prop="name2">
+              <el-col :span="7">
+                <el-form-item label="姓名2" prop="name2" label-width="60px">
                   <el-input v-model="form.name2" placeholder="请输入姓名2" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别2" prop="sex2">
+              <el-col :span="7">
+                <el-form-item label="性别2" prop="sex2" label-width="60px">
                   <el-input v-model="form.sex2" placeholder="请输入性别2" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="与申请人关系3" prop="relation3">
+            <el-row :gutter="10">
+              <el-col :span="10">
+                <el-form-item label="与申请人关系3" prop="relation3" label-width="110px">
                   <el-input v-model="form.relation3" placeholder="请输入与申请人关系3" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="姓名3" prop="name3">
+              <el-col :span="7">
+                <el-form-item label="姓名3" prop="name3" label-width="60px">
                   <el-input v-model="form.name3" placeholder="请输入姓名3" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别3" prop="sex3">
+              <el-col :span="7">
+                <el-form-item label="性别3" prop="sex3" label-width="60px">
                   <el-input v-model="form.sex3" placeholder="请输入性别3" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="与申请人关系4" prop="relation4">
+            <el-row :gutter="10">
+              <el-col :span="10">
+                <el-form-item label="与申请人关系4" prop="relation4" label-width="110px">
                   <el-input v-model="form.relation4" placeholder="请输入与申请人关系4" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="姓名4" prop="name4">
+              <el-col :span="7">
+                <el-form-item label="姓名4" prop="name4" label-width="60px">
                   <el-input v-model="form.name4" placeholder="请输入姓名4" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别4" prop="sex4">
+              <el-col :span="7">
+                <el-form-item label="性别4" prop="sex4" label-width="60px">
                   <el-input v-model="form.sex4" placeholder="请输入性别4" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="与申请人关系5" prop="relation5">
+            <el-row :gutter="10">
+              <el-col :span="10">
+                <el-form-item label="与申请人关系5" prop="relation5" label-width="110px">
                   <el-input v-model="form.relation5" placeholder="请输入与申请人关系5" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="姓名5" prop="name5">
+              <el-col :span="7">
+                <el-form-item label="姓名5" prop="name5" label-width="60px">
                   <el-input v-model="form.name5" placeholder="请输入姓名5" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别5" prop="sex5">
+              <el-col :span="7">
+                <el-form-item label="性别5" prop="sex5" label-width="60px">
                   <el-input v-model="form.sex5" placeholder="请输入性别5" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="机关1" prop="jg1">
+                <el-form-item label="机关1" prop="jg1" label-width="60px">
                   <el-input v-model="form.jg1" placeholder="请输入机关1" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="机关2" prop="jg2">
+                <el-form-item label="机关2" prop="jg2" label-width="60px">
                   <el-input v-model="form.jg2" placeholder="请输入机关2" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="12">
-                <el-form-item label="承办人" prop="cbr">
+                <el-form-item label="承办人" prop="cbr" label-width="60px">
                   <el-input v-model="form.cbr" placeholder="请输入承办人" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="承办日期" prop="cbDate">
-                  <el-date-picker clearable
-                                  v-model="form.cbDate"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择承办日期">
-                  </el-date-picker>
+                <el-form-item label="承办日期" prop="cbDate" label-width="80px">
+                  <el-input v-model="form.cbDate" placeholder="请输入承办日期" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="10">
               <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
+                <el-form-item label="备注" prop="remark" label-width="60px">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
             </el-row>
-
           </el-col>
         </el-row>
 
@@ -884,9 +869,6 @@ export default {
         num: [
           { required: true, message: "编号不能为空", trigger: "blur" }
         ],
-        name: [
-          { required: true, message: "申请人姓名不能为空", trigger: "blur" }
-        ],
       },
       // 审核
       shenHe:{
diff --git a/dangan-ui/src/views/dangan/zqz/index.vue b/dangan-ui/src/views/dangan/zqz/index.vue
index cf9f1e1..30ba8de 100644
--- a/dangan-ui/src/views/dangan/zqz/index.vue
+++ b/dangan-ui/src/views/dangan/zqz/index.vue
@@ -33,14 +33,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="住址" prop="address">
+<!--      <el-form-item label="住址" prop="address">
         <el-input
           v-model="queryParams.address"
           placeholder="请输入住址"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="登记机关" prop="djJg">
         <el-input
           v-model="queryParams.djJg"
@@ -185,7 +185,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="迁入地址" prop="qrAddress">
+<!--      <el-form-item label="迁入地址" prop="qrAddress">
         <el-input
           v-model="queryParams.qrAddress"
           placeholder="请输入迁入地址"
@@ -200,7 +200,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="批准机关" prop="pzjg">
         <el-input
           v-model="queryParams.pzjg"
@@ -209,7 +209,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="承办人" prop="cbr">
+<!--      <el-form-item label="承办人" prop="cbr">
         <el-input
           v-model="queryParams.cbr"
           placeholder="请输入承办人"
@@ -224,7 +224,7 @@
           value-format="yyyy-MM-dd"
           placeholder="请选择签发日期">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="是否纠错" prop="errorCorrect">
         <el-select
           v-model="queryParams.errorCorrect"
@@ -295,49 +295,29 @@
       <el-table-column label="与申请人关系1" align="center" prop="relation1" min-width="120" 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/>
-      <el-table-column label="出生日期1" align="center" prop="birthDate1" min-width="100" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.birthDate1, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="出生日期1" align="center" prop="birthDate1" min-width="100" show-overflow-tooltip/>
       <el-table-column label="身份证号1" align="center" prop="cardId1" min-width="100" show-overflow-tooltip/>
       <el-table-column label="与申请人关系2" align="center" prop="relation2" min-width="120" show-overflow-tooltip/>
       <el-table-column label="姓名2" align="center" prop="name2" min-width="100" show-overflow-tooltip/>
       <el-table-column label="性别2" align="center" prop="sex2" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="出生日期2" align="center" prop="birthDate2" min-width="100" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.birthDate2, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="出生日期2" align="center" prop="birthDate2" min-width="100" show-overflow-tooltip/>
       <el-table-column label="身份证号2" align="center" prop="cardId2" min-width="100" show-overflow-tooltip/>
       <el-table-column label="与申请人关系3" align="center" prop="relation3" min-width="120" show-overflow-tooltip/>
       <el-table-column label="姓名3" align="center" prop="name3" min-width="100" show-overflow-tooltip/>
       <el-table-column label="性别3" align="center" prop="sex3" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="出生日期3" align="center" prop="birthDate3" min-width="100" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.birthDate3, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="出生日期3" align="center" prop="birthDate3" min-width="100" show-overflow-tooltip/>
       <el-table-column label="身份证号3" align="center" prop="cardId3" min-width="100" show-overflow-tooltip/>
       <el-table-column label="与申请人关系4" align="center" prop="relation4" min-width="120" show-overflow-tooltip/>
       <el-table-column label="姓名4" align="center" prop="name4" min-width="100" show-overflow-tooltip/>
       <el-table-column label="性别4" align="center" prop="sex4" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="出生日期4" align="center" prop="birthDate4" min-width="100" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.birthDate4, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="出生日期4" align="center" prop="birthDate4" min-width="100" show-overflow-tooltip/>
       <el-table-column label="身份证号4" align="center" prop="cardId4" min-width="100" show-overflow-tooltip/>
       <el-table-column label="发往单位" align="center" prop="fwdw" min-width="100" show-overflow-tooltip/>
       <el-table-column label="迁入地址" align="center" prop="qrAddress" min-width="100" show-overflow-tooltip/>
       <el-table-column label="准迁原因" align="center" prop="zqReason" min-width="100" show-overflow-tooltip/>
       <el-table-column label="批准机关" align="center" prop="pzjg" 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="qfDate" min-width="100" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.qfDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="签发日期" align="center" prop="qfDate" min-width="100" show-overflow-tooltip/>
       <el-table-column label="识别图片" align="center" prop="pictures">
         <template slot-scope="scope">
           <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
@@ -457,12 +437,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="出生日期1" prop="birthDate1">
-                  <el-date-picker clearable
-                                  v-model="form.birthDate1"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择出生日期1">
-                  </el-date-picker>
+                  <el-input v-model="form.birthDate1" placeholder="请输入出生日期1" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -487,12 +462,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="出生日期2" prop="birthDate2">
-                  <el-date-picker clearable
-                                  v-model="form.birthDate2"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择出生日期2">
-                  </el-date-picker>
+                  <el-input v-model="form.birthDate2" placeholder="请输入出生日期2" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -517,12 +487,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="出生日期3" prop="birthDate3">
-                  <el-date-picker clearable
-                                  v-model="form.birthDate3"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择出生日期3">
-                  </el-date-picker>
+                  <el-input v-model="form.birthDate3" placeholder="请输入出生日期3" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -547,12 +512,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="出生日期4" prop="birthDate4">
-                  <el-date-picker clearable
-                                  v-model="form.birthDate4"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择出生日期4">
-                  </el-date-picker>
+                  <el-input v-model="form.birthDate4" placeholder="请输入出生日期4" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -587,12 +547,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="签发日期" prop="qfDate">
-                  <el-date-picker clearable
-                                  v-model="form.qfDate"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择签发日期">
-                  </el-date-picker>
+                  <el-input v-model="form.qfDate" placeholder="请输入签发日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
@@ -683,12 +638,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="出生日期1" prop="birthDate1">
-                  <el-date-picker clearable
-                                  v-model="form.birthDate1"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择出生日期1">
-                  </el-date-picker>
+                  <el-input v-model="form.birthDate1" placeholder="请输入出生日期1" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -713,12 +663,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="出生日期2" prop="birthDate2">
-                  <el-date-picker clearable
-                                  v-model="form.birthDate2"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择出生日期2">
-                  </el-date-picker>
+                  <el-input v-model="form.birthDate2" placeholder="请输入出生日期2" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -743,12 +688,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="出生日期3" prop="birthDate3">
-                  <el-date-picker clearable
-                                  v-model="form.birthDate3"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择出生日期3">
-                  </el-date-picker>
+                  <el-input v-model="form.birthDate3" placeholder="请输入出生日期3" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -773,12 +713,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="出生日期4" prop="birthDate4">
-                  <el-date-picker clearable
-                                  v-model="form.birthDate4"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择出生日期4">
-                  </el-date-picker>
+                  <el-input v-model="form.birthDate4" placeholder="请输入出生日期4" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -813,12 +748,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="签发日期" prop="qfDate">
-                  <el-date-picker clearable
-                                  v-model="form.qfDate"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择签发日期">
-                  </el-date-picker>
+                  <el-input v-model="form.qfDate" placeholder="请输入签发日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">