diff --git a/ruoyi-ui/src/views/szxc/carinfo/index.vue b/ruoyi-ui/src/views/szxc/carinfo/index.vue
index cf935b6..524ca94 100644
--- a/ruoyi-ui/src/views/szxc/carinfo/index.vue
+++ b/ruoyi-ui/src/views/szxc/carinfo/index.vue
@@ -1,14 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="车主id" prop="ownerId">
-        <el-input
-          v-model="queryParams.ownerId"
-          placeholder="请输入车主id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
       <el-form-item label="车主姓名" prop="ownerName">
         <el-input
           v-model="queryParams.ownerName"
@@ -17,6 +9,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="所属网格" prop="deptName">
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" :disable-branch-nodes="true" style="width:215px;"
+                    placeholder="请选择所属网格"/>
+      </el-form-item>
       <el-form-item label="联系方式" prop="phone">
         <el-input
           v-model="queryParams.phone"
@@ -49,38 +45,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="车辆照片" prop="carPicture">
-        <el-input
-          v-model="queryParams.carPicture"
-          placeholder="请输入车辆照片"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属网格" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入所属网格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建者ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入创建者ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -133,20 +98,24 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="carinfoList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="carinfoList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="车主id" align="center" prop="ownerId" />
       <el-table-column label="车主姓名" align="center" prop="ownerName" />
       <el-table-column label="联系方式" align="center" prop="phone" />
       <el-table-column label="车牌号" align="center" prop="carNo" />
-      <el-table-column label="车类型" align="center" prop="carType" />
+      <el-table-column label="车类型" align="center" prop="carType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_cartype" :value="scope.row.carType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="颜色" align="center" prop="colour" />
       <el-table-column label="品牌" align="center" prop="carBand" />
-      <el-table-column label="车辆照片" align="center" prop="carPicture" />
-      <el-table-column label="部门id" align="center" prop="deptId" />
+      <el-table-column label="车辆照片" align="center" prop="carPicture" >
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.carPicture" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
       <el-table-column label="所属网格" align="center" prop="deptName" />
-      <el-table-column label="创建者ID" align="center" prop="userId" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -167,7 +136,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -179,11 +148,22 @@
     <!-- 添加或修改车辆信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="车主id" prop="ownerId">
+<!--        <el-form-item label="车主id" prop="ownerId">
           <el-input v-model="form.ownerId" placeholder="请输入车主id" />
+        </el-form-item>-->
+        <el-form-item label="车主姓名" prop="ownerName" v-if="!form.id">
+          <el-input readonly
+                    placeholder="请选择车主姓名"
+                    v-model="form.ownerName">
+            <el-button slot="append" icon="el-icon-search" @click="ownerSelect"></el-button>
+          </el-input>
         </el-form-item>
-        <el-form-item label="车主姓名" prop="ownerName">
-          <el-input v-model="form.ownerName" placeholder="请输入车主姓名" />
+        <!--        <el-form-item label="部门id" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门id" />
+        </el-form-item>-->
+        <el-form-item label="所属网格" prop="deptId">
+          <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true"
+             disabled placeholder="请选择所属网格" style="width:100%;" @select="selectedTree"/>
         </el-form-item>
         <el-form-item label="联系方式" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入联系方式" />
@@ -191,6 +171,21 @@
         <el-form-item label="车牌号" prop="carNo">
           <el-input v-model="form.carNo" placeholder="请输入车牌号" />
         </el-form-item>
+        <el-form-item label="车类型" prop="carType">
+          <el-select :disabled="form.id"
+                     v-model="form.carType"
+                     placeholder="车类型"
+                     clearable
+                     style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_cartype"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="颜色" prop="colour">
           <el-input v-model="form.colour" placeholder="请输入颜色" />
         </el-form-item>
@@ -198,16 +193,7 @@
           <el-input v-model="form.carBand" placeholder="请输入品牌" />
         </el-form-item>
         <el-form-item label="车辆照片" prop="carPicture">
