From fb79615b1b4216c3fe61a5bf7af159d9fac2bbdf Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Mon, 30 Sep 2024 15:15:54 +0800
Subject: [PATCH] =?UTF-8?q?=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/catalog/index.vue  |  41 +++++-
 .../src/views/dangan/collection/index.vue     |   4 +-
 dangan-ui/src/views/dangan/czrkdj/index.vue   | 131 ++++++++++++++++--
 .../src/views/dangan/retrieval/index.vue      |  50 +++----
 dangan-ui/src/views/index.vue                 |  50 +++----
 5 files changed, 207 insertions(+), 69 deletions(-)

diff --git a/dangan-ui/src/views/dangan/catalog/index.vue b/dangan-ui/src/views/dangan/catalog/index.vue
index ec9a427..5ef6367 100644
--- a/dangan-ui/src/views/dangan/catalog/index.vue
+++ b/dangan-ui/src/views/dangan/catalog/index.vue
@@ -47,9 +47,11 @@
       <el-table-column label="目录名称" align="left" header-align="center" prop="muName" min-width="160">
         <template slot-scope="scope">
           <el-link type="primary" @click="handleDAXX(scope.row)">{{ scope.row.muName }}</el-link>
+
+          <el-link v-if="scope.row.children&&scope.row.children.length>0" style="margin-left: 30px">{{ scope.row.sbCount }}</el-link>
+          <el-link v-else style="margin-left: 30px" type="primary"  @click="getListPicture(scope.row)">{{ scope.row.sbCount }}</el-link>
         </template>
       </el-table-column>
-<!--      <el-table-column label="ID" align="center" prop="id" min-width="50" show-overflow-tooltip/>-->
       <el-table-column label="业务类型" align="center" prop="ywType" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
@@ -216,19 +218,32 @@
 
     </el-dialog>
 
+    <!-- 查看历史上传记录 -->
+    <el-dialog :title="lssc.title" :visible.sync="lssc.open" width="800px" append-to-body top="6vh">
+      <div>
+        <el-image
+          v-for="item in lssc.list"
+          style="width: 100px; height: 100px;margin: 10px"
+          :src="item.picUrl"
+          :preview-src-list="lssc.previewList">
+        </el-image>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listCatalog, getCatalog, delCatalog, addCatalog, updateCatalog } from "@/api/dangan/catalog";
 import { listAreaSort } from "@/api/dangan/areaSort";
+import { listPictureRecard } from "@/api/dangan/pictureRecard";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Catalog",
   components: { Treeselect },
-  dicts: ['yw_type', 'sys_normal_disable', 'area_type'],
+  dicts: ['yw_type', 'sys_normal_disable', 'area_type', 'recognize'],
   data() {
     return {
       // 遮罩层
@@ -283,6 +298,13 @@ export default {
           areaType: 2,
           pid: null,
         }
+      },
+      // 历史上传记录
+      lssc:{
+        title:"历史上传记录",
+        open: false,
+        list: [],
+        previewList: []
       }
     };
   },
@@ -493,6 +515,21 @@ export default {
         this.$router.push("/dangan/zqz?muId=" + row.id);
       }
     },
+    /** 查询档案图片信息记录列表 */
+    getListPicture(row) {
+
+      console.log(row);
+
+      this.lssc.open = true;
+      listPictureRecard({muId: row.id,pageSize: 1000000000}).then(response => {
+        this.lssc.list = response.rows;
+        this.lssc.previewList = []
+
+        this.lssc.list.forEach(item=>{
+          this.lssc.previewList.push(item.picUrl)
+        })
+      });
+    },
   }
 };
 </script>
diff --git a/dangan-ui/src/views/dangan/collection/index.vue b/dangan-ui/src/views/dangan/collection/index.vue
index 1d63515..52aec98 100644
--- a/dangan-ui/src/views/dangan/collection/index.vue
+++ b/dangan-ui/src/views/dangan/collection/index.vue
@@ -80,7 +80,7 @@
 
     </el-row>
 
-    <el-dialog title="档案本地上传" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog title="档案本地上传" :visible.sync="upload.open" width="400px" append-to-body :close-on-click-modal="false">
 
       <div v-loading="upload.loading">
         <div style="margin-bottom: 20px;min-height: 400px;">
@@ -123,7 +123,7 @@
 
     </el-dialog>
 
