From 346c064c43e55edb287d2c990e1e14b99ec93321 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Thu, 17 Apr 2025 15:42:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=90=88=E9=9B=86=EF=BC=8C?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E6=A3=80=E7=B4=A2>=E5=B8=B8=E4=BD=8F?=
 =?UTF-8?q?=E4=BA=BA=E5=8F=A3=E7=99=BB=E8=AE=B01=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AD=97=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/czrkdj/index.vue   | 316 +++++++++++++++---
 .../src/views/dangan/retrieval/index.vue      | 131 +++++++-
 dangan-ui/src/views/index.vue                 | 131 +++++++-
 3 files changed, 515 insertions(+), 63 deletions(-)

diff --git a/dangan-ui/src/views/dangan/czrkdj/index.vue b/dangan-ui/src/views/dangan/czrkdj/index.vue
index b93f771..be3c49c 100644
--- a/dangan-ui/src/views/dangan/czrkdj/index.vue
+++ b/dangan-ui/src/views/dangan/czrkdj/index.vue
@@ -111,24 +111,24 @@
           <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="识别图片Ids" align="center" prop="picIds" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-link type="primary" @click="getSiBieList(scope.row.picIds)">{{ scope.row.picIds }}</el-link>
@@ -1321,7 +1321,7 @@
     <el-dialog title="纠错" :visible.sync="jc1.open" width="90%" append-to-body top="10px !important">
       <div style="min-height: 85vh;">
         <el-row :gutter="10" class="jc_sb">
-          <el-col :span="12">
+          <el-col :span="10">
             <el-carousel height="calc(86vh - 100px)" v-if="jc1.pictures" :autoplay="false">
               <el-carousel-item v-for="item in jc1.pictures.split(',')" :key="item">
                 <div class="jc_sb_img" style="height:100%; overflow:auto; text-align:center; font-size:0">
@@ -1330,26 +1330,130 @@
               </el-carousel-item>
             </el-carousel>
           </el-col>