-          <el-input v-model="form.carPicture" placeholder="请输入车辆照片" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="所属网格" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入所属网格" />
-        </el-form-item>
-        <el-form-item label="创建者ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
+          <image-upload v-model="form.carPicture"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -218,14 +204,66 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="选择居民" :visible.sync="jmin.dialogVisible" width="1000px" append-to-body>
+      <el-form :model="jmin.queryParams" ref="queryForm" size="small" :inline="true" label-width="70px">
+        <el-form-item label="身份证号" prop="cardId">
+          <el-input
+            v-model="jmin.queryParams.cardId"
+            placeholder="请输入身份证号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input
+            v-model="jmin.queryParams.name"
+            placeholder="请输入姓名"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="jminQuery">搜索</el-button>
+        </el-form-item>
+      </el-form>
+      <el-alert title="双击选择户主" type="warning" :closable="false"></el-alert>
+      <el-table v-loading="jmin.loading" :data="jmin.list" border @cell-dblclick="jminDblclick">
+        <el-table-column label="姓名" align="center" prop="name" min-width="80"/>
+        <el-table-column label="身份证号" align="center" prop="cardId" min-width="180"/>
+        <el-table-column label="所属网格" align="center" prop="deptName" min-width="100"/>
+        <el-table-column label="性别" align="center" prop="sex">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="籍贯" align="center" prop="jg" min-width="180"/>
+        <el-table-column label="手机号" align="center" prop="phone" min-width="120"/>
+        <el-table-column label="现居住地" align="center" prop="currentAddress" min-width="180"/>
+      </el-table>
+      <pagination
+        v-show="jmin.total>0"
+        :total="jmin.total"
+        :page.sync="jmin.queryParams.pageNum"
+        :limit.sync="jmin.queryParams.pageSize"
+        @pagination="getlistJminfo"
+      />
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listCarinfo, getCarinfo, delCarinfo, addCarinfo, updateCarinfo } from "@/api/szxc/carinfo";
+import { listJminfo } from "@/api/szxc/jminfo";
+import { deptTreeSelect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Carinfo",
+  components: { Treeselect },
+  dicts: ['szxc_cartype'],
   data() {
     return {
       // 遮罩层
@@ -242,6 +280,8 @@ export default {
       total: 0,
       // 车辆信息表格数据
       carinfoList: [],
+      // 组织树选项
+      deptOptions: undefined,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -279,15 +319,44 @@ export default {
           { required: true, message: "颜色不能为空", trigger: "blur" }
         ],
         deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" }
+          { required: true, message: "所属网格不能为空", trigger: "blur" }
         ],
-      }
+      },
+      // 居民信息
+      jmin: {
+        dialogVisible: false,
+        // 遮罩层
+        loading: false,
+        // 总条数
+        total: 0,
+        // 查询参数
+        queryParams:{
+          pageNum: 1,
+          pageSize: 10,
+          off: '0',
+          cardId: '',
+          name: ''
+        },
+        // 查询列表
+        list: []
+      },
     };
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
+    /** 查询组织下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    selectedTree(node){
+      this.form.deptId = node.id;
+      this.form.deptName = node.label;
+    },
     /** 查询车辆信息列表 */
     getList() {
       this.loading = true;
@@ -361,6 +430,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.carType='1'
           if (this.form.id != null) {
             updateCarinfo(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -392,7 +462,34 @@ export default {
       this.download('szxc/carinfo/export', {
         ...this.queryParams
       }, `carinfo_${new Date().getTime()}.xlsx`)
-    }
+    },
+    /** 查询居民信息列表 */
+    getlistJminfo() {
+      this.jmin.loading = true;
+      listJminfo(this.jmin.queryParams).then(response => {
+        this.jmin.list = response.rows;
+        this.jmin.total = response.total;
+        this.jmin.loading = false;
+      });
+    },
+    // 点击选择居民
+    ownerSelect(){
+      this.jmin.dialogVisible = true;
+      this.getlistJminfo()
+    },
+    // 居民查询
+    jminQuery(){
+      this.jmin.queryParams.pageNum = 1;
+      this.getlistJminfo();
+    },
+    // 居民选择 选中数据
+    jminDblclick(row) {
+      this.form.ownerId = row.id;
+      this.form.ownerName = row.name;
+      this.form.deptId = row.deptId;
+      this.form.deptName = row.deptName;
+      this.jmin.dialogVisible = false
+    },
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/szxc/jminfo/index.vue b/ruoyi-ui/src/views/szxc/jminfo/index.vue
index c8230d0..066982a 100644
--- a/ruoyi-ui/src/views/szxc/jminfo/index.vue
+++ b/ruoyi-ui/src/views/szxc/jminfo/index.vue
@@ -301,32 +301,35 @@
 
     <el-table v-loading="loading" :data="jminfoList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="45" align="center" fixed/>
-      <el-table-column label="居民ID" align="center" prop="id" fixed/>
-      <el-table-column label="人员基本信息" align="center">
-        <el-table-column label="姓名" align="center" prop="name" min-width="80"/>
-        <el-table-column label="曾用名" align="center" prop="oldName" min-width="80"/>
-        <el-table-column label="国籍" align="center" prop="nationality" min-width="80">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.szxc_gj" :value="scope.row.nationality"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="身份证号" align="center" prop="cardId" min-width="180"/>
-        <el-table-column label="出生日期" align="center" prop="bornDate" min-width="100">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.bornDate, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="性别" align="center" prop="sex">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="籍贯" align="center" prop="jg" min-width="100"/>
+      <el-table-column label="身份证号" align="center" prop="cardId" min-width="180" fixed/>
+      <el-table-column label="姓名" align="center" prop="name" min-width="100" fixed/>
+      <el-table-column label="曾用名" align="center" prop="oldName" min-width="100"/>
+      <el-table-column label="国籍" align="center" prop="nationality" min-width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_gj" :value="scope.row.nationality"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="出生日期" align="center" prop="bornDate" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.bornDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="性别" align="center" prop="sex">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="籍贯" align="center" prop="jg" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="核查状态" align="center" prop="hcStatus" min-width="120">
+        <template slot-scope="scope">
+          <el-link v-if="scope.row.hcStatus==='0'" icon="el-icon-thumb" type="primary" @click="handleCheck(scope.row)">待核查</el-link>
+          <el-link v-if="scope.row.hcStatus==='1'" type="success">已核查</el-link>
+        </template>
       </el-table-column>
       <el-table-column label="户信息" align="center">
-        <el-table-column label="户号" align="center" prop="acountNo" min-width="100"/>
-        <el-table-column label="所属网格" align="center" prop="deptName" min-width="100"/>
-        <el-table-column label="户籍地址" align="center" prop="hjAddress" min-width="100"/>
+        <el-table-column label="户号" align="center" prop="acountNo" min-width="120"/>
+        <el-table-column label="所属网格" align="center" prop="deptName" min-width="120"/>
+        <el-table-column label="户籍地址" align="center" prop="hjAddress" min-width="120" show-overflow-tooltip/>
       </el-table-column>
       <el-table-column label="户籍性质信息" align="center">
         <el-table-column label="户籍性质" align="center" prop="jgNature" min-width="100">
@@ -370,7 +373,7 @@
             <dict-tag :options="dict.type.szxc_zjxy" :value="scope.row.zjxy"/>
           </template>
         </el-table-column>
-        <el-table-column label="健康状况" align="center" prop="jkzk" >
+        <el-table-column label="健康状况" align="center" prop="jkzk" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             <dict-tag :options="dict.type.szxc_jkzk" :value="scope.row.jkzk"/>
           </template>
@@ -387,14 +390,14 @@
           <dict-tag :options="dict.type.szxc_off" :value="scope.row.off"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['szxc:jminfo:edit']"
-          >信息更新</el-button>
+          >修改</el-button>
           <el-button
             size="mini"
             type="text"
@@ -402,16 +405,15 @@
             @click="handleZx(scope.row)"
             v-hasPermi="['szxc:jminfo:remove']"
           >注销</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleJmtag(scope.row)"
-          >人员标签</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleBankInfo(scope.row)"
-          >银行卡信息</el-button>
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" style="margin-left: 6px">
+            <el-button size="mini" type="text">更多操作</el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="handleJmtag">人员标签</el-dropdown-item>
+              <el-dropdown-item command="handleBankInfo">银行卡信息</el-dropdown-item>
+              <el-dropdown-item command="handleHzbg">户主变更</el-dropdown-item>
+              <el-dropdown-item command="handleClxx">车辆信息</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -432,9 +434,9 @@
           <el-col :span="8">
             <el-form-item label="户号" prop="acountNo">
               <el-input
-                placeholder="请输入户号查询"
+                placeholder="请选择户主"
                 v-model="form.acountNo">
-                <el-button slot="append" icon="el-icon-search" @click="acountNoQuery"></el-button>
+                <el-button slot="append" icon="el-icon-search" @click="acountNoQuery(1)"></el-button>
               </el-input>
             </el-form-item>
           </el-col>
@@ -853,15 +855,231 @@
       </div>
     </el-dialog>
 
+    <!-- 户主变更 -->
+    <el-dialog title="户主变更" :visible.sync="hzbg.visible" width="600px" append-to-body>
+      <el-form ref="form" :model="hzbg.form" :rules="hzbg.rules" label-width="120px">
+        <el-form-item label="居民姓名" prop="name">
+          <el-input v-model="hzbg.form.name" placeholder="请输入居民姓名" disabled/>
+        </el-form-item>
+        <el-form-item label="居民身份证号" prop="idCard">
+          <el-input v-model="hzbg.form.idCard" placeholder="请输入居民身份证号" disabled/>
+        </el-form-item>
+        <el-form-item label="原户主姓名" prop="yName">
+          <el-input v-model="hzbg.form.yName" placeholder="请输入原户主姓名" disabled/>
+        </el-form-item>
+        <el-form-item label="原户主身份证号" prop="yIdCard">
+          <el-input v-model="hzbg.form.yIdCard" placeholder="请输入原户主身份证号" disabled/>
+        </el-form-item>
+        <el-form-item label="变更原因" prop="bgReason">
+          <el-select
+            v-model="hzbg.form.bgReason"
+            placeholder="变更原因"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_hkbg_reason"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="变更时间" prop="bgTime">
+          <el-date-picker clearable style="width: 100%"
+                          v-model="hzbg.form.bgTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择变更时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="新户主姓名" prop="xName">
+          <el-input
+            readonly
+            placeholder="请选择新户主"
+            v-model="hzbg.form.xName">
+            <el-button slot="append" icon="el-icon-search" @click="acountNoQuery(2)"></el-button>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="新户主身份证号" prop="xIdCard">
+          <el-input v-model="hzbg.form.xIdCard" placeholder="请输入新户主身份证号" disabled/>
+        </el-form-item>
+        <el-form-item label="户号" prop="acountNo">
+          <el-input v-model="hzbg.form.acountNo" placeholder="请输入户号" disabled/>
+        </el-form-item>
+        <el-form-item label="所属网格" prop="deptName">
+          <el-input v-model="hzbg.form.deptName" placeholder="请输入所属网格" disabled/>
+        </el-form-item>
+        <el-form-item label="户籍地址" prop="hjAddress">
+          <el-input v-model="hzbg.form.hjAddress" placeholder="请输入户籍地址" disabled/>
+        </el-form-item>
+        <el-form-item label="户籍性质" prop="jgNature">
+          <el-select
+            v-model="hzbg.form.jgNature"
+            placeholder="户籍性质"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_hjxz"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="与户主关系" prop="relation">
+          <el-select
+                     v-model="hzbg.form.relation"
+                     placeholder="与户主关系"
+                     clearable
+                     style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_hzgx"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否常住" prop="longLive">
+          <el-select
+            v-model="hzbg.form.longLive"
+            placeholder="是否常住"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="hzbg.form.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="hzbgSubmit">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="车辆信息" :visible.sync="clxx.visible" width="1000px" append-to-body>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="clxxAdd"
+            v-hasPermi="['szxc:bankinfo:add']"
+          >添加</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="clxx.loading" :data="clxx.list" border>
+        <el-table-column label="车主姓名" align="center" prop="ownerName" />
+        <el-table-column label="联系方式" align="center" prop="phone" />
+        <el-table-column label="车牌号" align="center" prop="carNo" />
+        <el-table-column label="车类型" align="center" prop="carType" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxc_cartype" :value="scope.row.carType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="颜色" align="center" prop="colour" />
+        <el-table-column label="品牌" align="center" prop="carBand" />
+        <el-table-column label="车辆照片" align="center" prop="carPicture" >
+          <template slot-scope="scope">
+            <image-preview :src="scope.row.carPicture" :width="50" :height="50"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="所属网格" align="center" prop="deptName" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="100px">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="clxxUpdate(scope.row)"
+              v-hasPermi="['szxc:bankinfo:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="clxxDelete(scope.row)"
+              v-hasPermi="['szxc:bankinfo:remove']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
+    <!-- 添加或修改车辆信息对话框 -->
+    <el-dialog :title="clxx.title" :visible.sync="clxx.open" width="500px" append-to-body>
+      <el-form ref="clxxForm" :model="clxx.form" :rules="clxx.rules" label-width="100px">
+        <el-form-item label="车主姓名" prop="ownerName">
+          <el-input v-model="clxx.form.ownerName" placeholder="请输入联系方式" disabled/>
+        </el-form-item>
+        <el-form-item label="所属网格" prop="deptId">
+          <treeselect v-model="clxx.form.deptId" :options="deptOptions" :disable-branch-nodes="true"
+                      disabled placeholder="请选择所属网格" style="width:100%;"/>
+        </el-form-item>
+        <el-form-item label="联系方式" prop="phone">
+          <el-input v-model="clxx.form.phone" placeholder="请输入联系方式" />
+        </el-form-item>
+        <el-form-item label="车牌号" prop="carNo">
+          <el-input v-model="clxx.form.carNo" placeholder="请输入车牌号" />
+        </el-form-item>
+        <el-form-item label="车类型" prop="carType">
+          <el-select
+                     v-model="clxx.form.carType"
+                     placeholder="车类型"
+                     clearable
+                     style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_cartype"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="颜色" prop="colour">
+          <el-input v-model="clxx.form.colour" placeholder="请输入颜色" />
+        </el-form-item>
+        <el-form-item label="品牌" prop="carBand">
+          <el-input v-model="clxx.form.carBand" placeholder="请输入品牌" />
+        </el-form-item>
+        <el-form-item label="车辆照片" prop="carPicture">
+          <image-upload v-model="clxx.form.carPicture"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="clxx.form.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="clxxSubmit">确 定</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { listJminfo, getJminfo, delJminfo, addJminfo, updateJminfo } from "@/api/szxc/jminfo";
+import { listJminfo, getJminfo, addJminfo, updateJminfo } from "@/api/szxc/jminfo";
 import { listAddress } from "@/api/szxc/address";
 import { listJmtag, addAllJmtag } from "@/api/szxc/jmtag";
 import { listTag } from "@/api/szxc/tag";
 import { listBankinfo, editDefault, addBankinfo, updateBankinfo, delBankinfo } from "@/api/szxc/bankinfo";
+import { listCarinfo, delCarinfo, addCarinfo, updateCarinfo } from "@/api/szxc/carinfo";
+import { addRecard } from "@/api/szxc/recard";
 import { addOffrecard } from "@/api/szxc/offrecard";
 import { deptTreeSelect } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
@@ -871,7 +1089,7 @@ export default {
   name: "Jminfo",
   components: { Treeselect },
   dicts: ['szxc_hjxz', 'szxc_gj', 'szxc_head', 'szxc_hzgx', 'szxc_yes_no', 'szxc_off', 'szxc_gj', 'sys_user_sex',
-    'szxc_brqk', 'szxc_hyzk', 'szxc_xueli', 'szxc_zjxy', 'szxc_jkzk', 'szxc_zzmm'],
+    'szxc_brqk', 'szxc_hyzk', 'szxc_xueli', 'szxc_zjxy', 'szxc_jkzk', 'szxc_zzmm', 'szxc_hkbg_reason', 'szxc_cartype'],
   data() {
     return {
       queryMore: false,
@@ -1014,6 +1232,8 @@ export default {
         loading: false,
         // 总条数
         total: 0,
+        // 选择种类  1、新增居民信息   2、户口变更
+        type: 1,
         // 查询参数
         queryParams:{
           pageNum: 1,
@@ -1082,7 +1302,113 @@ export default {
             { required: true, message: "注销原因不能为空", trigger: "blur" }
           ],
         }
-      }
+      },
+      // 户主变更
+      hzbg: {
+        visible: false,
+        form:{
+          id: null,
+          acountNo: null,
+          jmId: null,
+          name: null,
+          idCard: null,
+          yJmId: null,
+          yName: null,
+          yIdCard: null,
+          bgReason: null,
+          xJmId: null,
+          xName: null,
+          xIdCard: null,
+          relation: null,
+          bgTime: null,
+          hjAddress: null,
+          jgNature: null,
+          longLive: null,
+          remark: null,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null,
+          deptId: null,
+          userId: null,
+          deptName: null
+        },
+        rules: {
+          name: [
+            { required: true, message: "居民姓名不能为空", trigger: "blur" }
+          ],
+          idCard: [
+            { required: true, message: "居民身份证号不能为空", trigger: "blur" }
+          ],
+          yName: [
+            { required: true, message: "原户主姓名不能为空", trigger: "blur" }
+          ],
+          yIdCard: [
+            { required: true, message: "原户主身份证号不能为空", trigger: "blur" }
+          ],
+          bgReason: [
+            { required: true, message: "变更原因不能为空", trigger: "blur" }
+          ],
+          xName: [
+            { required: true, message: "新户主姓名不能为空", trigger: "blur" }
+          ],
+          xIdCard: [
+            { required: true, message: "新户主身份证号不能为空", trigger: "blur" }
+          ],
+          acountNo: [
+            { required: true, message: "户号不能为空", trigger: "blur" }
+          ],
+          deptName: [
+            { required: true, message: "所属网格不能为空", trigger: "blur" }
+          ],
+          hjAddress: [
+            { required: true, message: "户籍地址不能为空", trigger: "blur" }
+          ],
+          jgNature: [
+            { required: true, message: "户籍性质不能为空", trigger: "blur" }
+          ],
+          relation: [
+            { required: true, message: "与户主关系不能为空", trigger: "blur" }
+          ],
+          longLive: [
+            { required: true, message: "是否常住不能为空", trigger: "blur" }
+          ],
+        }
+      },
+      // 车辆信息
+      clxx: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 查询列表
+        list: [],
+        // 弹出层标题
+        title: '',
+        // 添加弹出层
+        open: false,
+        // 表单参数
+        form: {},
+        // 居民信息
+        jminRow: null,
+        // 表单校验
+        rules: {
+          ownerName: [
+            { required: true, message: "车主姓名不能为空", trigger: "blur" }
+          ],
+          carNo: [
+            { required: true, message: "车牌号不能为空", trigger: "blur" }
+          ],
+          carType: [
+            { required: true, message: "车类型不能为空", trigger: "change" }
+          ],
+          colour: [
+            { required: true, message: "颜色不能为空", trigger: "blur" }
+          ],
+          deptId: [
+            { required: true, message: "所属网格不能为空", trigger: "blur" }
+          ],
+        },
+      },
     };
   },
   created() {
@@ -1100,7 +1426,8 @@ export default {
       this.form.deptId = node.id;
       this.form.deptName = node.label;
     },
-    acountNoQuery(){
+    acountNoQuery(type){
+      this.hzInfo.type = type
       this.hzInfo.visible = true;
       this.getlistAddress()
     },
@@ -1226,6 +1553,36 @@ export default {
         ...this.queryParams
       }, `jminfo_${new Date().getTime()}.xlsx`)
     },
