From 7f01619ff248a5444ec419974e69f2f661b8e6aa Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Tue, 30 Jul 2024 16:10:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=90=88=E9=9B=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dangan-ui/src/views/dangan/birthDJ/index.vue  | 152 ++++-
 dangan-ui/src/views/dangan/czrkdj/index.vue   | 534 +++++++++++++-----
 dangan-ui/src/views/dangan/qyz/index.vue      | 152 ++++-
 dangan-ui/src/views/dangan/ytzm/index.vue     | 132 ++++-
 dangan-ui/src/views/dangan/zfnyhkcg/index.vue | 150 ++++-
 dangan-ui/src/views/dangan/zqz/index.vue      | 212 +++++--
 6 files changed, 1088 insertions(+), 244 deletions(-)

diff --git a/dangan-ui/src/views/dangan/birthDJ/index.vue b/dangan-ui/src/views/dangan/birthDJ/index.vue
index 84d5f9b..f0d3d0c 100644
--- a/dangan-ui/src/views/dangan/birthDJ/index.vue
+++ b/dangan-ui/src/views/dangan/birthDJ/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="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="任务ID" prop="taskId">
         <el-input
           v-model="queryParams.taskId"
@@ -9,14 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="出生证编号" prop="birthNum">
+<!--      <el-form-item label="出生证编号" prop="birthNum">
         <el-input
           v-model="queryParams.birthNum"
           placeholder="请输入出生证编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -33,14 +33,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="出生地点" prop="bornAddress">
+<!--      <el-form-item label="出生地点" prop="bornAddress">
         <el-input
           v-model="queryParams.bornAddress"
           placeholder="请输入出生地点"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
 <!--      <el-form-item label="接生人员签字" prop="jsrySign">
         <el-input
           v-model="queryParams.jsrySign"
@@ -49,14 +49,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="接生单位" prop="jsUnit">
+<!--      <el-form-item label="接生单位" prop="jsUnit">
         <el-input
           v-model="queryParams.jsUnit"
           placeholder="请输入接生单位"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="是否纠错" prop="errorCorrect">
         <el-select
           v-model="queryParams.errorCorrect"
@@ -126,25 +126,25 @@
       </el-table-column>-->
       <el-table-column label="档案目录路径" align="center" fixed prop="muPath" min-width="160" show-overflow-tooltip fixed/>
       <el-table-column label="任务ID" align="center" prop="taskId"  min-width="100" show-overflow-tooltip fixed/>
-      <el-table-column label="出生证编号" align="center" prop="birthNum" min-width="100" show-overflow-tooltip/>
+<!--      <el-table-column label="出生证编号" align="center" prop="birthNum" min-width="100" show-overflow-tooltip/>-->
       <el-table-column label="婴儿姓名" align="center" prop="name" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="出生时间" align="center" prop="birthday" 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="bornAddress" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="出生时间" align="center" prop="birthday" min-width="180" show-overflow-tooltip/>
+<!--      <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="出生地点" align="center" prop="bornAddress" min-width="100" show-overflow-tooltip/>-->
       <el-table-column label="母亲姓名" align="center" prop="mName" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="母亲年龄" align="center" prop="mAge" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="母亲国籍" align="center" prop="mGj" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="母亲民族" align="center" prop="mNation" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="母亲身份证号" align="center" prop="mCardId" min-width="100" show-overflow-tooltip/>
+<!--      <el-table-column label="母亲年龄" align="center" prop="mAge" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="母亲国籍" align="center" prop="mGj" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="母亲民族" align="center" prop="mNation" min-width="100" show-overflow-tooltip/>-->
+      <el-table-column label="母亲身份证号" align="center" prop="mCardId" min-width="180" show-overflow-tooltip/>
       <el-table-column label="父亲姓名" align="center" prop="fName" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="父亲年龄" align="center" prop="fAge" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="父亲国籍" align="center" prop="fGj" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="父亲民族" align="center" prop="fNation" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="父亲身份证号" align="center" prop="fCardId" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="家庭住址" align="center" prop="homeAddress" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="婴儿母亲签字" align="center" prop="momSign" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="接生人员签字" align="center" prop="jsrySign" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="接生单位" align="center" prop="jsUnit" min-width="100" show-overflow-tooltip/>
+<!--      <el-table-column label="父亲年龄" align="center" prop="fAge" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="父亲国籍" align="center" prop="fGj" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="父亲民族" align="center" prop="fNation" min-width="100" show-overflow-tooltip/>-->
+      <el-table-column label="父亲身份证号" align="center" prop="fCardId" min-width="180" show-overflow-tooltip/>
+<!--      <el-table-column label="家庭住址" align="center" prop="homeAddress" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="婴儿母亲签字" align="center" prop="momSign" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="接生人员签字" align="center" prop="jsrySign" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="接生单位" align="center" prop="jsUnit" min-width="100" show-overflow-tooltip/>-->
 <!--      <el-table-column label="出生登记类型(字典)" align="center" prop="djType" min-width="100" show-overflow-tooltip/>-->
       <el-table-column label="识别图片" align="center" prop="pictures">
         <template slot-scope="scope">
@@ -172,7 +172,7 @@
         </template>
       </el-table-column>
       <el-table-column label="审核原由" align="center" prop="auditReason" min-width="140" show-overflow-tooltip/>
-      <el-table-column label="备注" align="center" prop="remark" min-width="140" show-overflow-tooltip/>
+<!--      <el-table-column label="备注" align="center" prop="remark" min-width="140" show-overflow-tooltip/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" fixed="right">
         <template slot-scope="scope">
           <el-button
@@ -207,8 +207,8 @@
       @pagination="getList"
     />
 
-    <!-- 纠错 -->
-    <el-dialog title="纠错" :visible.sync="open_jc" width="1200px" append-to-body>
+    <!-- 纠错 原-->
+<!--    <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">
@@ -349,9 +349,53 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>-->
+
+    <!-- 纠错 新-->
+    <el-dialog title="纠错" :visible.sync="open_jc" width="90%" append-to-body top="10px !important">
+      <div style="height: 86vh;">
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-carousel height="calc(86vh - 100px)" v-if="form.pictures" :autoplay="false">
+                <el-carousel-item v-for="item in form.pictures.split(',')" :key="item">
+                  <div class="jc_sb_img" style="height:100%; overflow:auto; text-align:center; font-size:0">
+                    <el-image style="height:100%;" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
+                  </div>
+                </el-carousel-item>
+              </el-carousel>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="婴儿姓名" prop="name" label-width="100px">
+                <el-input v-model="form.name" placeholder="请输入婴儿姓名" />
+              </el-form-item>
+              <el-form-item label="出生时间" prop="birthday" label-width="100px">
+                <el-input v-model="form.birthday" placeholder="请输入出生时间" />
+              </el-form-item>
+              <el-form-item label="母亲姓名" prop="mName" label-width="100px">
+                <el-input v-model="form.mName" placeholder="请输入母亲姓名" />
+              </el-form-item>
+              <el-form-item label="母亲身份证号" prop="mCardId" label-width="100px">
+                <el-input v-model="form.mCardId" placeholder="请输入母亲身份证号" />
+              </el-form-item>
+              <el-form-item label="父亲姓名" prop="fName" label-width="100px">
+                <el-input v-model="form.fName" placeholder="请输入父亲姓名" />
+              </el-form-item>
+              <el-form-item label="父亲身份证号" prop="fCardId" label-width="100px">
+                <el-input v-model="form.fCardId" placeholder="请输入父亲身份证号" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer" style="text-align:right; margin-top: 30px;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </div>
     </el-dialog>
 
     <!--    新增手动识别-->
+<!--
     <el-dialog title="新增手动识别" :visible.sync="open_add" width="1200px" append-to-body>
 
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -512,6 +556,62 @@
       </div>
 
     </el-dialog>
+-->
+
+    <!--    新增手动识别-->
+    <el-dialog title="新增手动识别" :visible.sync="open_add" width="90%" append-to-body top="10px !important">
+      <div style="height: 86vh;">
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="档案目录路径" prop="muPath" label-width="110px">
+                <el-input readonly  placeholder="请选择档案目录路径" v-model="form.muPath">
+                  <el-button slot="append" icon="el-icon-search" @click="muIdChange"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-button type="primary" @click="selectDaRecard" style="margin-left: 10px;">选择档案记录</el-button>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" v-if="shiBieList&&shiBieList.length>0">
+            <el-col :span="12">
+              <el-carousel height="calc(86vh - 100px)" :autoplay="false">
+                <el-carousel-item v-for="item in shiBieList" :key="item.id">
+                  <div class="jc_sb_img" style="height:100%; overflow:auto; text-align:center; font-size:0">
+                    <el-image style="height:100%;" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
+                  </div>
+                </el-carousel-item>
+              </el-carousel>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="婴儿姓名" prop="name" label-width="100px">
+                <el-input v-model="form.name" placeholder="请输入婴儿姓名" />
+              </el-form-item>
+              <el-form-item label="出生时间" prop="birthday" label-width="100px">
+                <el-input v-model="form.birthday" placeholder="请输入出生时间" />
+              </el-form-item>
+              <el-form-item label="母亲姓名" prop="mName" label-width="100px">
+                <el-input v-model="form.mName" placeholder="请输入母亲姓名" />
+              </el-form-item>
+              <el-form-item label="母亲身份证号" prop="mCardId" label-width="100px">
+                <el-input v-model="form.mCardId" placeholder="请输入母亲身份证号" />
+              </el-form-item>
+              <el-form-item label="父亲姓名" prop="fName" label-width="100px">
+                <el-input v-model="form.fName" placeholder="请输入父亲姓名" />
+              </el-form-item>
+              <el-form-item label="父亲身份证号" prop="fCardId" label-width="100px">
+                <el-input v-model="form.fCardId" placeholder="请输入父亲身份证号" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer" style="text-align:right; margin-top: 30px;">
+          <el-button type="primary" @click="addSubmitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </div>
+    </el-dialog>
 
     <!-- 审核对话框 -->
     <el-dialog title="审核" :visible.sync="shenHe.open" width="500px" append-to-body>
