diff --git a/dangan-ui/src/views/dangan/czrkdj/index.vue b/dangan-ui/src/views/dangan/czrkdj/index.vue
index b9bd997..242fdf9 100644
--- a/dangan-ui/src/views/dangan/czrkdj/index.vue
+++ b/dangan-ui/src/views/dangan/czrkdj/index.vue
@@ -1,6 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="与户主关系" prop="relation">
+        <el-input
+          v-model="queryParams.relation"
+          placeholder="请输入与户主关系"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -9,6 +17,158 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+<!--      <el-form-item label="别名" prop="otherName">
+        <el-input
+          v-model="queryParams.otherName"
+          placeholder="请输入别名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="出生日期" prop="birthday">
+        <el-date-picker clearable
+                        v-model="queryParams.birthday"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择出生日期">
+        </el-date-picker>
+      </el-form-item>
+<!--      <el-form-item label="出生地址" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="请输入出生地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="原籍" prop="yj">
+        <el-input
+          v-model="queryParams.yj"
+          placeholder="请输入原籍"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <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="zjxy">
+        <el-input
+          v-model="queryParams.zjxy"
+          placeholder="请输入宗教信仰"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="文化程度" prop="whcd">
+        <el-input
+          v-model="queryParams.whcd"
+          placeholder="请输入文化程度"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="婚姻状况" prop="hyzk">
+        <el-input
+          v-model="queryParams.hyzk"
+          placeholder="请输入婚姻状况"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+<!--      <el-form-item label="职业及服务处所" prop="zyjfwcs">
+        <el-input
+          v-model="queryParams.zyjfwcs"
+          placeholder="请输入职业及服务处所"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="本县(市)其他住址" prop="bxsqtzz">
+        <el-input
+          v-model="queryParams.bxsqtzz"
+          placeholder="请输入本县(市)其他住址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="公民证代号号码签发机关及日期" prop="gmzdhhmqfjgjrq">
+        <el-input
+          v-model="queryParams.gmzdhhmqfjgjrq"
+          placeholder="请输入公民证代号号码签发机关及日期"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="何时由何地迁来本县市何时登记户口" prop="hsyhdqlbxshsdjhk">
+        <el-input
+          v-model="queryParams.hsyhdqlbxshsdjhk"
+          placeholder="请输入何时由何地迁来本县市何时登记户口"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="何时由本县、市何处迁来何时登记户口" prop="hsybxshcqlhsdjhk">
+        <el-input
+          v-model="queryParams.hsybxshcqlhsdjhk"
+          placeholder="请输入何时由本县、市何处迁来何时登记户口"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+<!--      <el-form-item label="注销户口日期" prop="zxhkrq">
+        <el-input
+          v-model="queryParams.zxhkrq"
+          placeholder="请输入注销户口日期"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="注销户口原因" prop="zxhkyy">
+        <el-input
+          v-model="queryParams.zxhkyy"
+          placeholder="请输入注销户口原因"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+<!--      <el-form-item label="户口登记事项变更记载内容、时间及办理人章_1" prop="hkdjsxbgjznrsjjblrz1">
+        <el-input
+          v-model="queryParams.hkdjsxbgjznrsjjblrz1"
+          placeholder="请输入户口登记事项变更记载内容、时间及办理人章_1"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="户口登记事项变更记载内容、时间及办理人章_2" prop="hkdjsxbgjznrsjjblrz2">
+        <el-input
+          v-model="queryParams.hkdjsxbgjznrsjjblrz2"
+          placeholder="请输入户口登记事项变更记载内容、时间及办理人章_2"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+<!--      <el-form-item label="籍贯" prop="jiguan">
+        <el-input
+          v-model="queryParams.jiguan"
+          placeholder="请输入籍贯"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="现住址" prop="xzz">
+        <el-input
+          v-model="queryParams.xzz"
+          placeholder="请输入现住址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
       <el-form-item label="户主姓名" prop="hzName">
         <el-input
           v-model="queryParams.hzName"
@@ -17,26 +177,82 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="与户主关系" prop="relation">
+<!--      <el-form-item label="户别" prop="hb">
         <el-input