-          <el-col :span="12">
-            <!--常住人口登记表1-->
-            <el-row :gutter="10" v-for="(item1, index1) in jc1.list" :key="item1.id" :style="index1===0?'border-bottom: 1px solid #cacaca; margin-bottom:20px':''">
-              <el-col :span="7" style="height: 70px;">
-                <div>户主或与户主关系:</div><el-input v-model="item1.relation" placeholder="请输入户主或与户主关系" />
-              </el-col>
-              <el-col :span="7" style="height: 70px;">
-                <div>姓名:</div><el-input v-model="item1.name" placeholder="请输入姓名" />
-              </el-col>
-              <el-col :span="7" style="height: 70px;">
-                <div>出生年月日:</div><el-input v-model="item1.birthday" placeholder="请输入出生年月日" />
-              </el-col>
-              <el-col :span="3" style="height: 70px;line-height: 70px;text-align: right">
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="submitForm1(item1)"
-                >纠错确认</el-button>
-              </el-col>
-            </el-row>
+          <el-col :span="14">
+            <el-form ref="form" :model="form" :rules="rules" label-width="100px" style="margin-top: 10px;height: 700px;overflow-y: auto" class="cz1">
+
+              <!--常住人口登记表1-->
+              <el-row :gutter="10" v-for="(item1, index1) in jc1.list" :key="item1.id" :style="index1===0?'border-bottom: 2px solid #5793dd; margin-bottom:20px;background: #eeeeee;margin-bottom: 10px;padding: 10px;border-radius: 10px':'background: #eeeeee;margin-bottom: 10px;padding: 10px;border-radius: 10px'">
+                <!--              <el-col :span="7" style="height: 70px;">
+                                <div>户主或与户主关系:</div><el-input v-model="item1.relation" placeholder="请输入户主或与户主关系" />
+                              </el-col>
+                              <el-col :span="7" style="height: 70px;">
+                                <div>姓名:</div><el-input v-model="item1.name" placeholder="请输入姓名" />
+                              </el-col>
+                              <el-col :span="7" style="height: 70px;">
+                                <div>出生年月日:</div><el-input v-model="item1.birthday" placeholder="请输入出生年月日" />
+                              </el-col>-->
+                <el-col :span="12">
+                  <el-form-item label="户主或与户主关系" label-width="130px">
+                    <el-input v-model="item1.relation" placeholder="请输入户主或与户主关系" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="姓名" label-width="45px">
+                    <el-input v-model="item1.name" placeholder="请输入姓名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="别名" prop="otherName" label-width="45px">
+                    <el-input v-model="item1.otherName" placeholder="请输入别名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="7">
+                  <el-form-item label="性别" prop="sex" label-width="45px">
+                    <el-input v-model="item1.sex" placeholder="请输入性别" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="9">
+                  <el-form-item label="出生年月日" label-width="85px">
+                    <el-input v-model="item1.birthday" placeholder="请输入出生年月日" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="出生地址" prop="address" label-width="75px">
+                    <el-input v-model="item1.address" placeholder="请输入出生地址" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="原籍" prop="yj" label-width="45px">
+                    <el-input v-model="item1.yj" placeholder="请输入原籍" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="民族" prop="nation" label-width="45px">
+                    <el-input v-model="item1.nation" placeholder="请输入民族" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="宗教信仰" prop="zjxy" label-width="75px">
+                    <el-input v-model="item1.zjxy" placeholder="请输入宗教信仰" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="文化程度" prop="whcd" label-width="75px">
+                    <el-input v-model="item1.whcd" placeholder="请输入文化程度" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="婚姻状况" prop="hyzk" label-width="75px">
+                    <el-input v-model="item1.hyzk" placeholder="请输入婚姻状况" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="115px">
+                    <el-input v-model="item1.zyjfwcs" placeholder="请输入职业及服务处所" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="本县(市)其它住址" prop="bxsqtzz" label-width="125px">
+                    <el-input v-model="item1.bxsqtzz" placeholder="请输入本县(市)其它住址" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="公民证代号号码签发机关及日期" prop="gmzdhhmqfjgjrq" label-width="210px">
+                    <el-input v-model="item1.gmzdhhmqfjgjrq" placeholder="请输入公民证代号号码签发机关及日期" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="何时由何地迁来本县、市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="250px">
+                    <el-input v-model="item1.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县、市何时登记户口" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="何时由本县、市何处迁来何时登记户口" prop="hsybxshcqlhsdjhk" label-width="250px">
+                    <el-input v-model="item1.hsybxshcqlhsdjhk" placeholder="请输入何时由本县、市何处迁来何时登记户口" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="注销户口日期" prop="zxhkrq" label-width="100px">
+                    <el-input v-model="item1.zxhkrq" placeholder="请输入注销户口日期" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="注销户口原因" prop="zxhkyy" label-width="100px">
+                    <el-input v-model="item1.zxhkyy" placeholder="请输入注销户口原因" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="户口登记事项变更记载内容、时间及办理人章_1" prop="hkdjsxbgjznrsjjblrz1" label-width="310px">
+                    <el-input v-model="item1.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="item1.hkdjsxbgjznrsjjblrz2" placeholder="请输入户口登记事项变更记载内容、时间及办理人章_2" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24" style="height: 60px;line-height: 60px;text-align: right">
+                  <el-button
+                    type="text"
+                    @click="submitForm1(item1)"
+                  >纠错确认</el-button>
+                </el-col>
+              </el-row>
+
+            </el-form>
+
           </el-col>
         </el-row>
       </div>
@@ -1372,7 +1476,7 @@
             <el-col :span="12">
 
               <!--常住人口登记表1-->
-              <el-row :gutter="10" v-if="form.ywType==='option1'">
+<!--              <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="请输入户主或与户主关系" />
@@ -1388,7 +1492,7 @@
                     <el-input v-model="form.birthday" placeholder="请输入出生年月日" />
                   </el-form-item>
                 </el-col>