diff --git a/dangan-ui/src/views/dangan/czrkdj/index.vue b/dangan-ui/src/views/dangan/czrkdj/index.vue
index 43d7196..437a792 100644
--- a/dangan-ui/src/views/dangan/czrkdj/index.vue
+++ b/dangan-ui/src/views/dangan/czrkdj/index.vue
@@ -3,7 +3,6 @@
 
     <el-tabs v-model="queryParams.ywType" @tab-click="ywTypeClick">
       <el-tab-pane label="常住人口登记1" name="option1">
-
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
 
           <el-form-item label="任务ID" prop="taskId">
@@ -30,22 +29,22 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="民族" prop="nation">
+<!--          <el-form-item label="民族" prop="nation">
             <el-input
               v-model="queryParams.nation"
               placeholder="请输入民族"
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
-          <el-form-item label="身份证号" prop="cardId">
+          </el-form-item>-->
+<!--          <el-form-item label="身份证号" prop="cardId">
             <el-input
               v-model="queryParams.cardId"
               placeholder="请输入身份证号"
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item label="是否纠错" prop="errorCorrect">
             <el-select
               v-model="queryParams.errorCorrect"
@@ -81,7 +80,6 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button
@@ -105,30 +103,29 @@
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
         <el-table v-loading="loading" :data="czrkdjList" border>
           <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="180" show-overflow-tooltip fixed/>
           <el-table-column label="任务ID" align="center" prop="taskId"  min-width="100" show-overflow-tooltip fixed/>
           <el-table-column label="户主或与户主关系" align="center" prop="relation" min-width="130" show-overflow-tooltip/>
           <el-table-column label="姓名" align="center" prop="name" 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="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/>
-          <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/>
-          <el-table-column label="宗教信仰" align="center" prop="zjxy" min-width="90" show-overflow-tooltip/>
-          <el-table-column label="文化程度" align="center" prop="whcd" min-width="90" show-overflow-tooltip/>
-          <el-table-column label="婚姻状况" align="center" prop="hyzk" min-width="90" show-overflow-tooltip/>
-          <el-table-column label="职业及服务处所" align="center" prop="zyjfwcs" min-width="120" show-overflow-tooltip/>
-          <el-table-column label="本县(市)其它住址" align="center" prop="bxsqtzz" min-width="130" show-overflow-tooltip />
-          <el-table-column label="公民证代号号码签发机关及日期" align="center" prop="gmzdhhmqfjgjrq" min-width="240" show-overflow-tooltip />
-          <el-table-column label="何时由何地迁来本县、市何时登记户口" align="center" prop="hsyhdqlbxshsdjhk" min-width="250" show-overflow-tooltip />
-          <el-table-column label="何时由本县、市何处迁来何时登记户口" align="center" prop="hsybxshcqlhsdjhk" min-width="250" show-overflow-tooltip />
-          <el-table-column label="注销户口日期" align="center" prop="zxhkrq" min-width="100" show-overflow-tooltip />
-          <el-table-column label="注销户口原因" align="center" prop="zxhkyy" min-width="100" show-overflow-tooltip />
-          <el-table-column label="户口登记事项变更记载内容、时间及办理人章_1" align="center" prop="hkdjsxbgjznrsjjblrz1" min-width="320" show-overflow-tooltip />
-          <el-table-column label="户口登记事项变更记载内容、时间及办理人章_2" align="center" prop="hkdjsxbgjznrsjjblrz2" min-width="320" 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/>-->
+<!--          <el-table-column label="宗教信仰" align="center" prop="zjxy" min-width="90" show-overflow-tooltip/>-->
+<!--          <el-table-column label="文化程度" align="center" prop="whcd" min-width="90" show-overflow-tooltip/>-->
+<!--          <el-table-column label="婚姻状况" align="center" prop="hyzk" min-width="90" show-overflow-tooltip/>-->
+<!--          <el-table-column label="职业及服务处所" align="center" prop="zyjfwcs" min-width="120" show-overflow-tooltip/>-->
+<!--          <el-table-column label="本县(市)其它住址" align="center" prop="bxsqtzz" min-width="130" show-overflow-tooltip />-->
+<!--          <el-table-column label="公民证代号号码签发机关及日期" align="center" prop="gmzdhhmqfjgjrq" min-width="240" show-overflow-tooltip />-->
+<!--          <el-table-column label="何时由何地迁来本县、市何时登记户口" align="center" prop="hsyhdqlbxshsdjhk" min-width="250" show-overflow-tooltip />-->
+<!--          <el-table-column label="何时由本县、市何处迁来何时登记户口" align="center" prop="hsybxshcqlhsdjhk" min-width="250" show-overflow-tooltip />-->
+<!--          <el-table-column label="注销户口日期" align="center" prop="zxhkrq" min-width="100" show-overflow-tooltip />-->
+<!--          <el-table-column label="注销户口原因" align="center" prop="zxhkyy" min-width="100" show-overflow-tooltip />-->
+<!--          <el-table-column label="户口登记事项变更记载内容、时间及办理人章_1" align="center" prop="hkdjsxbgjznrsjjblrz1" min-width="320" show-overflow-tooltip />-->
+<!--          <el-table-column label="户口登记事项变更记载内容、时间及办理人章_2" align="center" prop="hkdjsxbgjznrsjjblrz2" min-width="320" 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"/>
@@ -155,7 +152,7 @@
             </template>
           </el-table-column>
           <el-table-column label="审核原因" align="center" prop="auditReason" />
-          <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>
+<!--          <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>-->
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="160">
             <template slot-scope="scope">
               <el-button
@@ -181,10 +178,8 @@
             </template>
           </el-table-column>
         </el-table>
-
       </el-tab-pane>
       <el-tab-pane label="常住人口登记2" name="option3">
-
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
           <el-form-item label="任务ID" prop="taskId">
             <el-input
@@ -210,14 +205,14 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="民族" prop="nation">
+<!--          <el-form-item label="民族" prop="nation">
             <el-input
               v-model="queryParams.nation"
               placeholder="请输入民族"
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item label="身份证号" prop="cardId">
             <el-input
               v-model="queryParams.cardId"
@@ -261,7 +256,6 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button
@@ -285,39 +279,38 @@
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
         <el-table v-loading="loading" :data="czrkdjList" border>
           <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="180" show-overflow-tooltip fixed/>
           <el-table-column label="任务ID" align="center" prop="taskId"  min-width="100" show-overflow-tooltip fixed/>
-          <el-table-column label="户别" align="center" prop="hb" min-width="100" show-overflow-tooltip />
-          <el-table-column label="户主姓名" align="center" prop="hzName" min-width="100" show-overflow-tooltip />
+<!--          <el-table-column label="户别" align="center" prop="hb" min-width="100" show-overflow-tooltip />-->
+          <el-table-column label="户主姓名" align="center" prop="hzName" min-width="120" show-overflow-tooltip />
           <el-table-column label="与户主关系" align="center" prop="relation" min-width="100" show-overflow-tooltip/>
-          <el-table-column label="姓名" align="center" prop="name" 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="nation" min-width="100" show-overflow-tooltip/>
-          <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
-          <el-table-column label="宗教信仰" align="center" prop="zjxy" min-width="90" show-overflow-tooltip/>
-          <el-table-column label="住址" align="center" prop="xzz" min-width="100" show-overflow-tooltip />
-          <el-table-column label="其他住址" align="center" prop="bxsqtzz" 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="jiguan" min-width="100" show-overflow-tooltip />
-          <el-table-column label="文化程度" align="center" prop="whcd" min-width="90" show-overflow-tooltip/>
-          <el-table-column label="婚姻状况" align="center" prop="hyzk" min-width="90" show-overflow-tooltip/>
-          <el-table-column label="兵役状况" align="center" prop="byzk" min-width="100" show-overflow-tooltip />
-          <el-table-column label="身高" align="center" prop="height" min-width="80" show-overflow-tooltip />
-          <el-table-column label="血型" align="center" prop="blood" min-width="80" show-overflow-tooltip />
-          <el-table-column label="服务处所" align="center" prop="zyjfwcs" min-width="120" show-overflow-tooltip/>
-          <el-table-column label="职业" align="center" prop="zy" min-width="100" show-overflow-tooltip />
-          <el-table-column label="申领居民身份证原因" align="center" prop="slReason" min-width="140" show-overflow-tooltip />
-          <el-table-column label="申领居民身份证签名" align="center" prop="sljmsfzqm" min-width="140" show-overflow-tooltip />
-          <el-table-column label="签发意见" align="center" prop="qfyj" min-width="100" show-overflow-tooltip />
-          <el-table-column label="身份证签发日期及有效期限" align="center" prop="yxrq" min-width="180" show-overflow-tooltip />
-          <el-table-column label="身份证号" align="center" prop="cardId" min-width="100" show-overflow-tooltip />
-          <el-table-column label="何时由何地迁来本市（县）" align="center" prop="hsybxshcqlhsdjhk" min-width="180" show-overflow-tooltip />
-          <el-table-column label="何时由何地迁来本址" align="center" prop="hsyhdqlbxshsdjhk" min-width="160" show-overflow-tooltip />
-          <el-table-column label="何时迁往何地" align="center" prop="hshyqwhd" min-width="120" show-overflow-tooltip />
-          <el-table-column label="何因注销户口是否缴销身份证" align="center" prop="zxhkyy" min-width="200" show-overflow-tooltip />
+          <el-table-column label="姓名" align="center" prop="name" min-width="120" 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="nation" min-width="100" show-overflow-tooltip/>-->
+          <el-table-column label="出生日期" align="center" prop="birthday" min-width="180" show-overflow-tooltip/>
+<!--          <el-table-column label="宗教信仰" align="center" prop="zjxy" min-width="90" show-overflow-tooltip/>-->
+<!--          <el-table-column label="住址" align="center" prop="xzz" min-width="100" show-overflow-tooltip />-->
+<!--          <el-table-column label="其他住址" align="center" prop="bxsqtzz" 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="jiguan" min-width="100" show-overflow-tooltip />-->
+<!--          <el-table-column label="文化程度" align="center" prop="whcd" min-width="90" show-overflow-tooltip/>-->
+<!--          <el-table-column label="婚姻状况" align="center" prop="hyzk" min-width="90" show-overflow-tooltip/>-->
+<!--          <el-table-column label="兵役状况" align="center" prop="byzk" min-width="100" show-overflow-tooltip />-->
+<!--          <el-table-column label="身高" align="center" prop="height" min-width="80" show-overflow-tooltip />-->
+<!--          <el-table-column label="血型" align="center" prop="blood" min-width="80" show-overflow-tooltip />-->
+<!--          <el-table-column label="服务处所" align="center" prop="zyjfwcs" min-width="120" show-overflow-tooltip/>-->
+<!--          <el-table-column label="职业" align="center" prop="zy" min-width="100" show-overflow-tooltip />-->
+<!--          <el-table-column label="申领居民身份证原因" align="center" prop="slReason" min-width="140" show-overflow-tooltip />-->
+<!--          <el-table-column label="申领居民身份证签名" align="center" prop="sljmsfzqm" min-width="140" show-overflow-tooltip />-->
+<!--          <el-table-column label="签发意见" align="center" prop="qfyj" min-width="100" show-overflow-tooltip />-->
+<!--          <el-table-column label="身份证签发日期及有效期限" align="center" prop="yxrq" min-width="180" show-overflow-tooltip />-->
+          <el-table-column label="身份证号" align="center" prop="cardId" min-width="180" show-overflow-tooltip />
+<!--          <el-table-column label="何时由何地迁来本市（县）" align="center" prop="hsybxshcqlhsdjhk" min-width="180" show-overflow-tooltip />-->
+<!--          <el-table-column label="何时由何地迁来本址" align="center" prop="hsyhdqlbxshsdjhk" min-width="160" show-overflow-tooltip />-->
+<!--          <el-table-column label="何时迁往何地" align="center" prop="hshyqwhd" min-width="120" show-overflow-tooltip />-->
+<!--          <el-table-column label="何因注销户口是否缴销身份证" align="center" prop="zxhkyy" min-width="200" 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"/>
@@ -344,7 +337,7 @@
             </template>
           </el-table-column>
           <el-table-column label="审核原因" align="center" prop="auditReason" />