-          v-model="queryParams.relation"
-          placeholder="请输入与户主关系"
+          v-model="queryParams.hb"
+          placeholder="请输入户别"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="出生日期" prop="birthday">
-        <el-date-picker clearable
-          v-model="queryParams.birthday"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择出生日期">
-        </el-date-picker>
+      <el-form-item label="登记日期" prop="djrq">
+        <el-input
+          v-model="queryParams.djrq"
+          placeholder="请输入登记日期"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-      <el-form-item label="籍贯" prop="jiguan">
+      <el-form-item label="兵役状况" prop="byzk">
         <el-input
-          v-model="queryParams.jiguan"
-          placeholder="请输入籍贯"
+          v-model="queryParams.byzk"
+          placeholder="请输入兵役状况"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="身高" prop="height">
+        <el-input
+          v-model="queryParams.height"
+          placeholder="请输入身高"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="血型" prop="blood">
+        <el-input
+          v-model="queryParams.blood"
+          placeholder="请输入血型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="职业" prop="zy">
+        <el-input
+          v-model="queryParams.zy"
+          placeholder="请输入职业"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申领居民身份证原因" prop="slReason">
+        <el-input
+          v-model="queryParams.slReason"
+          placeholder="请输入申领居民身份证原因"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申领居民身份证签名" prop="sljmsfzqm">
+        <el-input
+          v-model="queryParams.sljmsfzqm"
+          placeholder="请输入申领居民身份证签名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="签发意见" prop="qfyj">
+        <el-input
+          v-model="queryParams.qfyj"
+          placeholder="请输入签发意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="有效日期" prop="yxrq">
+        <el-input
+          v-model="queryParams.yxrq"
+          placeholder="请输入有效日期"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -100,18 +316,55 @@
     </el-row>
 
     <el-table v-loading="loading" :data="czrkdjList" border>
-      <el-table-column label="档案目录ID" align="center" prop="muId" min-width="80" fixed/>
+      <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>
       <el-table-column label="姓名" align="center" prop="name" fixed 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="otherName" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
       <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="地址" align="center" prop="address" min-width="140" show-overflow-tooltip/>
-      <el-table-column label="籍贯" align="center" prop="jiguan" min-width="140" show-overflow-tooltip/>
-      <el-table-column label="身份证号" align="center" prop="cardId" 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="jiguan" min-width="100" show-overflow-tooltip />
+      <el-table-column label="现住址" align="center" prop="xzz" 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="djrq" min-width="100" 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="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="100" show-overflow-tooltip />
+      <el-table-column label="身份证号" align="center" prop="cardId" 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"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="相关图片" align="center" prop="allPics" >
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.allPics" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
       <el-table-column label="是否纠错" align="center" prop="errorCorrect" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.error_correct" :value="scope.row.errorCorrect"/>
@@ -128,18 +381,8 @@
         </template>
       </el-table-column>
       <el-table-column label="审核原因" align="center" prop="auditReason" />
-      <el-table-column label="识别图片" align="center" prop="pictures" >
-        <template slot-scope="scope">
-          <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="相关图片" align="center" prop="allPics" >
-        <template slot-scope="scope">
-          <image-preview :src="scope.row.allPics" :width="50" :height="50"/>
-        </template>
-      </el-table-column>
       <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" min-width="160">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="160">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -175,47 +418,208 @@
 
     <!-- 添加或修改常住人口登记对话框 -->
     <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="12">
-            <el-carousel height="600px" v-if="form.pictures" :autoplay="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row :gutter="10" class="jc_sb">
+          <el-col :span="10">
+            <el-carousel height="900px" v-if="form.pictures" :autoplay="false">
               <el-carousel-item v-for="item in form.pictures.split(',')" :key="item">