-              </el-row>
+              </el-row>-->
 
               <!--常住人口登记表2-->
               <el-row :gutter="10" v-if="form.ywType==='option3'">
@@ -2128,7 +2232,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="20" v-if="shiBieList&&shiBieList.length>0">
-            <el-col :span="12">
+            <el-col :span="10">
               <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">
@@ -2137,7 +2241,7 @@
                 </el-carousel-item>
               </el-carousel>
             </el-col>
-            <el-col :span="12" class="jc_sb">
+            <el-col :span="14" class="jc_sb">
 
               <!--常住人口登记表1-->
               <el-row :gutter="10" v-if="form.ywType==='option1'">
@@ -2150,29 +2254,113 @@
                   @click="addOption1"
                 >添加行</el-button>
                 </el-col>
-                <el-col :span="24" style="margin-top: 10px;">
+                <el-col :span="24" style="margin-top: 10px;height: 680px;overflow-y: auto" class="cz1">
 
-                  <el-row v-for="(item,index) in option1List" :key="index">
+                  <el-row v-for="(item,index) in option1List" :key="index" style="background: #eeeeee;margin-bottom: 10px;padding: 10px;border-radius: 10px">
 
-                    <el-col :span="8">
+                    <el-col :span="1" style="text-align: center">
+                      <i class="el-icon-delete" @click="delOption1(index)" style="color: #ff4949;font-size: 18px;margin-top: 8px"></i>
+                    </el-col>
+                    <el-col :span="12">
                       <el-form-item label="户主或与户主关系" label-width="130px">
                         <el-input v-model="item.relation" placeholder="请输入户主或与户主关系" />
                       </el-form-item>
                     </el-col>
-                    <el-col :span="6">
-                      <el-form-item label="姓名" label-width="60px">
+                    <el-col :span="11">
+                      <el-form-item label="姓名" label-width="45px">
                         <el-input v-model="item.name" placeholder="请输入姓名" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                      <el-form-item label="出生年月日" label-width="100px">
+                      <el-form-item label="别名" prop="otherName" label-width="45px">
+                        <el-input v-model="item.otherName" placeholder="请输入别名" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="7">
+                      <el-form-item label="性别" prop="sex" label-width="45px">
+                        <el-input v-model="item.sex" placeholder="请输入性别" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="9">
+                      <el-form-item label="出生年月日" label-width="85px">
                         <el-input v-model="item.birthday" placeholder="请输入出生年月日" />
                       </el-form-item>
                     </el-col>
-                    <el-col :span="2" style="text-align: center">
-                      <el-button type="danger" icon="el-icon-delete" circle @click="delOption1(index)"></el-button>
+                    <el-col :span="12">
+                      <el-form-item label="出生地址" prop="address" label-width="75px">
+                        <el-input v-model="item.address" placeholder="请输入出生地址" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="原籍" prop="yj" label-width="45px">
+                        <el-input v-model="item.yj" placeholder="请输入原籍" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="民族" prop="nation" label-width="45px">
+                        <el-input v-model="item.nation" placeholder="请输入民族" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="宗教信仰" prop="zjxy" label-width="75px">
+                        <el-input v-model="item.zjxy" placeholder="请输入宗教信仰" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="文化程度" prop="whcd" label-width="75px">
+                        <el-input v-model="item.whcd" placeholder="请输入文化程度" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="婚姻状况" prop="hyzk" label-width="75px">
+                        <el-input v-model="item.hyzk" placeholder="请输入婚姻状况" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="115px">
+                        <el-input v-model="item.zyjfwcs" placeholder="请输入职业及服务处所" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="本县(市)其它住址" prop="bxsqtzz" label-width="125px">
+                        <el-input v-model="item.bxsqtzz" placeholder="请输入本县(市)其它住址" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="公民证代号号码签发机关及日期" prop="gmzdhhmqfjgjrq" label-width="210px">
+                        <el-input v-model="item.gmzdhhmqfjgjrq" placeholder="请输入公民证代号号码签发机关及日期" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="何时由何地迁来本县、市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="250px">
+                        <el-input v-model="item.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县、市何时登记户口" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="何时由本县、市何处迁来何时登记户口" prop="hsybxshcqlhsdjhk" label-width="250px">
+                        <el-input v-model="item.hsybxshcqlhsdjhk" placeholder="请输入何时由本县、市何处迁来何时登记户口" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="注销户口日期" prop="zxhkrq" label-width="100px">
+                        <el-input v-model="item.zxhkrq" placeholder="请输入注销户口日期" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="注销户口原因" prop="zxhkyy" label-width="100px">
+                        <el-input v-model="item.zxhkyy" placeholder="请输入注销户口原因" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="户口登记事项变更记载内容、时间及办理人章_1" prop="hkdjsxbgjznrsjjblrz1" label-width="310px">
+                        <el-input v-model="item.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="item.hkdjsxbgjznrsjjblrz2" placeholder="请输入户口登记事项变更记载内容、时间及办理人章_2" />
+                      </el-form-item>
                     </el-col>