-          <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>
+<!--          <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>-->
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="160">
             <template slot-scope="scope">
               <el-button
@@ -370,10 +363,8 @@
             </template>
           </el-table-column>
         </el-table>
-
       </el-tab-pane>
       <el-tab-pane label="常住人口登记3" name="option9">
-
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
           <el-form-item label="任务ID" prop="taskId">
             <el-input
@@ -399,14 +390,14 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="民族" prop="nation">
+<!--          <el-form-item label="民族" prop="nation">
             <el-input
               v-model="queryParams.nation"
               placeholder="请输入民族"
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item label="身份证号" prop="cardId">
             <el-input
               v-model="queryParams.cardId"
@@ -450,7 +441,6 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button
@@ -474,42 +464,41 @@
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
         <el-table v-loading="loading" :data="czrkdjList" border>
           <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="180" show-overflow-tooltip fixed/>
           <el-table-column label="任务ID" align="center" prop="taskId"  min-width="100" show-overflow-tooltip fixed/>
-          <el-table-column label="户别" align="center" prop="hb" min-width="100" show-overflow-tooltip />
+<!--          <el-table-column label="户别" align="center" prop="hb" min-width="100" show-overflow-tooltip />-->
           <el-table-column label="户主姓名" align="center" prop="hzName" min-width="100" show-overflow-tooltip />
           <el-table-column label="与户主关系" align="center" prop="relation" min-width="100" show-overflow-tooltip/>
           <el-table-column label="姓名" align="center" prop="name" 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="usedName" min-width="100" show-overflow-tooltip/>
-          <el-table-column label="民族" align="center" prop="nation" 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="usedName" min-width="100" show-overflow-tooltip/>-->
+<!--          <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>-->
           <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
           <el-table-column label="监护人1" align="center" prop="jhr1" min-width="100" show-overflow-tooltip/>
           <el-table-column label="监护人2" align="center" prop="jhr2" min-width="100" show-overflow-tooltip/>
           <el-table-column label="监护关系1" align="center" prop="jhgx1" min-width="100" show-overflow-tooltip/>
           <el-table-column label="监护关系2" align="center" prop="jhgx2" 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="gmcszqfrq" min-width="140" show-overflow-tooltip/>
-          <el-table-column label="住址" align="center" prop="xzz" min-width="100" show-overflow-tooltip />
-          <el-table-column label="本市（县）其他住址" align="center" prop="bxsqtzz" min-width="140" show-overflow-tooltip />
-          <el-table-column label="籍贯" align="center" prop="jiguan" min-width="100" show-overflow-tooltip />
-          <el-table-column label="宗教信仰" align="center" prop="zjxy" min-width="90" show-overflow-tooltip/>
-          <el-table-column label="身份证号" align="center" prop="cardId" min-width="100" show-overflow-tooltip />
-          <el-table-column label="身份证签发日期" align="center" prop="yxrq" min-width="120" show-overflow-tooltip />
-          <el-table-column label="文化程度" align="center" prop="whcd" min-width="90" show-overflow-tooltip/>
-          <el-table-column label="婚姻状况" align="center" prop="hyzk" min-width="90" show-overflow-tooltip/>
-          <el-table-column label="兵役状况" align="center" prop="byzk" min-width="100" show-overflow-tooltip />
-          <el-table-column label="身高" align="center" prop="height" min-width="80" show-overflow-tooltip />
-          <el-table-column label="血型" align="center" prop="blood" min-width="80" show-overflow-tooltip />
-          <el-table-column label="职业" align="center" prop="zy" min-width="100" show-overflow-tooltip />
-          <el-table-column label="服务处所" align="center" prop="zyjfwcs" min-width="120" show-overflow-tooltip/>
-          <el-table-column label="何时何因由何地迁来本市" align="center" prop="hsyhdqlbxshsdjhk" min-width="170" show-overflow-tooltip />
-          <el-table-column label="何时何因由何地迁来本址" align="center" prop="hsybxshcqlhsdjhk" min-width="170" show-overflow-tooltip />
-          <el-table-column label="何时何因迁往何地" align="center" prop="hshyqwhd" min-width="130" show-overflow-tooltip />
-          <el-table-column label="何时何因注销户口" align="center" prop="zxhkyy" min-width="130" show-overflow-tooltip />
-          <el-table-column label="登记日期" align="center" prop="djrq" 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="gmcszqfrq" min-width="140" show-overflow-tooltip/>-->
+<!--          <el-table-column label="住址" align="center" prop="xzz" min-width="100" show-overflow-tooltip />-->
+<!--          <el-table-column label="本市（县）其他住址" align="center" prop="bxsqtzz" min-width="140" show-overflow-tooltip />-->
+<!--          <el-table-column label="籍贯" align="center" prop="jiguan" min-width="100" show-overflow-tooltip />-->
+<!--          <el-table-column label="宗教信仰" align="center" prop="zjxy" min-width="90" show-overflow-tooltip/>-->
+          <el-table-column label="身份证号" align="center" prop="cardId" min-width="180" show-overflow-tooltip />
+<!--          <el-table-column label="身份证签发日期" align="center" prop="yxrq" min-width="120" show-overflow-tooltip />-->
+<!--          <el-table-column label="文化程度" align="center" prop="whcd" min-width="90" show-overflow-tooltip/>-->
+<!--          <el-table-column label="婚姻状况" align="center" prop="hyzk" min-width="90" show-overflow-tooltip/>-->
+<!--          <el-table-column label="兵役状况" align="center" prop="byzk" min-width="100" show-overflow-tooltip />-->
+<!--          <el-table-column label="身高" align="center" prop="height" min-width="80" show-overflow-tooltip />-->
+<!--          <el-table-column label="血型" align="center" prop="blood" min-width="80" show-overflow-tooltip />-->
+<!--          <el-table-column label="职业" align="center" prop="zy" min-width="100" show-overflow-tooltip />-->
+<!--          <el-table-column label="服务处所" align="center" prop="zyjfwcs" min-width="120" show-overflow-tooltip/>-->
+<!--          <el-table-column label="何时何因由何地迁来本市" align="center" prop="hsyhdqlbxshsdjhk" min-width="170" show-overflow-tooltip />-->
+<!--          <el-table-column label="何时何因由何地迁来本址" align="center" prop="hsybxshcqlhsdjhk" min-width="170" show-overflow-tooltip />-->
+<!--          <el-table-column label="何时何因迁往何地" align="center" prop="hshyqwhd" min-width="130" show-overflow-tooltip />-->
+<!--          <el-table-column label="何时何因注销户口" align="center" prop="zxhkyy" min-width="130" show-overflow-tooltip />-->
+<!--          <el-table-column label="登记日期" align="center" prop="djrq" 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"/>
@@ -536,7 +525,7 @@
             </template>
           </el-table-column>
           <el-table-column label="审核原因" align="center" prop="auditReason" />
-          <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>
+<!--          <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>-->
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="160">
             <template slot-scope="scope">
               <el-button
@@ -562,11 +551,9 @@
             </template>
           </el-table-column>
         </el-table>
-
       </el-tab-pane>
       <el-tab-pane label="常住卡" name="option2">
-
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
           <el-form-item label="任务ID" prop="taskId">
             <el-input
               v-model="queryParams.taskId"
@@ -591,22 +578,22 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="民族" prop="nation">
+<!--          <el-form-item label="民族" prop="nation">
             <el-input
               v-model="queryParams.nation"
               placeholder="请输入民族"
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
-          <el-form-item label="身份证号" prop="cardId">
+          </el-form-item>-->
+<!--          <el-form-item label="身份证号" prop="cardId">
             <el-input
               v-model="queryParams.cardId"
               placeholder="请输入身份证号"
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item label="是否纠错" prop="errorCorrect">
             <el-select
               v-model="queryParams.errorCorrect"