-                <div style="height: 600px; overflow: auto">
-                  <el-image style="height:850px; width: 100%" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
+                <div style="height: 900px; overflow: auto">
+                  <el-image style="width:650px" :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">
-              <el-input v-model="form.name" placeholder="请输入姓名" />
-            </el-form-item>
-            <el-form-item label="户主姓名" prop="hzName">
-              <el-input v-model="form.hzName" placeholder="请输入户主姓名" />
-            </el-form-item>
-            <el-form-item label="与户主关系" prop="relation">
-              <el-input v-model="form.relation" placeholder="请输入与户主关系" />
-            </el-form-item>
-            <el-form-item label="出生日期" prop="birthday">
-              <el-date-picker clearable style="width:100%;"
-                              v-model="form.birthday"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="请选择出生日期">
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入地址" />
-            </el-form-item>
-            <el-form-item label="籍贯" prop="jiguan">
-              <el-input v-model="form.jiguan" placeholder="请输入籍贯" />
-            </el-form-item>
-            <el-form-item label="身份证号" prop="cardId">
-              <el-input v-model="form.cardId" placeholder="请输入身份证号" />
-            </el-form-item>
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
+          <el-col :span="14">
+            <el-row :gutter="10">
+              <el-col :span="12">
+                <el-form-item label="姓名" prop="name">
+                  <el-input v-model="form.name" placeholder="请输入姓名" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="与户主关系" prop="relation" label-width="90px">
+                  <el-input v-model="form.relation" placeholder="请输入与户主关系" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="别名" prop="otherName">
+                  <el-input v-model="form.otherName" placeholder="请输入别名" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="出生日期" prop="birthday">
+                  <el-date-picker clearable style="width:100%;"
+                                  v-model="form.birthday"
+                                  type="date"
+                                  value-format="yyyy-MM-dd"
+                                  placeholder="请选择出生日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="出生地址" prop="address">
+                  <el-input v-model="form.address" placeholder="请输入出生地址" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="原籍" prop="yj">
+                  <el-input v-model="form.yj" placeholder="请输入原籍" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="民族" prop="nation">
+                  <el-input v-model="form.nation" placeholder="请输入民族" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="宗教信仰" prop="zjxy">
+                  <el-input v-model="form.zjxy" placeholder="请输入宗教信仰" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="文化程度" prop="whcd">
+                  <el-input v-model="form.whcd" placeholder="请输入文化程度" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="婚姻状况" prop="hyzk">
+                  <el-input v-model="form.hyzk" placeholder="请输入婚姻状况" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="120px">
+                  <el-input v-model="form.zyjfwcs" placeholder="请输入职业及服务处所" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="本县(市)其他住址" prop="bxsqtzz" label-width="120px">
+                  <el-input v-model="form.bxsqtzz" placeholder="请输入本县(市)其他住址" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10">
+              <el-col :span="24">
+                <el-form-item label="公民证代号号码签发机关及日期" prop="gmzdhhmqfjgjrq" label-width="220px">
+                  <el-input v-model="form.gmzdhhmqfjgjrq" placeholder="请输入公民证代号号码签发机关及日期" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10">
+              <el-col :span="24">
+                <el-form-item label="何时由何地迁来本县市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="250px">
+                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县市何时登记户口" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="何时由本县、市何处迁来何时登记户口" prop="hsybxshcqlhsdjhk" label-width="260px">
+                  <el-input v-model="form.hsybxshcqlhsdjhk" placeholder="请输入何时由本县、市何处迁来何时登记户口" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10">
+              <el-col :span="12">
+                <el-form-item label="注销户口日期" prop="zxhkrq" label-width="100px">
+                  <el-input v-model="form.zxhkrq" placeholder="请输入注销户口日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="注销户口原因" prop="zxhkyy" label-width="100px">
+                  <el-input v-model="form.zxhkyy" placeholder="请输入注销户口原因" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10">
+              <el-col :span="24">
+                <el-form-item label="户口登记事项变更记载内容、时间及办理人章_1" prop="hkdjsxbgjznrsjjblrz1" label-width="310px">
+                  <el-input v-model="form.hkdjsxbgjznrsjjblrz1" placeholder="请输入户口登记事项变更记载内容、时间及办理人章_1" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="户口登记事项变更记载内容、时间及办理人章_2" prop="hkdjsxbgjznrsjjblrz2" label-width="310px">
+                  <el-input v-model="form.hkdjsxbgjznrsjjblrz2" placeholder="请输入户口登记事项变更记载内容、时间及办理人章_2" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10">
+              <el-col :span="12">
+                <el-form-item label="籍贯" prop="jiguan">
+                  <el-input v-model="form.jiguan" placeholder="请输入籍贯" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="现住址" prop="xzz">
+                  <el-input v-model="form.xzz" placeholder="请输入现住址" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="户主姓名" prop="hzName">
+                  <el-input v-model="form.hzName" placeholder="请输入户主姓名" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="户别" prop="hb">
+                  <el-input v-model="form.hb" placeholder="请输入户别" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="登记日期" prop="djrq">
+                  <el-input v-model="form.djrq" placeholder="请输入登记日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="兵役状况" prop="byzk">
+                  <el-input v-model="form.byzk" placeholder="请输入兵役状况" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="身高" prop="height">
+                  <el-input v-model="form.height" placeholder="请输入身高" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="血型" prop="blood">
+                  <el-input v-model="form.blood" placeholder="请输入血型" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="职业" prop="zy" label-width="50px">
+                  <el-input v-model="form.zy" placeholder="请输入职业" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="14">
+                <el-form-item label="申领居民身份证原因" prop="slReason" label-width="140px">
+                  <el-input v-model="form.slReason" placeholder="请输入申领居民身份证原因" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申领居民身份证签名" prop="sljmsfzqm" label-width="140px">
+                  <el-input v-model="form.sljmsfzqm" placeholder="请输入申领居民身份证签名" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="签发意见" prop="qfyj">
+                  <el-input v-model="form.qfyj" placeholder="请输入签发意见" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="有效日期" prop="yxrq">
+                  <el-input v-model="form.yxrq" placeholder="请输入有效日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="身份证号" prop="cardId">
+                  <el-input v-model="form.cardId" placeholder="请输入身份证号" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10">
+              <el-col :span="24">
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
           </el-col>
         </el-row>
 
