Merge remote-tracking branch 'origin/main'

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHkbgRecard.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 户口变更记录对象 szxc_hkbg_recard
  *
  * @author hs
- * @date 2024-03-21
+ * @date 2024-03-26
  */
 public class SzxcHkbgRecard extends BaseEntity
 {
@@ -21,30 +21,54 @@ public class SzxcHkbgRecard extends BaseEntity
     /** id */
     private Long id;
 
+    /** 户号 */
+    @Excel(name = "户号")
+    private Long acountNo;
+
     /** 居民id */
     @Excel(name = "居民id")
     private Long jmId;
 
-    /** 姓名 */
+    /** 居民姓名 */
-    @Excel(name = "姓名")
+    @Excel(name = "居民姓名")
     private String name;
 
-    /** 身份证号 */
+    /** 居民身份证号 */
-    @Excel(name = "身份证号")
+    @Excel(name = "居民身份证号")
     private String idCard;
 
-    /** 户号 */
+    /** 原居民id */
-    @Excel(name = "户号")
+    @Excel(name = "原居民id")
-    private Long acountNo;
+    private Long yJmId;
+
+    /** 原户主姓名 */
+    @Excel(name = "原户主姓名")
+    private String yName;
+
+    /** 原户主身份证号 */
+    @Excel(name = "原户主身份证号")
+    private String yIdCard;
+
+    /** 变更原因(字典) */
+    @Excel(name = "变更原因(字典)")
+    private String bgReason;
+
+    /** 原居民id */
+    @Excel(name = "原居民id")
+    private Long xJmId;
+
+    /** 新户主姓名 */
+    @Excel(name = "新户主姓名")
+    private String xName;
+
+    /** 新户主身份证号 */
+    @Excel(name = "新户主身份证号")
+    private String xIdCard;
 
     /** 与户主关系 */
     @Excel(name = "与户主关系")
     private String relation;
 
-    /** 变更类别 */
-    @Excel(name = "变更类别")
-    private String bgType;
-
     /** 变更编号 */
     @Excel(name = "变更编号")
     private String number;
@@ -54,10 +78,6 @@ public class SzxcHkbgRecard extends BaseEntity
     @Excel(name = "变更时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date bgTime;
 
-    /** 变更原因 */
-    @Excel(name = "变更原因")
-    private String bgReason;
-
     /** 部门id */
     @Excel(name = "部门id")
     private Long deptId;
@@ -75,6 +95,15 @@ public class SzxcHkbgRecard extends BaseEntity
     {
         return id;
     }
+    public void setAcountNo(Long acountNo)
+    {
+        this.acountNo = acountNo;
+    }
+
+    public Long getAcountNo()
+    {
+        return acountNo;
+    }
     public void setJmId(Long jmId)
     {
         this.jmId = jmId;
@@ -102,32 +131,77 @@ public class SzxcHkbgRecard extends BaseEntity
     {
         return idCard;
     }
-    public void setAcountNo(Long acountNo)
+    public void setyJmId(Long yJmId)
     {
-        this.acountNo = acountNo;
+        this.yJmId = yJmId;
     }
 
-    public Long getAcountNo()
+    public Long getyJmId()
     {
-        return acountNo;
+        return yJmId;
     }
-    public void setRelation(String relation)
+    public void setyName(String yName)
     {
-        this.relation = relation;
+        this.yName = yName;
     }
 
-    public String getRelation()
+    public String getyName()
     {
-        return relation;
+        return yName;
+    }
+    public void setyIdCard(String yIdCard)
+    {
+        this.yIdCard = yIdCard;
+    }
+
+    public String getyIdCard()
+    {
+        return yIdCard;
+    }
+    public void setBgReason(String bgReason)
+    {
+        this.bgReason = bgReason;
+    }
+
+    public String getBgReason()
+    {
+        return bgReason;
+    }
+    public void setxJmId(Long xJmId)
+    {
+        this.xJmId = xJmId;
+    }
+
+    public Long getxJmId()
+    {
+        return xJmId;
+    }
+    public void setxName(String xName)
+    {
+        this.xName = xName;
+    }
+
+    public String getxName()
+    {
+        return xName;
+    }
+    public void setxIdCard(String xIdCard)
+    {
+        this.xIdCard = xIdCard;
     }
-    public void setBgType(String bgType)
+
+    public String getxIdCard()
     {
-        this.bgType = bgType;
+        return xIdCard;
+    }
+    public void setRelation(String relation)
+    {
+        this.relation = relation;
     }
 
-    public String getBgType()
+    public String getRelation()
     {
-        return bgType;
+        return relation;
     }
     public void setNumber(String number)
     {
@@ -147,15 +221,6 @@ public class SzxcHkbgRecard extends BaseEntity
     {
         return bgTime;
     }
-    public void setBgReason(String bgReason)
-    {
-        this.bgReason = bgReason;
-    }
-
-    public String getBgReason()
-    {
-        return bgReason;
-    }
     public void setDeptId(Long deptId)
     {
         this.deptId = deptId;
@@ -179,15 +244,21 @@ public class SzxcHkbgRecard extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
+                .append("acountNo", getAcountNo())
                 .append("jmId", getJmId())
                 .append("name", getName())
                 .append("idCard", getIdCard())
-                .append("acountNo", getAcountNo())
+                .append("yJmId", getyJmId())
+                .append("yName", getyName())
+                .append("yIdCard", getyIdCard())
+                .append("bgReason", getBgReason())
+                .append("xJmId", getxJmId())
+                .append("xName", getxName())
+                .append("xIdCard", getxIdCard())
                 .append("relation", getRelation())
-                .append("bgType", getBgType())
                 .append("number", getNumber())
                 .append("bgTime", getBgTime())
-                .append("bgReason", getBgReason())
+                .append("remark", getRemark())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmInfo.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 居民信息对象 szxc_jm_info
  *
  * @author hs
- * @date 2024-03-18
+ * @date 2024-03-26
  */
 public class SzxcJmInfo extends BaseEntity
 {
@@ -122,6 +122,10 @@ public class SzxcJmInfo extends BaseEntity
     @Excel(name = "户号")
     private Long acountNo;
 
+    /** 核查状态（0待核查 1已核查） */
+    @Excel(name = "核查状态", readConverterExp = "0=待核查,1=已核查")
+    private String hcStatus;
+
     /** 是否注销 0:正常 1:注销 */
     @Excel(name = "是否注销 0:正常 1:注销")
     private String off;
@@ -364,6 +368,15 @@ public class SzxcJmInfo extends BaseEntity
     {
         return acountNo;
     }
+    public void setHcStatus(String hcStatus)
+    {
+        this.hcStatus = hcStatus;
+    }
+
+    public String getHcStatus()
+    {
+        return hcStatus;
+    }
     public void setOff(String off)
     {
         this.off = off;
@@ -412,6 +425,7 @@ public class SzxcJmInfo extends BaseEntity
                 .append("ills", getIlls())
                 .append("head", getHead())
                 .append("acountNo", getAcountNo())
+                .append("hcStatus", getHcStatus())
                 .append("off", getOff())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHkbgRecardMapper.xml

@@ -6,15 +6,21 @@
 
     <resultMap type="SzxcHkbgRecard" id="SzxcHkbgRecardResult">
         <result property="id"    column="id"    />
+        <result property="acountNo"    column="acount_no"    />
         <result property="jmId"    column="jm_id"    />
         <result property="name"    column="name"    />
         <result property="idCard"    column="id_card"    />
-        <result property="acountNo"    column="acount_no"    />
+        <result property="yJmId"    column="y_jm_id"    />
+        <result property="yName"    column="y_name"    />
+        <result property="yIdCard"    column="y_id_card"    />
+        <result property="bgReason"    column="bg_reason"    />
+        <result property="xJmId"    column="x_jm_id"    />
+        <result property="xName"    column="x_name"    />
+        <result property="xIdCard"    column="x_id_card"    />
         <result property="relation"    column="relation"    />
-        <result property="bgType"    column="bg_type"    />
         <result property="number"    column="number"    />
         <result property="bgTime"    column="bg_time"    />
-        <result property="bgReason"    column="bg_reason"    />
+        <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -24,21 +30,26 @@
     </resultMap>
 
     <sql id="selectSzxcHkbgRecardVo">
-        select id, jm_id, name, id_card, acount_no, relation, bg_type, number, bg_time, bg_reason, create_by, create_time, update_by, update_time, dept_id, user_id from szxc_hkbg_recard
+        select id, acount_no, jm_id, name, id_card, y_jm_id, y_name, y_id_card, bg_reason, x_jm_id, x_name, x_id_card, relation, number, bg_time, remark, create_by, create_time, update_by, update_time, dept_id, user_id from szxc_hkbg_recard
     </sql>
 
     <select id="selectSzxcHkbgRecardList" parameterType="SzxcHkbgRecard" resultMap="SzxcHkbgRecardResult">
         <include refid="selectSzxcHkbgRecardVo"/>
         <where>
+            <if test="acountNo != null "> and acount_no = #{acountNo}</if>
             <if test="jmId != null "> and jm_id = #{jmId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
-            <if test="acountNo != null "> and acount_no = #{acountNo}</if>
+            <if test="yJmId != null "> and y_jm_id = #{yJmId}</if>
+            <if test="yName != null  and yName != ''"> and y_name like concat('%', #{yName}, '%')</if>
+            <if test="yIdCard != null  and yIdCard != ''"> and y_id_card = #{yIdCard}</if>
+            <if test="bgReason != null  and bgReason != ''"> and bg_reason = #{bgReason}</if>
+            <if test="xJmId != null "> and x_jm_id = #{xJmId}</if>
+            <if test="xName != null  and xName != ''"> and x_name like concat('%', #{xName}, '%')</if>
+            <if test="xIdCard != null  and xIdCard != ''"> and x_id_card = #{xIdCard}</if>
             <if test="relation != null  and relation != ''"> and relation = #{relation}</if>
-            <if test="bgType != null  and bgType != ''"> and bg_type = #{bgType}</if>
             <if test="number != null  and number != ''"> and number = #{number}</if>
             <if test="bgTime != null "> and bg_time = #{bgTime}</if>
-            <if test="bgReason != null  and bgReason != ''"> and bg_reason = #{bgReason}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
         </where>
@@ -52,15 +63,21 @@
     <insert id="insertSzxcHkbgRecard" parameterType="SzxcHkbgRecard" useGeneratedKeys="true" keyProperty="id">
         insert into szxc_hkbg_recard
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="acountNo != null">acount_no,</if>
             <if test="jmId != null">jm_id,</if>
             <if test="name != null">name,</if>
             <if test="idCard != null">id_card,</if>
-            <if test="acountNo != null">acount_no,</if>
+            <if test="yJmId != null">y_jm_id,</if>
+            <if test="yName != null">y_name,</if>
+            <if test="yIdCard != null">y_id_card,</if>
+            <if test="bgReason != null">bg_reason,</if>
+            <if test="xJmId != null">x_jm_id,</if>
+            <if test="xName != null">x_name,</if>
+            <if test="xIdCard != null">x_id_card,</if>
             <if test="relation != null">relation,</if>
-            <if test="bgType != null">bg_type,</if>
             <if test="number != null">number,</if>
             <if test="bgTime != null">bg_time,</if>
-            <if test="bgReason != null">bg_reason,</if>
+            <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -69,15 +86,21 @@
             <if test="userId != null">user_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="acountNo != null">#{acountNo},</if>
             <if test="jmId != null">#{jmId},</if>
             <if test="name != null">#{name},</if>
             <if test="idCard != null">#{idCard},</if>
-            <if test="acountNo != null">#{acountNo},</if>
+            <if test="yJmId != null">#{yJmId},</if>
+            <if test="yName != null">#{yName},</if>
+            <if test="yIdCard != null">#{yIdCard},</if>
+            <if test="bgReason != null">#{bgReason},</if>
+            <if test="xJmId != null">#{xJmId},</if>
+            <if test="xName != null">#{xName},</if>
+            <if test="xIdCard != null">#{xIdCard},</if>
             <if test="relation != null">#{relation},</if>
-            <if test="bgType != null">#{bgType},</if>
             <if test="number != null">#{number},</if>
             <if test="bgTime != null">#{bgTime},</if>
-            <if test="bgReason != null">#{bgReason},</if>
+            <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -90,15 +113,21 @@
     <update id="updateSzxcHkbgRecard" parameterType="SzxcHkbgRecard">
         update szxc_hkbg_recard
         <trim prefix="SET" suffixOverrides=",">
+            <if test="acountNo != null">acount_no = #{acountNo},</if>
             <if test="jmId != null">jm_id = #{jmId},</if>
             <if test="name != null">name = #{name},</if>
             <if test="idCard != null">id_card = #{idCard},</if>
-            <if test="acountNo != null">acount_no = #{acountNo},</if>
+            <if test="yJmId != null">y_jm_id = #{yJmId},</if>
+            <if test="yName != null">y_name = #{yName},</if>
+            <if test="yIdCard != null">y_id_card = #{yIdCard},</if>
+            <if test="bgReason != null">bg_reason = #{bgReason},</if>
+            <if test="xJmId != null">x_jm_id = #{xJmId},</if>
+            <if test="xName != null">x_name = #{xName},</if>
+            <if test="xIdCard != null">x_id_card = #{xIdCard},</if>
             <if test="relation != null">relation = #{relation},</if>
-            <if test="bgType != null">bg_type = #{bgType},</if>
             <if test="number != null">number = #{number},</if>
             <if test="bgTime != null">bg_time = #{bgTime},</if>
-            <if test="bgReason != null">bg_reason = #{bgReason},</if>
+            <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml

@@ -31,6 +31,7 @@
         <result property="ills"    column="ills"    />
         <result property="head"    column="head"    />
         <result property="acountNo"    column="acount_no"    />
+        <result property="hcStatus"    column="hc_status"    />
         <result property="off"    column="off"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -40,7 +41,7 @@
     </resultMap>
 
     <sql id="selectSzxcJmInfoVo">
-        select id, dept_id, dept_name, name, old_name, nationality, card_id, born_date, age, sex, jg, relation, jg_nature, long_live, hj_address, phone, current_address, brqk, hy, xueli, zzmm, zjxy, jkzk, ills, head, acount_no, off, create_by, create_time, update_by, update_time, user_id from szxc_jm_info
+        select id, dept_id, dept_name, name, old_name, nationality, card_id, born_date, age, sex, jg, relation, jg_nature, long_live, hj_address, phone, current_address, brqk, hy, xueli, zzmm, zjxy, jkzk, ills, head, acount_no, hc_status,off, create_by, create_time, update_by, update_time, user_id from szxc_jm_info
     </sql>
 
     <select id="selectSzxcJmInfoList" parameterType="SzxcJmInfo" resultMap="SzxcJmInfoResult">
@@ -71,6 +72,7 @@
             <if test="ills != null  and ills != ''"> and ills = #{ills}</if>
             <if test="head != null  and head != ''"> and head = #{head}</if>
             <if test="acountNo != null "> and acount_no = #{acountNo}</if>
+            <if test="hcStatus != null  and hcStatus != ''"> and hc_status = #{hcStatus}</if>
             <if test="off != null  and off != ''"> and off = #{off}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <!-- <if test="deptId != null "> and dept_id = #{deptId}</if>-->
@@ -117,6 +119,7 @@
             <if test="ills != null">ills,</if>
             <if test="head != null and head != ''">head,</if>
             <if test="acountNo != null">acount_no,</if>
+            <if test="hcStatus != null">hc_status,</if>
             <if test="off != null and off != ''">off,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -150,6 +153,7 @@
             <if test="ills != null">#{ills},</if>
             <if test="head != null and head != ''">#{head},</if>
             <if test="acountNo != null">#{acountNo},</if>
+            <if test="hcStatus != null">#{hcStatus},</if>
             <if test="off != null and off != ''">#{off},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -187,6 +191,7 @@
             <if test="ills != null">ills = #{ills},</if>
             <if test="head != null and head != ''">head = #{head},</if>
             <if test="acountNo != null">acount_no = #{acountNo},</if>
+            <if test="hcStatus != null">hc_status = #{hcStatus},</if>
             <if test="off != null and off != ''">off = #{off},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

ruoyi-ui/src/views/szxc/recard/index.vue

@@ -1,26 +1,90 @@
 <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="name">
+      <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-item label="居民姓名" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入姓名"
+          placeholder="请输入居民姓名"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="身份证号" prop="idCard">
+      <el-form-item label="居民身份证号" prop="idCard">
         <el-input
           v-model="queryParams.idCard"
-          placeholder="请输入身份证号"
+          placeholder="请输入居民身份证号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="户号" prop="acountNo">
+      <el-form-item label="原居民id" prop="yJmId">
         <el-input
-          v-model="queryParams.acountNo"
+          v-model="queryParams.yJmId"
-          placeholder="请输入户号"
+          placeholder="请输入原居民id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="原户主姓名" prop="yName">
+        <el-input
+          v-model="queryParams.yName"
+          placeholder="请输入原户主姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="原户主身份证号" prop="yIdCard">
+        <el-input
+          v-model="queryParams.yIdCard"
+          placeholder="请输入原户主身份证号"
+          clearable
+          @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>
+      <el-form-item label="新户主姓名" prop="xName">
+        <el-input
+          v-model="queryParams.xName"
+          placeholder="请输入新户主姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="新户主身份证号" prop="xIdCard">
+        <el-input
+          v-model="queryParams.xIdCard"
+          placeholder="请输入新户主身份证号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -49,14 +113,6 @@
                         placeholder="请选择变更时间">
         </el-date-picker>
       </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="deptId">
         <el-input
           v-model="queryParams.deptId"
@@ -128,18 +184,25 @@
     <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="name" />
-      <el-table-column label="身份证号" align="center" prop="idCard" />
       <el-table-column label="户号" align="center" prop="acountNo" />
+      <el-table-column label="居民id" align="center" prop="jmId" />
+      <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="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="xName" />
+      <el-table-column label="新户主身份证号" align="center" prop="xIdCard" />
       <el-table-column label="与户主关系" align="center" prop="relation" />
-      <el-table-column label="变更类别" align="center" prop="bgType" />
       <el-table-column label="变更编号" align="center" prop="number" />
       <el-table-column label="变更时间" align="center" prop="bgTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.bgTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="变更原因" align="center" prop="bgReason" />
+      <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" class-name="small-padding fixed-width">
@@ -173,15 +236,39 @@
     <!-- 添加或修改户口变更记录对话框 -->
     <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="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="户号" 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>
@@ -196,8 +283,8 @@
                           placeholder="请选择变更时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="变更原因" prop="bgReason">
+        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.bgReason" placeholder="请输入变更原因" />
+          <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" />
@@ -243,14 +330,20 @@ export default {
         queryParams: {
           pageNum: 1,
           pageSize: 10,
+          acountNo: null,
+          jmId: null,
           name: null,
           idCard: null,
-        acountNo: null,
+          yJmId: null,
+          yName: null,
+          yIdCard: null,
+          bgReason: null,
+          xJmId: null,
+          xName: null,
+          xIdCard: null,
           relation: null,
-        bgType: null,
           number: null,
           bgTime: null,
-        bgReason: null,
           deptId: null,
           userId: null
         },
@@ -289,14 +382,21 @@ export default {
       reset() {
         this.form = {
           id: null,
+          acountNo: null,
+          jmId: null,
           name: null,
           idCard: null,
-        acountNo: null,
+          yJmId: null,
+          yName: null,
+          yIdCard: null,
+          bgReason: null,
+          xJmId: null,
+          xName: null,
+          xIdCard: null,
           relation: null,
-        bgType: null,
           number: null,
           bgTime: null,
-        bgReason: null,
+          remark: null,
           createBy: null,
           createTime: null,
           updateBy: null,