@@ -642,7 +629,6 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button
@@ -666,26 +652,25 @@
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
         <el-table v-loading="loading" :data="czrkdjList" border>
           <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="180" show-overflow-tooltip fixed/>
           <el-table-column label="任务ID" align="center" prop="taskId"  min-width="100" show-overflow-tooltip fixed/>
           <el-table-column label="户主姓名与户主关系" align="center" prop="relation" min-width="140" show-overflow-tooltip/>
           <el-table-column label="姓名" align="center" prop="name" 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="whcd" min-width="90" show-overflow-tooltip/>
-          <el-table-column label="婚姻状况" align="center" prop="hyzk" min-width="90" show-overflow-tooltip/>
-          <el-table-column label="宗教信仰" align="center" prop="zjxy" min-width="90" show-overflow-tooltip/>
-          <el-table-column label="民族" align="center" prop="nation" 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="whcd" min-width="90" show-overflow-tooltip/>-->
+<!--          <el-table-column label="婚姻状况" align="center" prop="hyzk" min-width="90" show-overflow-tooltip/>-->
+<!--          <el-table-column label="宗教信仰" align="center" prop="zjxy" min-width="90" show-overflow-tooltip/>-->
+<!--          <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>-->
           <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="jiguan" min-width="100" show-overflow-tooltip />
-          <el-table-column label="职业及服务处所" align="center" prop="zyjfwcs" min-width="120" show-overflow-tooltip/>
-          <el-table-column label="何时由何地迁来" align="center" prop="hsyhdqlbxshsdjhk" min-width="120" show-overflow-tooltip />
-          <el-table-column label="本县市其他住址" align="center" prop="bxsqtzz" min-width="130" show-overflow-tooltip />
-          <el-table-column label="现住址" align="center" prop="xzz" min-width="100" show-overflow-tooltip />
-          <el-table-column label="登记日期" align="center" prop="djrq" 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="jiguan" min-width="100" show-overflow-tooltip />-->
+<!--          <el-table-column label="职业及服务处所" align="center" prop="zyjfwcs" min-width="120" show-overflow-tooltip/>-->
+<!--          <el-table-column label="何时由何地迁来" align="center" prop="hsyhdqlbxshsdjhk" min-width="120" show-overflow-tooltip />-->
+<!--          <el-table-column label="本县市其他住址" align="center" prop="bxsqtzz" min-width="130" show-overflow-tooltip />-->
+<!--          <el-table-column label="现住址" align="center" prop="xzz" min-width="100" show-overflow-tooltip />-->
+<!--          <el-table-column label="登记日期" align="center" prop="djrq" 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"/>
@@ -712,7 +697,7 @@
             </template>
           </el-table-column>
           <el-table-column label="审核原因" align="center" prop="auditReason" />
-          <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>
+<!--          <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>-->
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="160">
             <template slot-scope="scope">
               <el-button
@@ -738,7 +723,6 @@
             </template>
           </el-table-column>
         </el-table>
-
       </el-tab-pane>
     </el-tabs>
 
@@ -750,8 +734,8 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改常住人口登记对话框 -->
-    <el-dialog title="纠错" :visible.sync="open_jc" width="1200px" append-to-body>
+    <!-- 纠错 原 -->
+<!--    <el-dialog title="纠错" :visible.sync="open_jc" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row :gutter="10" class="jc_sb">
           <el-col :span="10">
@@ -765,7 +749,7 @@
           </el-col>
           <el-col :span="14">
 
-            <!--常住人口登记表1-->
+            &lt;!&ndash;常住人口登记表1&ndash;&gt;
             <el-row :gutter="10" v-if="form.ywType==='option1'">
               <el-col :span="12">
                 <el-form-item label="户主或与户主关系" prop="relation" label-width="125px">
@@ -874,7 +858,7 @@
               </el-col>
             </el-row>
 
-            <!--常住人口登记表2-->
+            &lt;!&ndash;常住人口登记表2&ndash;&gt;
             <el-row :gutter="10" v-if="form.ywType==='option3'">
               <el-col :span="12">
                 <el-form-item label="户别" prop="hb" label-width="40px">
@@ -1028,7 +1012,7 @@
               </el-col>
             </el-row>
 
-            <!--常住人口登记表3-->
+            &lt;!&ndash;常住人口登记表3&ndash;&gt;
             <el-row :gutter="10" v-if="form.ywType==='option9'">
               <el-col :span="12">
                 <el-form-item label="户别" prop="hb" label-width="40px">
@@ -1197,7 +1181,7 @@
               </el-col>
             </el-row>
 
-            <!--常住卡-->
+            &lt;!&ndash;常住卡&ndash;&gt;
             <el-row :gutter="10" v-if="form.ywType==='option2'">
               <el-col :span="12">
                 <el-form-item label="户主姓名与户主关系" prop="relation" label-width="140px">
@@ -1294,9 +1278,152 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>-->
+
+    <!-- 纠错 新 -->
+    <el-dialog title="纠错" :visible.sync="open_jc" width="90%" append-to-body top="10px !important">
+      <div style="height: 86vh;">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-row :gutter="10" class="jc_sb">
+            <el-col :span="12">
+              <el-carousel height="calc(86vh - 100px)" v-if="form.pictures" :autoplay="false">
+                <el-carousel-item v-for="item in form.pictures.split(',')" :key="item">
+                  <div class="jc_sb_img" style="height:100%; overflow:auto; text-align:center; font-size:0">
+                    <el-image style="height:100%;" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
+                  </div>
+                </el-carousel-item>
+              </el-carousel>
+            </el-col>
+            <el-col :span="12">
+
+              <!--常住人口登记表1-->
+              <el-row :gutter="10" v-if="form.ywType==='option1'">
+                <el-col :span="24">
+                  <el-form-item label="户主或与户主关系" prop="relation" label-width="130px">
+                    <el-input v-model="form.relation" placeholder="请输入户主或与户主关系" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="姓名" prop="name" label-width="130px">
+                    <el-input v-model="form.name" placeholder="请输入姓名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="出生年月日" prop="birthday" label-width="130px">
+                    <el-input v-model="form.birthday" placeholder="请输入出生年月日" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <!--常住人口登记表2-->
+              <el-row :gutter="10" v-if="form.ywType==='option3'">
+                <el-col :span="24">
+                  <el-form-item label="户主姓名" prop="hzName" label-width="90px">
+                    <el-input v-model="form.hzName" placeholder="请输入户主姓名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="与户主关系" prop="relation" label-width="90px">
+                    <el-input v-model="form.relation" placeholder="请输入与户主关系" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="姓名" prop="name" label-width="90px">
+                    <el-input v-model="form.name" placeholder="请输入姓名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="出生日期" prop="birthday" label-width="90px">
+                    <el-input v-model="form.birthday" placeholder="请输入出生日期" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="身份证号" prop="cardId" label-width="90px">
+                    <el-input v-model="form.cardId" placeholder="请输入身份证号" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <!--常住人口登记表3-->
+              <el-row :gutter="10" v-if="form.ywType==='option9'">
+                <el-col :span="24">
+                  <el-form-item label="户主姓名" prop="hzName" label-width="90px">
+                    <el-input v-model="form.hzName" placeholder="请输入户主姓名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="与户主关系" prop="relation" label-width="90px">
+                    <el-input v-model="form.relation" placeholder="请输入与户主关系" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="姓名" prop="name" label-width="90px">
+                    <el-input v-model="form.name" placeholder="请输入姓名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="出生日期" prop="birthday" label-width="90px">
+                    <el-input v-model="form.birthday" placeholder="请输入出生日期" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="监护人1" prop="jhr1" label-width="90px">
+                    <el-input v-model="form.jhr1" placeholder="请输入监护人1" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="监护人2" prop="jhr2" label-width="90px">
+                    <el-input v-model="form.jhr2" placeholder="请输入监护人2" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="监护关系1" prop="jhgx1" label-width="90px">
+                    <el-input v-model="form.jhgx1" placeholder="请输入监护关系1" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="监护关系2" prop="jhgx2" label-width="90px">
+                    <el-input v-model="form.jhgx2" placeholder="请输入监护关系2" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="身份证号" prop="cardId" label-width="90px">
+                    <el-input v-model="form.cardId" placeholder="请输入身份证号" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <!--常住卡-->
+              <el-row :gutter="10" v-if="form.ywType==='option2'">
+                <el-col :span="24">
+                  <el-form-item label="户主姓名与户主关系" prop="relation" label-width="140px">
+                    <el-input v-model="form.relation" placeholder="请输入户主姓名与户主关系" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="姓名" prop="name" label-width="140px">
+                    <el-input v-model="form.name" placeholder="请输入姓名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="出生日期" prop="birthday" label-width="140px">
+                    <el-input v-model="form.birthday" placeholder="请输入出生日期" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-col>
+          </el-row>
+
+        </el-form>
+        <div slot="footer" class="dialog-footer" style="text-align:right; margin-top: 30px;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </div>
     </el-dialog>
 
-    <el-dialog title="新增手动识别" :visible.sync="open_add" width="1200px" 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">
 
@@ -1325,7 +1452,7 @@
           </el-col>
           <el-col :span="14" class="jc_sb">
 
-            <!--常住人口登记表1-->
+            &lt;!&ndash;常住人口登记表1&ndash;&gt;
             <el-row :gutter="10" v-if="form.ywType==='option1'">
               <el-col :span="12">
                 <el-form-item label="户主或与户主关系" prop="relation" label-width="125px">
@@ -1434,7 +1561,7 @@
               </el-col>
             </el-row>
 
-            <!--常住人口登记表2-->
+            &lt;!&ndash;常住人口登记表2&ndash;&gt;
             <el-row :gutter="10" v-if="form.ywType==='option3'">
               <el-col :span="12">
                 <el-form-item label="户别" prop="hb" label-width="40px">
@@ -1588,7 +1715,7 @@
               </el-col>
             </el-row>
 
-            <!--常住人口登记表3-->
+            &lt;!&ndash;常住人口登记表3&ndash;&gt;
             <el-row :gutter="10" v-if="form.ywType==='option9'">
               <el-col :span="12">
                 <el-form-item label="户别" prop="hb" label-width="40px">