@@ -254,45 +658,205 @@
         </el-row>
 
         <el-row :gutter="20" v-if="shiBieList&&shiBieList.length>0">
-          <el-col :span="12">
-            <el-carousel height="600px" :autoplay="false">
+          <el-col :span="10">
+            <el-carousel height="900px" :autoplay="false">
               <el-carousel-item v-for="item in shiBieList" :key="item.id">
-                <div style="height: 600px; overflow: auto">
-                  <el-image style="height:850px; width: 100%" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
+                <div style="height: 900px; overflow: auto">
+                  <el-image style="width:650px" :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">
-              <el-input v-model="form.name" placeholder="请输入姓名" />
-            </el-form-item>
-            <el-form-item label="户主姓名" prop="hzName">
-              <el-input v-model="form.hzName" placeholder="请输入户主姓名" />
-            </el-form-item>
-            <el-form-item label="与户主关系" prop="relation">
-              <el-input v-model="form.relation" placeholder="请输入与户主关系" />
-            </el-form-item>
-            <el-form-item label="出生日期" prop="birthday">
-              <el-date-picker clearable style="width:100%;"
-                              v-model="form.birthday"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="请选择出生日期">
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入地址" />
-            </el-form-item>
-            <el-form-item label="籍贯" prop="jiguan">
-              <el-input v-model="form.jiguan" placeholder="请输入籍贯" />
-            </el-form-item>
-            <el-form-item label="身份证号" prop="cardId">
-              <el-input v-model="form.cardId" placeholder="请输入身份证号" />
-            </el-form-item>
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
+          <el-col :span="14" class="jc_sb">
+            <el-row :gutter="10">
+              <el-col :span="12">
+                <el-form-item label="姓名" prop="name">
+                  <el-input v-model="form.name" placeholder="请输入姓名" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="与户主关系" prop="relation" label-width="90px">
+                  <el-input v-model="form.relation" placeholder="请输入与户主关系" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="别名" prop="otherName">
+                  <el-input v-model="form.otherName" placeholder="请输入别名" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="出生日期" prop="birthday">
+                  <el-date-picker clearable style="width:100%;"
+                                  v-model="form.birthday"
+                                  type="date"
+                                  value-format="yyyy-MM-dd"
+                                  placeholder="请选择出生日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="出生地址" prop="address">
+                  <el-input v-model="form.address" placeholder="请输入出生地址" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="原籍" prop="yj">
+                  <el-input v-model="form.yj" placeholder="请输入原籍" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="民族" prop="nation">
+                  <el-input v-model="form.nation" placeholder="请输入民族" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="宗教信仰" prop="zjxy">
+                  <el-input v-model="form.zjxy" placeholder="请输入宗教信仰" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="文化程度" prop="whcd">
+                  <el-input v-model="form.whcd" placeholder="请输入文化程度" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="婚姻状况" prop="hyzk">
+                  <el-input v-model="form.hyzk" placeholder="请输入婚姻状况" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="120px">
+                  <el-input v-model="form.zyjfwcs" placeholder="请输入职业及服务处所" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="本县(市)其他住址" prop="bxsqtzz" label-width="120px">
+                  <el-input v-model="form.bxsqtzz" placeholder="请输入本县(市)其他住址" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10">
+              <el-col :span="24">
+                <el-form-item label="公民证代号号码签发机关及日期" prop="gmzdhhmqfjgjrq" label-width="220px">
+                  <el-input v-model="form.gmzdhhmqfjgjrq" placeholder="请输入公民证代号号码签发机关及日期" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10">
+              <el-col :span="24">
+                <el-form-item label="何时由何地迁来本县市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="250px">
+                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县市何时登记户口" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="何时由本县、市何处迁来何时登记户口" prop="hsybxshcqlhsdjhk" label-width="260px">
+                  <el-input v-model="form.hsybxshcqlhsdjhk" placeholder="请输入何时由本县、市何处迁来何时登记户口" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10">
+              <el-col :span="12">
+                <el-form-item label="注销户口日期" prop="zxhkrq" label-width="100px">
+                  <el-input v-model="form.zxhkrq" placeholder="请输入注销户口日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="注销户口原因" prop="zxhkyy" label-width="100px">
+                  <el-input v-model="form.zxhkyy" placeholder="请输入注销户口原因" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10">
+              <el-col :span="24">
+                <el-form-item label="户口登记事项变更记载内容、时间及办理人章_1" prop="hkdjsxbgjznrsjjblrz1" label-width="310px">
+                  <el-input v-model="form.hkdjsxbgjznrsjjblrz1" placeholder="请输入户口登记事项变更记载内容、时间及办理人章_1" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="户口登记事项变更记载内容、时间及办理人章_2" prop="hkdjsxbgjznrsjjblrz2" label-width="310px">
+                  <el-input v-model="form.hkdjsxbgjznrsjjblrz2" placeholder="请输入户口登记事项变更记载内容、时间及办理人章_2" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10">
+              <el-col :span="12">
+                <el-form-item label="籍贯" prop="jiguan">
+                  <el-input v-model="form.jiguan" placeholder="请输入籍贯" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="现住址" prop="xzz">
+                  <el-input v-model="form.xzz" placeholder="请输入现住址" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="户主姓名" prop="hzName">
+                  <el-input v-model="form.hzName" placeholder="请输入户主姓名" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="户别" prop="hb">
+                  <el-input v-model="form.hb" placeholder="请输入户别" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="登记日期" prop="djrq">
+                  <el-input v-model="form.djrq" placeholder="请输入登记日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="兵役状况" prop="byzk">
+                  <el-input v-model="form.byzk" placeholder="请输入兵役状况" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="身高" prop="height">
+                  <el-input v-model="form.height" placeholder="请输入身高" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="血型" prop="blood">
+                  <el-input v-model="form.blood" placeholder="请输入血型" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="职业" prop="zy" label-width="50px">
+                  <el-input v-model="form.zy" placeholder="请输入职业" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="14">
+                <el-form-item label="申领居民身份证原因" prop="slReason" label-width="140px">
+                  <el-input v-model="form.slReason" placeholder="请输入申领居民身份证原因" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申领居民身份证签名" prop="sljmsfzqm" label-width="140px">
+                  <el-input v-model="form.sljmsfzqm" placeholder="请输入申领居民身份证签名" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="签发意见" prop="qfyj">
+                  <el-input v-model="form.qfyj" placeholder="请输入签发意见" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="有效日期" prop="yxrq">
+                  <el-input v-model="form.yxrq" placeholder="请输入有效日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="身份证号" prop="cardId">
+                  <el-input v-model="form.cardId" placeholder="请输入身份证号" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10">
+              <el-col :span="24">
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-col>
         </el-row>
 