+    // 审查
+    handleCheck(row){
+      this.$modal.confirm('是否确认身份证号【"' + row.cardId + '"】的数据项已核查没问题？').then(()=>{
+        const detail = row
+        detail.hcStatus = '1';
+        updateJminfo(detail).then(response => {
+          this.$modal.msgSuccess("核查成功");
+          this.getList();
+        });
+      })
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleJmtag":
+          this.handleJmtag(row);
+          break;
+        case "handleBankInfo":
+          this.handleBankInfo(row);
+          break;
+        case "handleHzbg":
+          this.handleHzbg(row);
+          break;
+        case "handleClxx":
+          this.handleClxx(row);
+          break;
+        default:
+          break;
+      }
+    },
     /** 查询户主信息列表 */
     getlistAddress() {
       this.hzInfo.loading = true;
@@ -1235,6 +1592,7 @@ export default {
         this.hzInfo.loading = false;
       });
     },
+    // 户主信息查询
     hzInfoQuery(){
       this.hzInfo.queryParams.pageNum = 1;
       this.getlistAddress();
@@ -1242,10 +1600,20 @@ export default {
     // 户主选择 选中数据
     hzInfoDblclick(row) {
       this.hzInfo.selectRow = row;
-      this.form.acountNo = row.acountNo;
-      this.form.deptId = row.deptId;
-      this.form.deptName = row.deptName;
-      this.form.hjAddress = row.hjAddress;
+      if(this.hzInfo.type===1){
+        this.form.acountNo = row.acountNo;
+        this.form.deptId = row.deptId;
+        this.form.deptName = row.deptName;
+        this.form.hjAddress = row.hjAddress;
+      }else if(this.hzInfo.type===2){
+        this.hzbg.form.acountNo = row.acountNo;
+        this.hzbg.form.xJmId = row.jmId;
+        this.hzbg.form.xName = row.name;
+        this.hzbg.form.xIdCard = row.idCard;
+        this.hzbg.form.deptId = row.deptId;
+        this.hzbg.form.deptName = row.deptName;
+        this.hzbg.form.hjAddress = row.hjAddress;
+      }
       this.hzInfo.visible = false
     },
     // 与户主关系
@@ -1322,7 +1690,7 @@ export default {
       this.bankInfo.visible = true;
       this.getlistBankinfo();
     },
-    /** 查询关联人员标签列表 */
+    /** 查询银行卡信息列表 */
     getlistBankinfo() {
       listBankinfo({
         pageNum: 1,
@@ -1418,7 +1786,108 @@ export default {
         this.zxInfo.visible = false;
         this.getList();
       });
-    }
+    },
+    // 户主变更
+    handleHzbg(row){
+      listAddress({
+        pageNum: 1,
+        pageSize: 10000,
+        acountNo: row.acountNo
+      }).then(response => {
+        this.hzbg.form.acountNo = row.acountNo;
+        this.hzbg.form.jmId = row.id;
+        this.hzbg.form.name = row.name;
+        this.hzbg.form.idCard = row.cardId;
+        this.hzbg.form.yJmId = response.rows[0].yJmId;
+        this.hzbg.form.yName = response.rows[0].name;
+        this.hzbg.form.yIdCard = response.rows[0].idCard;
+        this.hzbg.visible = true;
+      });
+    },
+    // 户主变更提交
+    hzbgSubmit(){
+      addRecard(this.hzbg.form).then(response => {
+        this.$modal.msgSuccess("变更成功");
+        this.hzbg.visible = false;
+        this.getList();
+      });
+    },
+    // 车辆信息
+    handleClxx(row){
+      this.clxx.jminRow = row;
+      this.clxx.visible = true;
+      this.getlistClxx();
+    },
+    /** 查询银行卡信息列表 */
+    getlistClxx() {
+      listCarinfo({
+        pageNum: 1,
+        pageSize: 100000000,
+        ownerId: this.clxx.jminRow.id
+      }).then(response => {
+        this.clxx.list = response.rows
+      });
+    },
+    // 添加银行卡
+    clxxAdd(){
+      this.resetForm("clxxForm");
+      this.clxx.form = {
+        id: null,
+        ownerId: this.clxx.jminRow.id,
+        ownerName: this.clxx.jminRow.name,
+        phone: null,
+        carNo: null,
+        carType: null,
+        colour: null,
+        carBand: null,
+        carPicture: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        deptId: this.clxx.jminRow.deptId,
+        deptName: this.clxx.jminRow.deptName,
+        userId: null,
+        remark: null
+      };
+      this.clxx.title = '添加车辆';
+      this.clxx.open = true;
+    },
+    /** 修改按钮操作 */
+    clxxUpdate(row) {
+      this.clxx.form = row;
+      this.clxx.title = '修改车辆';
+      this.clxx.open = true;
+    },
+    /** 删除按钮操作 */
+    clxxDelete(row) {
+      this.$modal.confirm('是否确认删除车辆车牌号为【"' + row.carNo + '"】的数据项？').then(function() {
+        return delCarinfo(row.id);
+      }).then(() => {
+        this.getlistClxx();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    // 添加提交银行卡
+    clxxSubmit(){
+      this.$refs["clxxForm"].validate(valid => {
+        if (valid) {
+          if (this.clxx.form.id != null) {
+            updateCarinfo(this.clxx.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.clxx.open = false;
+              this.getlistClxx();
+            });
+          } else {
+            addCarinfo(this.clxx.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.clxx.open = false;
+              this.getlistClxx();
+            });
+          }
+        }
+      });
+    },
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/szxc/recard/index.vue b/ruoyi-ui/src/views/szxc/recard/index.vue
index 5513482..a481055 100644
--- a/ruoyi-ui/src/views/szxc/recard/index.vue
+++ b/ruoyi-ui/src/views/szxc/recard/index.vue
@@ -1,22 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="户号" prop="acountNo">
-        <el-input
-          v-model="queryParams.acountNo"
-          placeholder="请输入户号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="居民id" prop="jmId">
-        <el-input
-          v-model="queryParams.jmId"
-          placeholder="请输入居民id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
       <el-form-item label="居民姓名" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -33,14 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="原居民id" prop="yJmId">
-        <el-input
-          v-model="queryParams.yJmId"
-          placeholder="请输入原居民id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="原户主姓名" prop="yName">
         <el-input
           v-model="queryParams.yName"
@@ -57,21 +33,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="变更原因(字典)" prop="bgReason">
-        <el-input
-          v-model="queryParams.bgReason"
-          placeholder="请输入变更原因(字典)"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="新居民id" prop="xJmId">
-        <el-input
-          v-model="queryParams.xJmId"
-          placeholder="请输入新居民id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="变更原因" prop="bgReason">
+        <el-select v-model="queryParams.bgReason" placeholder="变更原因"
+                   clearable style="width:100%">
+          <el-option
+            v-for="dict in dict.type.szxc_hkbg_reason"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="新户主姓名" prop="xName">
         <el-input
@@ -89,14 +60,25 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="与户主关系" prop="relation">
+      <el-form-item label="户号" prop="acountNo">
         <el-input
-          v-model="queryParams.relation"
-          placeholder="请输入与户主关系"
+          v-model="queryParams.acountNo"
+          placeholder="请输入户号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="与户主关系" prop="relation">
+        <el-select v-model="queryParams.relation" placeholder="与户主关系"
+                   clearable style="width:100%">
+          <el-option
+            v-for="dict in dict.type.szxc_hzgx"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="变更时间" prop="bgTime">
         <el-date-picker clearable
                         v-model="queryParams.bgTime"
@@ -114,44 +96,38 @@
         />
       </el-form-item>
       <el-form-item label="户籍性质" prop="jgNature">
-        <el-input
+        <el-select
           v-model="queryParams.jgNature"
-          placeholder="请输入户籍性质"
+          placeholder="户籍性质"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_hjxz"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="是否常住" prop="longLive">
-        <el-input
+        <el-select
           v-model="queryParams.longLive"
-          placeholder="请输入是否常住"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
+          placeholder="是否常住"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建者ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入创建者ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="所属网格" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入所属网格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="所属网格" prop="deptId">
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" :disable-branch-nodes="true" style="width:215px;"
+                    placeholder="请选择所属网格"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -160,96 +136,46 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['szxc:recard:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['szxc:recard:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['szxc:recard:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['szxc:recard:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="recardList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="户号" align="center" prop="acountNo" />
-      <el-table-column label="居民id" align="center" prop="jmId" />
+    <el-table v-loading="loading" :data="recardList" border>
+      <el-table-column label="ID" align="center" prop="id" min-width="45"/>
+      <el-table-column label="户号" align="center" prop="acountNo"/>
       <el-table-column label="居民姓名" align="center" prop="name" />
-      <el-table-column label="居民身份证号" align="center" prop="idCard" />
-      <el-table-column label="原居民id" align="center" prop="yJmId" />
+      <el-table-column label="居民身份证号" align="center" prop="idCard" min-width="140" show-overflow-tooltip/>
       <el-table-column label="原户主姓名" align="center" prop="yName" />
-      <el-table-column label="原户主身份证号" align="center" prop="yIdCard" />
-      <el-table-column label="变更原因(字典)" align="center" prop="bgReason" />
-      <el-table-column label="新居民id" align="center" prop="xJmId" />
+      <el-table-column label="原户主身份证号" align="center" prop="yIdCard" min-width="140" show-overflow-tooltip/>
+      <el-table-column label="变更原因" align="center" prop="bgReason">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_hkbg_reason" :value="scope.row.bgReason"/>
+        </template>
+      </el-table-column>
       <el-table-column label="新户主姓名" align="center" prop="xName" />
-      <el-table-column label="新户主身份证号" align="center" prop="xIdCard" />
-      <el-table-column label="与户主关系" align="center" prop="relation" />
-      <el-table-column label="变更时间" align="center" prop="bgTime" width="180">
+      <el-table-column label="新户主身份证号" align="center" prop="xIdCard" min-width="140" show-overflow-tooltip/>
+      <el-table-column label="与户主关系" align="center" prop="relation">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_hzgx" :value="scope.row.relation"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="变更时间" align="center" prop="bgTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.bgTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="户籍地址" align="center" prop="hjAddress" />
-      <el-table-column label="户籍性质" align="center" prop="jgNature" />
-      <el-table-column label="是否常住" align="center" prop="longLive" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="部门id" align="center" prop="deptId" />
-      <el-table-column label="创建者ID" align="center" prop="userId" />
+      <el-table-column label="户籍性质" align="center" prop="jgNature">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_hjxz" :value="scope.row.jgNature"/>
+        </template>
+      </el-table-column>
       <el-table-column label="所属网格" align="center" prop="deptName" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="是否常住" align="center" prop="longLive" min-width="70">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['szxc:recard:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['szxc:recard:remove']"
-          >删除</el-button>
+          <dict-tag :options="dict.type.szxc_yes_no" :value="scope.row.longLive"/>
         </template>
       </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
     </el-table>
 
     <pagination
@@ -259,109 +185,32 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改户口变更记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="户号" prop="acountNo">
-          <el-input v-model="form.acountNo" placeholder="请输入户号" />
-        </el-form-item>
-        <el-form-item label="居民id" prop="jmId">
-          <el-input v-model="form.jmId" placeholder="请输入居民id" />
-        </el-form-item>
-        <el-form-item label="居民姓名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入居民姓名" />
-        </el-form-item>
-        <el-form-item label="居民身份证号" prop="idCard">
-          <el-input v-model="form.idCard" placeholder="请输入居民身份证号" />
-        </el-form-item>
-        <el-form-item label="原居民id" prop="yJmId">
-          <el-input v-model="form.yJmId" placeholder="请输入原居民id" />
-        </el-form-item>
-        <el-form-item label="原户主姓名" prop="yName">
-          <el-input v-model="form.yName" placeholder="请输入原户主姓名" />
-        </el-form-item>
-        <el-form-item label="原户主身份证号" prop="yIdCard">
-          <el-input v-model="form.yIdCard" placeholder="请输入原户主身份证号" />
-        </el-form-item>
-        <el-form-item label="变更原因(字典)" prop="bgReason">
-          <el-input v-model="form.bgReason" placeholder="请输入变更原因(字典)" />
-        </el-form-item>
-        <el-form-item label="新居民id" prop="xJmId">
-          <el-input v-model="form.xJmId" placeholder="请输入新居民id" />
-        </el-form-item>
-        <el-form-item label="新户主姓名" prop="xName">
-          <el-input v-model="form.xName" placeholder="请输入新户主姓名" />
-        </el-form-item>
-        <el-form-item label="新户主身份证号" prop="xIdCard">
-          <el-input v-model="form.xIdCard" 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="bgTime">
-          <el-date-picker clearable
-                          v-model="form.bgTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择变更时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="户籍地址" prop="hjAddress">
-          <el-input v-model="form.hjAddress" placeholder="请输入户籍地址" />
-        </el-form-item>
-        <el-form-item label="户籍性质" prop="jgNature">
-          <el-input v-model="form.jgNature" placeholder="请输入户籍性质" />
-        </el-form-item>
-        <el-form-item label="是否常住" prop="longLive">
-          <el-input v-model="form.longLive" placeholder="请输入是否常住" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="创建者ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
-        </el-form-item>
-        <el-form-item label="所属网格" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入所属网格" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-  import { listRecard, getRecard, delRecard, addRecard, updateRecard } from "@/api/szxc/recard";
+  import { listRecard } from "@/api/szxc/recard";
+  import { deptTreeSelect } from "@/api/system/user";
+  import Treeselect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
   export default {
     name: "Recard",
+    components: { Treeselect },
+    dicts: ['szxc_hjxz', 'szxc_gj', 'szxc_head', 'szxc_hzgx', 'szxc_yes_no', 'szxc_off', 'szxc_gj', 'sys_user_sex',
+      'szxc_brqk', 'szxc_hyzk', 'szxc_xueli', 'szxc_zjxy', 'szxc_jkzk', 'szxc_zzmm', 'szxc_hkbg_reason'],
     data() {
       return {
         // 遮罩层
         loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
         // 显示搜索条件
         showSearch: true,
         // 总条数
         total: 0,
         // 户口变更记录表格数据
         recardList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
+        // 组织树选项
+        deptOptions: undefined,
         // 查询参数
         queryParams: {
           pageNum: 1,
@@ -386,23 +235,19 @@
           userId: null,
           deptName: null
         },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-          acountNo: [
-            { required: true, message: "户号不能为空", trigger: "blur" }
-          ],
-          deptId: [
-            { required: true, message: "部门id不能为空", trigger: "blur" }
-          ],
-        }
       };
     },
     created() {
       this.getList();
+      this.getDeptTree();
     },
     methods: {
+      /** 查询组织下拉树结构 */
+      getDeptTree() {
+        deptTreeSelect().then(response => {
+          this.deptOptions = response.data;
+        });
+      },
       /** 查询户口变更记录列表 */
       getList() {
         this.loading = true;
@@ -417,37 +262,6 @@
         this.open = false;
         this.reset();
       },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          acountNo: null,
-          jmId: null,
-          name: null,
-          idCard: null,
-          yJmId: null,
-          yName: null,
-          yIdCard: null,
-          bgReason: null,
-          xJmId: null,
-          xName: null,
-          xIdCard: null,
-          relation: null,
-          bgTime: null,
-          hjAddress: null,
-          jgNature: null,
-          longLive: null,
-          remark: null,
-          createBy: null,
-          createTime: null,
-          updateBy: null,
-          updateTime: null,
-          deptId: null,
-          userId: null,
-          deptName: null
-        };
-        this.resetForm("form");
-      },
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1;
@@ -458,64 +272,6 @@
         this.resetForm("queryForm");
         this.handleQuery();
       },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "添加户口变更记录";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const id = row.id || this.ids
-        getRecard(id).then(response => {
-          this.form = response.data;
-          this.open = true;
-          this.title = "修改户口变更记录";
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.id != null) {
-              updateRecard(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              addRecard(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-            }
-          }
-        });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除户口变更记录编号为"' + ids + '"的数据项？').then(function() {
-          return delRecard(ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download('szxc/recard/export', {
-          ...this.queryParams
-        }, `recard_${new Date().getTime()}.xlsx`)
-      }
     }
   };
 </script>