@@ -1757,7 +1884,7 @@
               </el-col>
             </el-row>
 
-            <!--常住卡-->
+            &lt;!&ndash;常住卡&ndash;&gt;
             <el-row :gutter="10" v-if="form.ywType==='option2'">
               <el-col :span="12">
                 <el-form-item label="户主姓名与户主关系" prop="relation" label-width="140px">
@@ -1856,6 +1983,161 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
 
+    </el-dialog>-->
+
+    <!-- 新增手动识别 新 -->
+    <el-dialog title="新增手动识别" :visible.sync="open_add" width="90%" append-to-body top="10px !important">
+      <div style="height: 86vh;">
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="档案目录路径" prop="muPath" label-width="120px">
+                <el-input readonly  placeholder="请选择档案目录路径" v-model="form.muPath">
+                  <el-button slot="append" icon="el-icon-search" @click="muIdChange"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-button type="primary" @click="selectDaRecard" style="margin-left: 10px;">选择档案记录</el-button>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" v-if="shiBieList&&shiBieList.length>0">
+            <el-col :span="12">
+              <el-carousel height="calc(86vh - 100px)" :autoplay="false">
+                <el-carousel-item v-for="item in shiBieList" :key="item.id">
+                  <div class="jc_sb_img" style="height:100%; overflow:auto; text-align:center; font-size:0">
+                    <el-image style="height:100%;" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
+                  </div>
+                </el-carousel-item>
+              </el-carousel>
+            </el-col>
+            <el-col :span="12" class="jc_sb">
+
+              <!--常住人口登记表1-->
+              <el-row :gutter="10" v-if="form.ywType==='option1'">
+                <el-col :span="24">
+                  <el-form-item label="户主或与户主关系" prop="relation" label-width="130px">
+                    <el-input v-model="form.relation" placeholder="请输入户主或与户主关系" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="姓名" prop="name" label-width="130px">
+                    <el-input v-model="form.name" placeholder="请输入姓名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="出生年月日" prop="birthday" label-width="130px">
+                    <el-input v-model="form.birthday" placeholder="请输入出生年月日" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <!--常住人口登记表2-->
+              <el-row :gutter="10" v-if="form.ywType==='option3'">
+                <el-col :span="24">
+                  <el-form-item label="户主姓名" prop="hzName" label-width="90px">
+                    <el-input v-model="form.hzName" placeholder="请输入户主姓名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="与户主关系" prop="relation" label-width="90px">
+                    <el-input v-model="form.relation" placeholder="请输入与户主关系" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="姓名" prop="name" label-width="90px">
+                    <el-input v-model="form.name" placeholder="请输入姓名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="出生日期" prop="birthday" label-width="90px">
+                    <el-input v-model="form.birthday" placeholder="请输入出生日期" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="身份证号" prop="cardId" label-width="90px">
+                    <el-input v-model="form.cardId" placeholder="请输入身份证号" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <!--常住人口登记表3-->
+              <el-row :gutter="10" v-if="form.ywType==='option9'">
+                <el-col :span="24">
+                  <el-form-item label="户主姓名" prop="hzName" label-width="90px">
+                    <el-input v-model="form.hzName" placeholder="请输入户主姓名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="与户主关系" prop="relation" label-width="90px">
+                    <el-input v-model="form.relation" placeholder="请输入与户主关系" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="姓名" prop="name" label-width="90px">
+                    <el-input v-model="form.name" placeholder="请输入姓名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="出生日期" prop="birthday" label-width="90px">
+                    <el-input v-model="form.birthday" placeholder="请输入出生日期" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="监护人1" prop="jhr1" label-width="90px">
+                    <el-input v-model="form.jhr1" placeholder="请输入监护人1" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="监护人2" prop="jhr2" label-width="90px">
+                    <el-input v-model="form.jhr2" placeholder="请输入监护人2" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="监护关系1" prop="jhgx1" label-width="90px">
+                    <el-input v-model="form.jhgx1" placeholder="请输入监护关系1" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="监护关系2" prop="jhgx2" label-width="90px">
+                    <el-input v-model="form.jhgx2" placeholder="请输入监护关系2" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="身份证号" prop="cardId" label-width="90px">
+                    <el-input v-model="form.cardId" placeholder="请输入身份证号" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <!--常住卡-->
+              <el-row :gutter="10" v-if="form.ywType==='option2'">
+                <el-col :span="24">
+                  <el-form-item label="户主姓名与户主关系" prop="relation" label-width="140px">
+                    <el-input v-model="form.relation" placeholder="请输入户主姓名与户主关系" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="姓名" prop="name" label-width="140px">
+                    <el-input v-model="form.name" placeholder="请输入姓名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="出生日期" prop="birthday" label-width="140px">
+                    <el-input v-model="form.birthday" placeholder="请输入出生日期" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+            </el-col>
+          </el-row>
+
+        </el-form>
+        <div slot="footer" class="dialog-footer" style="text-align:right; margin-top: 30px;">
+          <el-button type="primary" @click="addSubmitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </div>
     </el-dialog>
 
     <!-- 审核对话框 -->
diff --git a/dangan-ui/src/views/dangan/qyz/index.vue b/dangan-ui/src/views/dangan/qyz/index.vue
index 456c861..b6b766e 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="90px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="任务ID" prop="taskId">
         <el-input
           v-model="queryParams.taskId"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="发文单位" prop="fwUnit">
+<!--      <el-form-item label="发文单位" prop="fwUnit">
         <el-input
           v-model="queryParams.fwUnit"
           placeholder="请输入发文单位"
@@ -32,7 +32,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="是否纠错" prop="errorCorrect">
         <el-select
           v-model="queryParams.errorCorrect"
@@ -96,26 +96,26 @@
     <el-table v-loading="loading" border :data="qyzList">
       <el-table-column label="档案目录路径" align="center" fixed prop="muPath" min-width="160" show-overflow-tooltip/>
       <el-table-column label="任务ID" align="center" prop="taskId"  min-width="100" show-overflow-tooltip fixed/>
-      <el-table-column label="发文单位" align="center" prop="fwUnit" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="文件序号" align="center" prop="wjXh" min-width="100" show-overflow-tooltip/>
+<!--      <el-table-column label="发文单位" align="center" prop="fwUnit" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="文件序号" align="center" prop="wjXh" min-width="100" 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="sex1" min-width="100" show-overflow-tooltip/>-->
       <el-table-column label="居民身份证编号1" align="center" prop="cardId1" 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="sex2" min-width="100" show-overflow-tooltip/>-->
       <el-table-column label="居民身份证编号2" align="center" prop="cardId2" 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="sex3" min-width="100" show-overflow-tooltip/>-->
       <el-table-column label="居民身份证编号3" align="center" prop="cardId3" 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="sex4" min-width="100" show-overflow-tooltip/>-->
       <el-table-column label="居民身份证编号4" align="center" prop="cardId4" min-width="120" show-overflow-tooltip/>
-      <el-table-column label="迁移原因" align="center" prop="qyReason" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="原住址" align="center" prop="yAddress" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="迁往地址" align="center" prop="qwAddress" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="签发有效时间起" align="center" prop="sDate" min-width="120" show-overflow-tooltip/>
-      <el-table-column label="签发有效时间止" align="center" prop="eDate" min-width="120" show-overflow-tooltip/>
-      <el-table-column label="承办人" align="center" prop="cbr" min-width="100" show-overflow-tooltip/>
+<!--      <el-table-column label="迁移原因" align="center" prop="qyReason" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="原住址" align="center" prop="yAddress" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="迁往地址" align="center" prop="qwAddress" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="签发有效时间起" align="center" prop="sDate" min-width="120" show-overflow-tooltip/>-->
+<!--      <el-table-column label="签发有效时间止" align="center" prop="eDate" min-width="120" show-overflow-tooltip/>-->
+<!--      <el-table-column label="承办人" align="center" prop="cbr" 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"/>
@@ -143,7 +143,7 @@
         </template>
       </el-table-column>
       <el-table-column label="审核原由" align="center" prop="auditReason" min-width="140" show-overflow-tooltip/>
-      <el-table-column label="备注" align="center" prop="remark" min-width="140" show-overflow-tooltip/>
+<!--      <el-table-column label="备注" align="center" prop="remark" min-width="140" show-overflow-tooltip/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" fixed="right">
         <template slot-scope="scope">
           <el-button
@@ -178,7 +178,8 @@
       @pagination="getList"
     />
 
-    <!-- 纠错 -->
+    <!-- 纠错 原-->
+<!--
     <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">
@@ -324,9 +325,61 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+-->
+
+    <!-- 纠错 新-->
+    <el-dialog title="纠错" :visible.sync="open_jc" width="90%" append-to-body top="10px !important">
+      <div style="height: 86vh;">
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-carousel height="calc(86vh - 100px)" v-if="form.pictures" :autoplay="false">
+                <el-carousel-item v-for="item in form.pictures.split(',')" :key="item">
+                  <div class="jc_sb_img" style="height:100%; overflow:auto; text-align:center; font-size:0">
+                    <el-image style="height:100%;" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
+                  </div>
+                </el-carousel-item>
+              </el-carousel>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="姓名1" prop="name1" label-width="120px">
+                <el-input v-model="form.name1" placeholder="请输入姓名1" />
+              </el-form-item>
+              <el-form-item label="居民身份证编号1" prop="cardId1" label-width="120px">
+                <el-input v-model="form.cardId1" placeholder="请输入居民身份证编号1" />
+              </el-form-item>
+              <el-form-item label="姓名2" prop="name2" label-width="120px">
+                <el-input v-model="form.name2" placeholder="请输入姓名2" />
+              </el-form-item>
+              <el-form-item label="居民身份证编号2" prop="cardId2" label-width="120px">
+                <el-input v-model="form.cardId2" placeholder="请输入居民身份证编号2" />
+              </el-form-item>
+              <el-form-item label="姓名3" prop="name3" label-width="120px">
+                <el-input v-model="form.name3" placeholder="请输入姓名3" />
+              </el-form-item>
+              <el-form-item label="居民身份证编号3" prop="cardId3" label-width="120px">
+                <el-input v-model="form.cardId3" placeholder="请输入居民身份证编号3" />
+              </el-form-item>
+              <el-form-item label="姓名4" prop="name4" label-width="120px">
+                <el-input v-model="form.name4" placeholder="请输入姓名4" />
+              </el-form-item>
+              <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-form>
+        <div slot="footer" class="dialog-footer" style="text-align:right; margin-top: 30px;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
 