-    <el-dialog title="扫描文件上传" :visible.sync="smwj.open" width="750px" append-to-body>
+    <el-dialog title="扫描文件上传" :visible.sync="smwj.open" width="750px" append-to-body :close-on-click-modal="false">
 
       <div v-loading="smwj.loading">
         <div v-loading="smwj.smloading" element-loading-text="文件扫描中"
diff --git a/dangan-ui/src/views/dangan/czrkdj/index.vue b/dangan-ui/src/views/dangan/czrkdj/index.vue
index 63b4392..5100be8 100644
--- a/dangan-ui/src/views/dangan/czrkdj/index.vue
+++ b/dangan-ui/src/views/dangan/czrkdj/index.vue
@@ -293,26 +293,26 @@
         <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="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="relation" min-width="100" 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="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="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="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="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 />-->
@@ -1349,31 +1349,82 @@
 
               <!--常住人口登记表2-->
               <el-row :gutter="10" v-if="form.ywType==='option3'">
+                <el-col :span="24">
+                  <el-form-item label="户别" prop="hb" label-width="90px">
+                    <el-input v-model="form.hb" placeholder="请输入户别" />
+                  </el-form-item>
+                </el-col>
                 <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-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>
                 <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="sex" label-width="90px">
+                    <el-input v-model="form.sex" placeholder="请输入性别" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="民族" prop="nation" label-width="90px">
+                    <el-input v-model="form.nation" 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="xzz" label-width="90px">
+                    <el-input v-model="form.xzz" placeholder="请输入住址" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="出生地" prop="address" label-width="90px">
+                    <el-input v-model="form.address" placeholder="请输入出生地" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="籍贯" prop="jiguan" label-width="90px">
+                    <el-input v-model="form.jiguan" placeholder="请输入籍贯" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="文化程度" prop="whcd" label-width="90px">
+                    <el-input v-model="form.whcd" placeholder="请输入文化程度" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="婚姻状况" prop="hyzk" label-width="90px">
+                    <el-input v-model="form.hyzk" placeholder="请输入婚姻状况" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="服务处所" prop="zyjfwcs" label-width="90px">
+                    <el-input v-model="form.zyjfwcs" placeholder="请输入服务处所" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="职业" prop="zy" label-width="90px">
+                    <el-input v-model="form.zy" 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-->
@@ -2086,26 +2137,76 @@
 
               <!--常住人口登记表2-->
               <el-row :gutter="10" v-if="form.ywType==='option3'">
+                <el-col :span="24">
+                  <el-form-item label="户别" prop="hb" label-width="90px">
+                    <el-input v-model="form.hb" placeholder="请输入户别" />
+                  </el-form-item>
+                </el-col>
                 <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-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>
                 <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="sex" label-width="90px">
+                    <el-input v-model="form.sex" placeholder="请输入性别" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="民族" prop="nation" label-width="90px">
+                    <el-input v-model="form.nation" 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="xzz" label-width="90px">
+                    <el-input v-model="form.xzz" placeholder="请输入住址" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="出生地" prop="address" label-width="90px">
+                    <el-input v-model="form.address" placeholder="请输入出生地" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="籍贯" prop="jiguan" label-width="90px">
+                    <el-input v-model="form.jiguan" placeholder="请输入籍贯" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="文化程度" prop="whcd" label-width="90px">
+                    <el-input v-model="form.whcd" placeholder="请输入文化程度" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="婚姻状况" prop="hyzk" label-width="90px">
+                    <el-input v-model="form.hyzk" placeholder="请输入婚姻状况" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="服务处所" prop="zyjfwcs" label-width="90px">
+                    <el-input v-model="form.zyjfwcs" placeholder="请输入服务处所" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="职业" prop="zy" label-width="90px">
+                    <el-input v-model="form.zy" 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="请输入身份证号" />
diff --git a/dangan-ui/src/views/dangan/retrieval/index.vue b/dangan-ui/src/views/dangan/retrieval/index.vue
index c34ff0e..de371b9 100644
--- a/dangan-ui/src/views/dangan/retrieval/index.vue
+++ b/dangan-ui/src/views/dangan/retrieval/index.vue
@@ -66,31 +66,31 @@
 <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
         <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="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="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="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 />-->
diff --git a/dangan-ui/src/views/index.vue b/dangan-ui/src/views/index.vue
index 0ed8cab..b9effaf 100644
--- a/dangan-ui/src/views/index.vue
+++ b/dangan-ui/src/views/index.vue
@@ -66,31 +66,31 @@
         <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
         <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="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="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="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 />-->