@@ -371,9 +935,9 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dalsInfo.loading" :data="dalsInfo.list" border height="500" @selection-change="dalsInfoDblclick">
-        <el-table-column type="selection" width="50" align="center" fixed/>
-        <el-table-column label="档案目录ID" align="center" prop="muId" fixed min-width="50"/>
-        <el-table-column label="档案目录路径" align="center" prop="muPath" fixed min-width="100" show-overflow-tooltip/>
+        <el-table-column type="selection" width="50" align="center" />
+        <el-table-column label="档案目录ID" align="center" prop="muId"  min-width="50"/>
+        <el-table-column label="档案目录路径" align="center" prop="muPath"  min-width="100" show-overflow-tooltip/>
         <el-table-column label="物理书架路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
         <el-table-column label="是否已经识别" align="center" prop="recognize" >
           <template slot-scope="scope">
@@ -463,16 +1027,51 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        ywType: null,
         muId: null,
-        name: null,
-        hzName: null,
         relation: null,
+        name: null,
+        otherName: null,
+        sex: null,
         birthday: null,
         address: null,
+        yj: null,
+        nation: null,
+        zjxy: null,
+        whcd: null,
+        hyzk: null,
+        zyjfwcs: null,
+        bxsqtzz: null,
+        gmzdhhmqfjgjrq: null,
+        hsyhdqlbxshsdjhk: null,
+        hsybxshcqlhsdjhk: null,
+        zxhkrq: null,
+        zxhkyy: null,
+        hkdjsxbgjznrsjjblrz1: null,
+        hkdjsxbgjznrsjjblrz2: null,
         jiguan: null,