-<!--    新增手动识别-->
-    <el-dialog title="新增手动识别" :visible.sync="open_add" width="1200px" 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">
 
@@ -488,6 +541,67 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
 
+    </el-dialog>-->
+
+    <!--    新增手动识别 新-->
+    <el-dialog title="新增手动识别" :visible.sync="open_add" width="90%" append-to-body top="10px !important">
+      <div style="height: 86vh;">
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="档案目录路径" prop="muPath" label-width="110px">
+                <el-input readonly  placeholder="请选择档案目录路径" v-model="form.muPath">
+                  <el-button slot="append" icon="el-icon-search" @click="muIdChange"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-button type="primary" @click="selectDaRecard" style="margin-left: 10px;">选择档案记录</el-button>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" v-if="shiBieList&&shiBieList.length>0">
+            <el-col :span="12">
+              <el-carousel height="calc(86vh - 100px)" :autoplay="false">
+                <el-carousel-item v-for="item in shiBieList" :key="item.id">
+                  <div class="jc_sb_img" style="height:100%; overflow:auto; text-align:center; font-size:0">
+                    <el-image style="height:100%;" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
+                  </div>
+                </el-carousel-item>
+              </el-carousel>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="姓名1" prop="name1" label-width="120px">
+                <el-input v-model="form.name1" placeholder="请输入姓名1" />
+              </el-form-item>
+              <el-form-item label="居民身份证编号1" prop="cardId1" label-width="120px">
+                <el-input v-model="form.cardId1" placeholder="请输入居民身份证编号1" />
+              </el-form-item>
+              <el-form-item label="姓名2" prop="name2" label-width="120px">
+                <el-input v-model="form.name2" placeholder="请输入姓名2" />
+              </el-form-item>
+              <el-form-item label="居民身份证编号2" prop="cardId2" label-width="120px">
+                <el-input v-model="form.cardId2" placeholder="请输入居民身份证编号2" />
+              </el-form-item>
+              <el-form-item label="姓名3" prop="name3" label-width="120px">
+                <el-input v-model="form.name3" placeholder="请输入姓名3" />
+              </el-form-item>
+              <el-form-item label="居民身份证编号3" prop="cardId3" label-width="120px">
+                <el-input v-model="form.cardId3" placeholder="请输入居民身份证编号3" />
+              </el-form-item>
+              <el-form-item label="姓名4" prop="name4" label-width="120px">
+                <el-input v-model="form.name4" placeholder="请输入姓名4" />
+              </el-form-item>
+              <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-form>
+        <div slot="footer" class="dialog-footer" style="text-align:right; margin-top: 30px;">
+          <el-button type="primary" @click="addSubmitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </div>
     </el-dialog>
 
     <!-- 审核对话框 -->
diff --git a/dangan-ui/src/views/dangan/ytzm/index.vue b/dangan-ui/src/views/dangan/ytzm/index.vue
index 76ae901..02c1c1c 100644
--- a/dangan-ui/src/views/dangan/ytzm/index.vue
+++ b/dangan-ui/src/views/dangan/ytzm/index.vue
@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="年份" prop="year">
+<!--      <el-form-item label="年份" prop="year">
         <el-input
           v-model="queryParams.year"
           placeholder="请输入年份"
@@ -48,7 +48,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="是否纠错" prop="errorCorrect">
         <el-select
           v-model="queryParams.errorCorrect"
@@ -112,22 +112,22 @@
     <el-table v-loading="loading" :data="ytzmList" border>
       <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="150" show-overflow-tooltip fixed/>
       <el-table-column label="任务ID" align="center" prop="taskId"  min-width="100" show-overflow-tooltip fixed/>
-      <el-table-column label="年份" align="center" prop="year" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="序号" align="center" prop="xh" min-width="100" show-overflow-tooltip/>
+<!--      <el-table-column label="年份" align="center" prop="year" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="序号" align="center" prop="xh" min-width="100" show-overflow-tooltip/>-->
       <el-table-column label="姓名女" align="center" prop="wName" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="工作单位女" align="center" prop="wUnit" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="身份证号女" align="center" prop="wCardId" min-width="100" show-overflow-tooltip/>
+<!--      <el-table-column label="工作单位女" align="center" prop="wUnit" min-width="100" show-overflow-tooltip/>-->
+      <el-table-column label="身份证号女" align="center" prop="wCardId" min-width="180" show-overflow-tooltip/>
       <el-table-column label="姓名男" align="center" prop="mName" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="工作单位男" align="center" prop="mUnit" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="身份证号男" align="center" prop="mCardId" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="生育证号" align="center" prop="syzh" min-width="100" show-overflow-tooltip/>
+<!--      <el-table-column label="工作单位男" align="center" prop="mUnit" min-width="100" show-overflow-tooltip/>-->
+      <el-table-column label="身份证号男" align="center" prop="mCardId" min-width="180" show-overflow-tooltip/>
+<!--      <el-table-column label="生育证号" align="center" prop="syzh" min-width="100" show-overflow-tooltip/>-->
       <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="医院地址" align="center" prop="hospital" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="婴儿性别" align="center" prop="babySex" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="意见" align="center" prop="suggest" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="派出所位置" align="center" prop="pcsAddress" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="填表日期1" align="center" prop="tbDate1" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="填表日期2" align="center" prop="tbDate2" min-width="100" show-overflow-tooltip/>
+<!--      <el-table-column label="医院地址" align="center" prop="hospital" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="婴儿性别" align="center" prop="babySex" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="意见" align="center" prop="suggest" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="派出所位置" align="center" prop="pcsAddress" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="填表日期1" align="center" prop="tbDate1" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="填表日期2" align="center" prop="tbDate2" 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"/>
@@ -189,8 +189,8 @@
       @pagination="getList"
     />
 
-    <!-- 纠错 -->
-    <el-dialog title="纠错" :visible.sync="open_jc" width="1200px" append-to-body>
+    <!-- 纠错 原-->
+<!--    <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">
@@ -310,9 +310,51 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>-->
+
+    <!-- 纠错 新-->
+    <el-dialog title="纠错" :visible.sync="open_jc" width="90%" append-to-body top="10px !important">
+      <div style="height: 86vh;">
+        <el-form ref="form" :model="form" :rules="rules" label-width="60px">
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-carousel height="calc(86vh - 100px)" v-if="form.pictures" :autoplay="false">
+                <el-carousel-item v-for="item in form.pictures.split(',')" :key="item">
+                  <div class="jc_sb_img" style="height:100%; overflow:auto; text-align:center; font-size:0">
+                    <el-image style="height:100%;" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
+                  </div>
+                </el-carousel-item>
+              </el-carousel>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="姓名女" prop="wName" label-width="90px">
+                <el-input v-model="form.wName" placeholder="请输入姓名女" />
+              </el-form-item>
+              <el-form-item label="身份证号女" prop="wCardId" label-width="90px">
+                <el-input v-model="form.wCardId" placeholder="请输入身份证号女" />
+              </el-form-item>
+              <el-form-item label="姓名男" prop="mName" label-width="90px">
+                <el-input v-model="form.mName" placeholder="请输入姓名男" />
+              </el-form-item>
+              <el-form-item label="身份证号男" prop="mCardId" label-width="90px">
+                <el-input v-model="form.mCardId" placeholder="请输入身份证号男" />
+              </el-form-item>
+              <el-form-item label="出生日期" prop="birthday" label-width="90px">
+                <el-input v-model="form.birthday" placeholder="请输入出生日期" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer" style="text-align:right; margin-top: 30px;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </div>
+
     </el-dialog>
 
-    <!-- 新增手动识别-->
+    <!-- 新增手动识别 原-->
+<!--
     <el-dialog title="新增手动识别" :visible.sync="open_add" width="1200px" append-to-body>
 
       <el-form ref="form" :model="form" :rules="rules" label-width="60px">
@@ -452,6 +494,60 @@
       </div>
 
     </el-dialog>
+-->
+
+    <!-- 新增手动识别 新-->
+    <el-dialog title="新增手动识别" :visible.sync="open_add" width="90%" append-to-body top="10px !important">
+      <div style="height: 86vh;">
+        <el-form ref="form" :model="form" :rules="rules" label-width="60px">
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="档案目录路径" prop="muPath" label-width="110px">
+                <el-input readonly  placeholder="请选择档案目录路径" v-model="form.muPath">
+                  <el-button slot="append" icon="el-icon-search" @click="muIdChange"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-button type="primary" @click="selectDaRecard" style="margin-left: 10px;">选择档案记录</el-button>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" v-if="shiBieList&&shiBieList.length>0">
+            <el-col :span="12">
+              <el-carousel height="calc(86vh - 100px)" :autoplay="false">
+                <el-carousel-item v-for="item in shiBieList" :key="item.id">
+                  <div class="jc_sb_img" style="height:100%; overflow:auto; text-align:center; font-size:0">
+                    <el-image style="height:100%;" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
+                  </div>
+                </el-carousel-item>
+              </el-carousel>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="姓名女" prop="wName" label-width="90px">
+                <el-input v-model="form.wName" placeholder="请输入姓名女" />
+              </el-form-item>
+              <el-form-item label="身份证号女" prop="wCardId" label-width="90px">
+                <el-input v-model="form.wCardId" placeholder="请输入身份证号女" />
+              </el-form-item>
+              <el-form-item label="姓名男" prop="mName" label-width="90px">
+                <el-input v-model="form.mName" placeholder="请输入姓名男" />
+              </el-form-item>
+              <el-form-item label="身份证号男" prop="mCardId" label-width="90px">
+                <el-input v-model="form.mCardId" placeholder="请输入身份证号男" />
+              </el-form-item>
+              <el-form-item label="出生日期" prop="birthday" label-width="90px">
+                <el-input v-model="form.birthday" placeholder="请输入出生日期" />
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer" style="text-align:right; margin-top: 30px;">
+          <el-button type="primary" @click="addSubmitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </div>
+    </el-dialog>
 
     <!-- 审核对话框 -->
     <el-dialog title="审核" :visible.sync="shenHe.open" width="500px" append-to-body>