-
                   </el-row>
 
                 </el-col>
@@ -3032,7 +3220,24 @@ export default {
                   const obj = {...this.form};
                   obj.relation=item.relation;
                   obj.name=item.name;
+                  obj.otherName=item.otherName;
+                  obj.sex=item.sex;
                   obj.birthday=item.birthday;
+                  obj.address=item.address;
+                  obj.yj=item.yj;
+                  obj.nation=item.nation;
+                  obj.zjxy=item.zjxy;
+                  obj.whcd=item.whcd;
+                  obj.hyzk=item.hyzk;
+                  obj.zyjfwcs=item.zyjfwcs;
+                  obj.bxsqtzz=item.bxsqtzz;
+                  obj.gmzdhhmqfjgjrq=item.gmzdhhmqfjgjrq;
+                  obj.hsyhdqlbxshsdjhk=item.hsyhdqlbxshsdjhk;
+                  obj.hsybxshcqlhsdjhk=item.hsybxshcqlhsdjhk;
+                  obj.zxhkrq=item.zxhkrq;
+                  obj.zxhkyy=item.zxhkyy;
+                  obj.hkdjsxbgjznrsjjblrz1=item.hkdjsxbgjznrsjjblrz1;
+                  obj.hkdjsxbgjznrsjjblrz2=item.hkdjsxbgjznrsjjblrz2;
                   arr.push(obj)
                 })
 
@@ -3123,6 +3328,15 @@ export default {
   background-color: #b5c2d2;
 }
 