+        xzz: null,
+        hzName: null,
+        hb: null,
+        djrq: null,
+        byzk: null,
+        height: null,
+        blood: null,
+        zy: null,
+        slReason: null,
+        sljmsfzqm: null,
+        qfyj: null,
+        yxrq: null,
         cardId: null,
+        picIds: null,
+        pictures: null,
+        allPicIds: null,
+        allPics: null,
         errorCorrect: null,
         auditStatus: null,
+        auditName: null,
+        auditResult: null,
+        auditReason: null,
       },
       // 表单参数
       form: {},
@@ -485,10 +1084,7 @@ export default {
         ],
         muId: [
           { required: true, message: "目录ID不能为空", trigger: "blur" }
-        ],
-        name: [
-          { required: true, message: "姓名不能为空", trigger: "blur" }
-        ],
+        ]
       },
       // 审核
       shenHe:{
@@ -567,22 +1163,56 @@ export default {
     reset() {
       this.form = {
         id: null,
+        ywType: null,
         muId: null,
-        name: null,
-        hzName: null,
         relation: null,
+        name: null,
+        otherName: null,
+        sex: null,
         birthday: null,
         address: null,
+        yj: null,
+        nation: null,
+        zjxy: null,
+        whcd: null,
+        hyzk: null,
+        zyjfwcs: null,
+        bxsqtzz: null,
+        gmzdhhmqfjgjrq: null,
+        hsyhdqlbxshsdjhk: null,
+        hsybxshcqlhsdjhk: null,
+        zxhkrq: null,
+        zxhkyy: null,
+        hkdjsxbgjznrsjjblrz1: null,
+        hkdjsxbgjznrsjjblrz2: null,
         jiguan: null,
+        xzz: null,
+        hzName: null,
+        hb: null,
+        djrq: null,
+        byzk: null,
+        height: null,
+        blood: null,
+        zy: null,
+        slReason: null,
+        sljmsfzqm: null,
+        qfyj: null,
+        yxrq: null,
         cardId: null,
+        picIds: null,
         pictures: null,
+        allPicIds: null,
+        allPics: null,
+        errorCorrect: null,
+        auditStatus: null,
+        auditName: null,
+        auditResult: null,
+        auditReason: null,
         remark: null,
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null,
-        errorCorrect: null,
-        auditStatus: null,
+        updateTime: null
       };
       this.shiBieList = [];
       this.resetForm("form");
@@ -776,7 +1406,7 @@ export default {
               this.getList();
             });
           }else {
-            this.$alert(`请先点击【选择档案记录】或【直接上传】选择识别图片`, `提示`, {
+            this.$alert(`请先点击【选择档案记录】选择识别图片`, `提示`, {
               type: 'warning'
             });
           }
@@ -791,4 +1421,10 @@ export default {
 .el-carousel__item{
   background-color: #b5c2d2;
 }
+
+.jc_sb{
+  .el-form-item {
+    margin-bottom: 10px;
+  }
+}
 </style>