diff --git a/dangan-ui/src/views/dangan/zfnyhkcg/index.vue b/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
index 249edc7..838884a 100644
--- a/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
+++ b/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
@@ -17,15 +17,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="编号" prop="num">
+<!--      <el-form-item label="编号" prop="num">
         <el-input
           v-model="queryParams.num"
           placeholder="请输入编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="承办人" prop="cbr">
+      </el-form-item>-->
+<!--  暂时注释    -->
+<!--      <el-form-item label="承办人" prop="cbr">
         <el-input
           v-model="queryParams.cbr"
           placeholder="请输入承办人"
@@ -40,7 +41,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="是否纠错" prop="errorCorrect">
         <el-select
           v-model="queryParams.errorCorrect"
@@ -104,28 +105,29 @@
     <el-table v-loading="loading" :data="zfnyhkcgList" border>
       <el-table-column label="档案目录路径" align="center" fixed prop="muPath" min-width="180" show-overflow-tooltip/>
       <el-table-column label="任务ID" align="center" prop="taskId"  min-width="100" show-overflow-tooltip fixed/>
-      <el-table-column label="编号" align="center" prop="num" fixed min-width="120" show-overflow-tooltip/>
+<!--      <el-table-column label="编号" align="center" prop="num" fixed min-width="120" show-overflow-tooltip/>-->
       <el-table-column label="申请人姓名" align="center" prop="name" min-width="120" show-overflow-tooltip/>
-      <el-table-column label="住址或单位" align="center" prop="address" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="与申请人关系1" align="center" prop="relation1" min-width="110" show-overflow-tooltip/>
+<!--      <el-table-column label="住址或单位" align="center" prop="address" min-width="120" show-overflow-tooltip/>-->
+<!--      <el-table-column label="与申请人关系1" align="center" prop="relation1" min-width="110" show-overflow-tooltip/>-->
       <el-table-column label="姓名1" align="center" prop="name1" min-width="100" show-overflow-tooltip/>
       <el-table-column label="性别1" align="center" prop="sex1" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="与申请人关系2" align="center" prop="relation2" min-width="110" show-overflow-tooltip/>
+<!--      暂时注释-->
+<!--      <el-table-column label="与申请人关系2" align="center" prop="relation2" min-width="110" 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="与申请人关系3" align="center" prop="relation3" min-width="110" show-overflow-tooltip/>
+<!--      <el-table-column label="性别2" align="center" prop="sex2" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="与申请人关系3" align="center" prop="relation3" min-width="110" 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="与申请人关系4" align="center" prop="relation4" min-width="110" show-overflow-tooltip/>
+<!--      <el-table-column label="性别3" align="center" prop="sex3" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="与申请人关系4" align="center" prop="relation4" min-width="110" 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="与申请人关系5" align="center" prop="relation5" min-width="110" show-overflow-tooltip/>
+<!--      <el-table-column label="性别4" align="center" prop="sex4" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="与申请人关系5" align="center" prop="relation5" min-width="110" show-overflow-tooltip/>-->
       <el-table-column label="姓名5" align="center" prop="name5" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="性别5" align="center" prop="sex5" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="批复机关1" align="center" prop="jg1" min-width="100" show-overflow-tooltip/>
+<!--      <el-table-column label="性别5" align="center" prop="sex5" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="批复机关1" align="center" prop="jg1" min-width="100" show-overflow-tooltip/>-->
       <el-table-column label="批复机关2" align="center" prop="jg2" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="承办人" align="center" prop="cbr" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="承办日期" align="center" prop="cbDate" min-width="100" show-overflow-tooltip/>
+<!--      <el-table-column label="承办人" align="center" prop="cbr" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="承办日期" align="center" prop="cbDate" min-width="100" show-overflow-tooltip/>-->
       <el-table-column label="识别图片" align="center" prop="pictures">
         <template slot-scope="scope">
           <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
@@ -152,7 +154,7 @@
         </template>
       </el-table-column>
       <el-table-column label="审核原由" align="center" prop="auditReason" min-width="140" show-overflow-tooltip/>
-      <el-table-column label="备注" align="center" prop="remark" min-width="140" show-overflow-tooltip/>
+<!--      <el-table-column label="备注" align="center" prop="remark" min-width="140" show-overflow-tooltip/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" fixed="right">
         <template slot-scope="scope">
           <el-button
@@ -187,8 +189,8 @@
       @pagination="getList"
     />
 
-    <!-- 纠错 -->
-    <el-dialog title="纠错" :visible.sync="open_jc" width="1200px" append-to-body>
+    <!-- 纠错 原-->
+<!--    <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">
@@ -344,10 +346,53 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>-->
+
+    <!-- 纠错 新-->
+    <el-dialog title="纠错" :visible.sync="open_jc" width="90%" append-to-body top="10px !important">
+      <div style="height: 86vh;">
+        <el-form ref="form" :model="form" :rules="rules">
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-carousel height="calc(86vh - 100px)" v-if="form.pictures" :autoplay="false">
+                <el-carousel-item v-for="item in form.pictures.split(',')" :key="item">
+                  <div class="jc_sb_img" style="height:100%; overflow:auto; text-align:center; font-size:0">
+                    <el-image style="height:100%;" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
+                  </div>
+                </el-carousel-item>
+              </el-carousel>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="申请人姓名" prop="name" label-width="90px">
+                <el-input v-model="form.name" placeholder="请输入申请人姓名" />
+              </el-form-item>
+              <el-form-item label="姓名1" prop="name1" label-width="90px">
+                <el-input v-model="form.name1" placeholder="请输入姓名1" />
+              </el-form-item>
+              <el-form-item label="姓名2" prop="name2" label-width="90px">
+                <el-input v-model="form.name2" placeholder="请输入姓名2" />
+              </el-form-item>
+              <el-form-item label="姓名3" prop="name3" label-width="90px">
+                <el-input v-model="form.name3" placeholder="请输入姓名3" />
+              </el-form-item>
+              <el-form-item label="姓名4" prop="name4" label-width="90px">
+                <el-input v-model="form.name4" placeholder="请输入姓名4" />
+              </el-form-item>
+              <el-form-item label="姓名5" prop="name5" label-width="90px">
+                <el-input v-model="form.name5" placeholder="请输入姓名5" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer" style="text-align:right; margin-top: 30px;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </div>
     </el-dialog>
 
-    <!--    新增手动识别-->
-    <el-dialog title="新增手动识别" :visible.sync="open_add" width="1200px" 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">
 
@@ -520,6 +565,65 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
 
+    </el-dialog>-->
+
+    <!--    新增手动识别   新-->
+    <el-dialog title="新增手动识别" :visible.sync="open_add" width="90%" append-to-body top="10px !important">
+      <div style="height: 86vh;">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="档案目录路径" prop="muPath">
+                <el-input readonly  placeholder="档案目录路径" v-model="form.muPath">
+                  <el-button slot="append" icon="el-icon-search" @click="muIdChange"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-button type="primary" @click="selectDaRecard" style="margin-left: 10px;">选择档案记录</el-button>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20" v-if="shiBieList&&shiBieList.length>0">
+            <el-col :span="12">
+              <el-carousel height="calc(86vh - 100px)" :autoplay="false">
+                <el-carousel-item v-for="item in shiBieList" :key="item.id">
+                  <div class="jc_sb_img" style="height:100%; overflow:auto; text-align:center; font-size:0">
+                    <el-image style="height:100%;" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
+                  </div>
+                </el-carousel-item>
+              </el-carousel>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="申请人姓名" prop="name" label-width="90px">
+                <el-input v-model="form.name" placeholder="请输入申请人姓名" />
+              </el-form-item>
+              <el-form-item label="姓名1" prop="name1" label-width="90px">
+                <el-input v-model="form.name1" placeholder="请输入姓名1" />
+              </el-form-item>
+              <el-form-item label="姓名2" prop="name2" label-width="90px">
+                <el-input v-model="form.name2" placeholder="请输入姓名2" />
+              </el-form-item>
+              <el-form-item label="姓名3" prop="name3" label-width="90px">
+                <el-input v-model="form.name3" placeholder="请输入姓名3" />
+              </el-form-item>
+              <el-form-item label="姓名4" prop="name4" label-width="90px">
+                <el-input v-model="form.name4" placeholder="请输入姓名4" />
+              </el-form-item>
+              <el-form-item label="姓名5" prop="name5" label-width="90px">
+                <el-input v-model="form.name5" placeholder="请输入姓名5" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+        </el-form>
+
+        <div slot="footer" class="dialog-footer" style="text-align:right; margin-top: 30px;">
+          <el-button type="primary" @click="addSubmitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </div>
     </el-dialog>
 
     <!-- 审核对话框 -->
diff --git a/dangan-ui/src/views/dangan/zqz/index.vue b/dangan-ui/src/views/dangan/zqz/index.vue
index dddc5af..8f684c6 100644
--- a/dangan-ui/src/views/dangan/zqz/index.vue
+++ b/dangan-ui/src/views/dangan/zqz/index.vue
@@ -9,14 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="编号" prop="num">
+<!--      <el-form-item label="编号" prop="num">
         <el-input
           v-model="queryParams.num"
           placeholder="请输入编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="申请人姓名" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -120,37 +120,37 @@
     <el-table v-loading="loading" :data="zqzList" border>
       <el-table-column label="档案目录路径" align="center" fixed prop="muPath" min-width="150" show-overflow-tooltip/>
       <el-table-column label="任务ID" align="center" prop="taskId"  min-width="100" show-overflow-tooltip fixed/>