+.cz1{
+  .el-form-item {
+    margin-bottom: 5px!important;
+  }
+  .el-form-item__label{
+    padding-right: 5px;
+  }
+}
+
 .jc_sb{
   .el-form-item {
     margin-bottom: 10px;
diff --git a/dangan-ui/src/views/dangan/retrieval/index.vue b/dangan-ui/src/views/dangan/retrieval/index.vue
index 6e5a912..6348395 100644
--- a/dangan-ui/src/views/dangan/retrieval/index.vue
+++ b/dangan-ui/src/views/dangan/retrieval/index.vue
@@ -39,7 +39,24 @@
         <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="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="pictures" >
           <template slot-scope="scope">
             <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
@@ -397,21 +414,123 @@
 
               <!--常住人口登记表1-->
               <el-row :gutter="10" v-if="option.form.ywType==='option1'">
-                <el-col :span="24">
-                  <el-form-item label="户主或与户主关系" prop="relation" label-width="130px">
+                <!--                <el-col :span="24">
+                                  <el-form-item label="户主或与户主关系" prop="relation" label-width="130px">
+                                    <el-input v-model="option.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="option.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="option.form.birthday" placeholder="请输入出生年月日" />
+                                  </el-form-item>
+                                </el-col>-->
+
+
+                <el-col :span="12">
+                  <el-form-item label="户主或与户主关系" label-width="130px">
                     <el-input v-model="option.form.relation" placeholder="请输入户主或与户主关系" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="24">
-                  <el-form-item label="姓名" prop="name" label-width="130px">
+                <el-col :span="12">
+                  <el-form-item label="姓名" label-width="45px">
                     <el-input v-model="option.form.name" placeholder="请输入姓名" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="24">
-                  <el-form-item label="出生年月日" prop="birthday" label-width="130px">
+                <el-col :span="8">
+                  <el-form-item label="别名" prop="otherName" label-width="45px">
+                    <el-input v-model="option.form.otherName" placeholder="请输入别名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="7">
+                  <el-form-item label="性别" prop="sex" label-width="45px">
+                    <el-input v-model="option.form.sex" placeholder="请输入性别" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="9">
+                  <el-form-item label="出生年月日" label-width="85px">
                     <el-input v-model="option.form.birthday" placeholder="请输入出生年月日" />
                   </el-form-item>
                 </el-col>
+                <el-col :span="12">
+                  <el-form-item label="出生地址" prop="address" label-width="75px">
+                    <el-input v-model="option.form.address" placeholder="请输入出生地址" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="原籍" prop="yj" label-width="45px">
+                    <el-input v-model="option.form.yj" placeholder="请输入原籍" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="民族" prop="nation" label-width="45px">
+                    <el-input v-model="option.form.nation" placeholder="请输入民族" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="宗教信仰" prop="zjxy" label-width="75px">
+                    <el-input v-model="option.form.zjxy" placeholder="请输入宗教信仰" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="文化程度" prop="whcd" label-width="75px">
+                    <el-input v-model="option.form.whcd" placeholder="请输入文化程度" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="婚姻状况" prop="hyzk" label-width="75px">
+                    <el-input v-model="option.form.hyzk" placeholder="请输入婚姻状况" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="115px">
+                    <el-input v-model="option.form.zyjfwcs" placeholder="请输入职业及服务处所" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="本县(市)其它住址" prop="bxsqtzz" label-width="125px">
+                    <el-input v-model="option.form.bxsqtzz" placeholder="请输入本县(市)其它住址" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="公民证代号号码签发机关及日期" prop="gmzdhhmqfjgjrq" label-width="210px">
+                    <el-input v-model="option.form.gmzdhhmqfjgjrq" placeholder="请输入公民证代号号码签发机关及日期" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="何时由何地迁来本县、市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="250px">
+                    <el-input v-model="option.form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县、市何时登记户口" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="何时由本县、市何处迁来何时登记户口" prop="hsybxshcqlhsdjhk" label-width="250px">
+                    <el-input v-model="option.form.hsybxshcqlhsdjhk" placeholder="请输入何时由本县、市何处迁来何时登记户口" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="注销户口日期" prop="zxhkrq" label-width="100px">
+                    <el-input v-model="option.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="option.form.zxhkyy" placeholder="请输入注销户口原因" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="户口登记事项变更记载内容、时间及办理人章_1" prop="hkdjsxbgjznrsjjblrz1" label-width="310px">
+                    <el-input v-model="option.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="option.form.hkdjsxbgjznrsjjblrz2" placeholder="请输入户口登记事项变更记载内容、时间及办理人章_2" />
+                  </el-form-item>
+                </el-col>
               </el-row>
 
               <!--常住人口登记表2-->
diff --git a/dangan-ui/src/views/index.vue b/dangan-ui/src/views/index.vue
index 6e5a912..6348395 100644
--- a/dangan-ui/src/views/index.vue
+++ b/dangan-ui/src/views/index.vue
@@ -39,7 +39,24 @@
         <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="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="pictures" >
           <template slot-scope="scope">
             <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
@@ -397,21 +414,123 @@
 
               <!--常住人口登记表1-->
               <el-row :gutter="10" v-if="option.form.ywType==='option1'">
-                <el-col :span="24">
-                  <el-form-item label="户主或与户主关系" prop="relation" label-width="130px">
+                <!--                <el-col :span="24">
+                                  <el-form-item label="户主或与户主关系" prop="relation" label-width="130px">
+                                    <el-input v-model="option.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="option.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="option.form.birthday" placeholder="请输入出生年月日" />
+                                  </el-form-item>
+                                </el-col>-->
+
+
+                <el-col :span="12">
+                  <el-form-item label="户主或与户主关系" label-width="130px">
                     <el-input v-model="option.form.relation" placeholder="请输入户主或与户主关系" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="24">
-                  <el-form-item label="姓名" prop="name" label-width="130px">
+                <el-col :span="12">
+                  <el-form-item label="姓名" label-width="45px">
                     <el-input v-model="option.form.name" placeholder="请输入姓名" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="24">
-                  <el-form-item label="出生年月日" prop="birthday" label-width="130px">
+                <el-col :span="8">
+                  <el-form-item label="别名" prop="otherName" label-width="45px">
+                    <el-input v-model="option.form.otherName" placeholder="请输入别名" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="7">
+                  <el-form-item label="性别" prop="sex" label-width="45px">
+                    <el-input v-model="option.form.sex" placeholder="请输入性别" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="9">
+                  <el-form-item label="出生年月日" label-width="85px">
                     <el-input v-model="option.form.birthday" placeholder="请输入出生年月日" />
                   </el-form-item>
                 </el-col>
+                <el-col :span="12">
+                  <el-form-item label="出生地址" prop="address" label-width="75px">
+                    <el-input v-model="option.form.address" placeholder="请输入出生地址" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="原籍" prop="yj" label-width="45px">
+                    <el-input v-model="option.form.yj" placeholder="请输入原籍" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="民族" prop="nation" label-width="45px">
+                    <el-input v-model="option.form.nation" placeholder="请输入民族" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="宗教信仰" prop="zjxy" label-width="75px">
+                    <el-input v-model="option.form.zjxy" placeholder="请输入宗教信仰" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="文化程度" prop="whcd" label-width="75px">
+                    <el-input v-model="option.form.whcd" placeholder="请输入文化程度" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="婚姻状况" prop="hyzk" label-width="75px">
+                    <el-input v-model="option.form.hyzk" placeholder="请输入婚姻状况" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="115px">
+                    <el-input v-model="option.form.zyjfwcs" placeholder="请输入职业及服务处所" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="本县(市)其它住址" prop="bxsqtzz" label-width="125px">
+                    <el-input v-model="option.form.bxsqtzz" placeholder="请输入本县(市)其它住址" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="公民证代号号码签发机关及日期" prop="gmzdhhmqfjgjrq" label-width="210px">
+                    <el-input v-model="option.form.gmzdhhmqfjgjrq" placeholder="请输入公民证代号号码签发机关及日期" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="何时由何地迁来本县、市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="250px">
+                    <el-input v-model="option.form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县、市何时登记户口" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="何时由本县、市何处迁来何时登记户口" prop="hsybxshcqlhsdjhk" label-width="250px">
+                    <el-input v-model="option.form.hsybxshcqlhsdjhk" placeholder="请输入何时由本县、市何处迁来何时登记户口" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="注销户口日期" prop="zxhkrq" label-width="100px">
+                    <el-input v-model="option.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="option.form.zxhkyy" placeholder="请输入注销户口原因" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="户口登记事项变更记载内容、时间及办理人章_1" prop="hkdjsxbgjznrsjjblrz1" label-width="310px">
+                    <el-input v-model="option.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="option.form.hkdjsxbgjznrsjjblrz2" placeholder="请输入户口登记事项变更记载内容、时间及办理人章_2" />
+                  </el-form-item>
+                </el-col>
               </el-row>
 
               <!--常住人口登记表2-->