-      <el-table-column label="编号" align="center" prop="num" min-width="100" show-overflow-tooltip/>
+<!--      <el-table-column label="编号" align="center" prop="num" min-width="100" show-overflow-tooltip/>-->
       <el-table-column label="申请人姓名" align="center" prop="name" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="身份证号" align="center" prop="cardId" min-width="120" show-overflow-tooltip/>
-      <el-table-column label="住址或单位" align="center" prop="address" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="户口登记机关" align="center" prop="djJg" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="与申请人关系1" align="center" prop="relation1" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="身份证号" align="center" prop="cardId" min-width="180" show-overflow-tooltip/>
+<!--      <el-table-column label="住址或单位" align="center" prop="address" min-width="100" show-overflow-tooltip/>-->
+<!--      <el-table-column label="户口登记机关" align="center" prop="djJg" min-width="100" show-overflow-tooltip/>-->
+<!--      <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/>
-      <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="性别1" align="center" prop="sex1" min-width="100" show-overflow-tooltip/>-->
+      <el-table-column label="出生日期1" align="center" prop="birthDate1" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="身份证号1" align="center" prop="cardId1" min-width="180" 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/>
-      <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="性别2" align="center" prop="sex2" min-width="100" show-overflow-tooltip/>-->
+      <el-table-column label="出生日期2" align="center" prop="birthDate2" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="身份证号2" align="center" prop="cardId2" min-width="180" 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/>
-      <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="性别3" align="center" prop="sex3" min-width="100" show-overflow-tooltip/>-->
+      <el-table-column label="出生日期3" align="center" prop="birthDate3" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="身份证号3" align="center" prop="cardId3" min-width="180" 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/>
-      <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="120" 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/>
+<!--      <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="180" show-overflow-tooltip/>
+      <el-table-column label="身份证号4" align="center" prop="cardId4" min-width="180" 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="120" 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/>-->
       <el-table-column label="识别图片" align="center" prop="pictures">
         <template slot-scope="scope">
           <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
@@ -178,7 +178,7 @@
         </template>
       </el-table-column>
       <el-table-column label="审核原由" align="center" prop="auditReason" min-width="140" show-overflow-tooltip/>
-      <el-table-column label="备注" align="center" prop="remark" min-width="140" show-overflow-tooltip/>
+<!--      <el-table-column label="备注" align="center" prop="remark" min-width="140" show-overflow-tooltip/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" fixed="right">
         <template slot-scope="scope">
           <el-button
@@ -213,8 +213,8 @@
       @pagination="getList"
     />
 
-    <!-- 纠错 -->
-    <el-dialog title="纠错" :visible.sync="open_jc" width="1200px" append-to-body>
+    <!-- 纠错 原-->
+<!--    <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="10">
@@ -397,9 +397,77 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>-->
+
+    <!-- 纠错 新-->
+    <el-dialog title="纠错" :visible.sync="open_jc" width="90%" append-to-body top="10px !important">
+      <div style="height: 86vh;">
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-carousel height="calc(86vh - 100px)" v-if="form.pictures" :autoplay="false">
+                <el-carousel-item v-for="item in form.pictures.split(',')" :key="item">
+                  <div class="jc_sb_img" style="height:100%; overflow:auto; text-align:center; font-size:0">
+                    <el-image style="height:100%;" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
+                  </div>
+                </el-carousel-item>
+              </el-carousel>
+            </el-col>
+            <el-col :span="12" class="jc_sb">
+              <el-form-item label="申请人姓名" prop="name" label-width="90px">
+                <el-input v-model="form.name" placeholder="请输入申请人姓名" />
+              </el-form-item>
+              <el-form-item label="身份证号" prop="cardId" label-width="90px">
+                <el-input v-model="form.cardId" placeholder="请输入身份证号" />
+              </el-form-item>
+              <el-form-item label="姓名1" prop="name1" label-width="90px">
+                <el-input v-model="form.name1" placeholder="请输入姓名1" />
+              </el-form-item>
+              <el-form-item label="出生日期1" prop="birthDate1" label-width="90px">
+                <el-input v-model="form.birthDate1" placeholder="请输入出生日期1" />
+              </el-form-item>
+              <el-form-item label="身份证号1" prop="cardId1" label-width="90px">
+                <el-input v-model="form.cardId1" placeholder="请输入身份证号1" />
+              </el-form-item>
+              <el-form-item label="姓名2" prop="name2" label-width="90px">
+                <el-input v-model="form.name2" placeholder="请输入姓名2" />
+              </el-form-item>
+              <el-form-item label="出生日期2" prop="birthDate2" label-width="90px">
+                <el-input v-model="form.birthDate2" placeholder="请输入出生日期2" />
+              </el-form-item>
+              <el-form-item label="身份证号2" prop="cardId2" label-width="90px">
+                <el-input v-model="form.cardId2" placeholder="请输入身份证号2" />
+              </el-form-item>
+              <el-form-item label="姓名3" prop="name3" label-width="90px">
+                <el-input v-model="form.name3" placeholder="请输入姓名3" />
+              </el-form-item>
+              <el-form-item label="出生日期3" prop="birthDate3" label-width="90px">
+                <el-input v-model="form.birthDate3" placeholder="请输入出生日期3" />
+              </el-form-item>
+              <el-form-item label="身份证号3" prop="cardId3" label-width="90px">
+                <el-input v-model="form.cardId3" placeholder="请输入身份证号3" />
+              </el-form-item>
+              <el-form-item label="姓名4" prop="name4" label-width="90px">
+                <el-input v-model="form.name4" placeholder="请输入姓名4" />
+              </el-form-item>
+              <el-form-item label="出生日期4" prop="birthDate4" label-width="90px">
+                <el-input v-model="form.birthDate4" placeholder="请输入出生日期4" />
+              </el-form-item>
+              <el-form-item label="身份证号4" prop="cardId4" label-width="90px">
+                <el-input v-model="form.cardId4" placeholder="请输入身份证号4" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer" style="text-align:right; margin-top: 30px;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </div>
     </el-dialog>
 
-    <!--    新增手动识别-->
+    <!--    新增手动识别 原-->
+<!--
     <el-dialog title="新增手动识别" :visible.sync="open_add" width="1200px" append-to-body>
 
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -602,6 +670,86 @@
       </div>
 
     </el-dialog>
+-->
+
+    <!--    新增手动识别 新-->
+    <el-dialog title="新增手动识别" :visible.sync="open_add" width="90%" append-to-body top="10px !important">
+      <div style="height: 86vh;">
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="档案目录路径" prop="muPath" label-width="110px">
+                <el-input readonly  placeholder="请选择档案目录路径" v-model="form.muPath">
+                  <el-button slot="append" icon="el-icon-search" @click="muIdChange"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-button type="primary" @click="selectDaRecard" style="margin-left: 10px;">选择档案记录</el-button>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" v-if="shiBieList&&shiBieList.length>0">
+            <el-col :span="12">
+              <el-carousel height="calc(86vh - 100px)" :autoplay="false">
+                <el-carousel-item v-for="item in shiBieList" :key="item.id">
+                  <div class="jc_sb_img" style="height:100%; overflow:auto; text-align:center; font-size:0">
+                    <el-image style="height:100%;" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
+                  </div>
+                </el-carousel-item>
+              </el-carousel>
+            </el-col>
+            <el-col :span="12" class="jc_sb">
+              <el-form-item label="申请人姓名" prop="name" label-width="90px">
+                <el-input v-model="form.name" placeholder="请输入申请人姓名" />
+              </el-form-item>
+              <el-form-item label="身份证号" prop="cardId" label-width="90px">
+                <el-input v-model="form.cardId" placeholder="请输入身份证号" />
+              </el-form-item>
+              <el-form-item label="姓名1" prop="name1" label-width="90px">
+                <el-input v-model="form.name1" placeholder="请输入姓名1" />
+              </el-form-item>
+              <el-form-item label="出生日期1" prop="birthDate1" label-width="90px">
+                <el-input v-model="form.birthDate1" placeholder="请输入出生日期1" />
+              </el-form-item>
+              <el-form-item label="身份证号1" prop="cardId1" label-width="90px">
+                <el-input v-model="form.cardId1" placeholder="请输入身份证号1" />
+              </el-form-item>
+              <el-form-item label="姓名2" prop="name2" label-width="90px">
+                <el-input v-model="form.name2" placeholder="请输入姓名2" />
+              </el-form-item>
+              <el-form-item label="出生日期2" prop="birthDate2" label-width="90px">
+                <el-input v-model="form.birthDate2" placeholder="请输入出生日期2" />
+              </el-form-item>
+              <el-form-item label="身份证号2" prop="cardId2" label-width="90px">
+                <el-input v-model="form.cardId2" placeholder="请输入身份证号2" />
+              </el-form-item>
+              <el-form-item label="姓名3" prop="name3" label-width="90px">
+                <el-input v-model="form.name3" placeholder="请输入姓名3" />
+              </el-form-item>
+              <el-form-item label="出生日期3" prop="birthDate3" label-width="90px">
+                <el-input v-model="form.birthDate3" placeholder="请输入出生日期3" />
+              </el-form-item>
+              <el-form-item label="身份证号3" prop="cardId3" label-width="90px">
+                <el-input v-model="form.cardId3" placeholder="请输入身份证号3" />
+              </el-form-item>
+              <el-form-item label="姓名4" prop="name4" label-width="90px">
+                <el-input v-model="form.name4" placeholder="请输入姓名4" />
+              </el-form-item>
+              <el-form-item label="出生日期4" prop="birthDate4" label-width="90px">
+                <el-input v-model="form.birthDate4" placeholder="请输入出生日期4" />
+              </el-form-item>
+              <el-form-item label="身份证号4" prop="cardId4" label-width="90px">
+                <el-input v-model="form.cardId4" placeholder="请输入身份证号4" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer" style="text-align:right; margin-top: 30px;">
+          <el-button type="primary" @click="addSubmitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </div>
+    </el-dialog>
 
     <!-- 审核对话框 -->
     <el-dialog title="审核" :visible.sync="shenHe.open" width="500px" append-to-body>