diff --git a/ruoyi-ui/src/views/szxc/jminfo/index.vue b/ruoyi-ui/src/views/szxc/jminfo/index.vue
index a80f907..15f96a8 100644
--- a/ruoyi-ui/src/views/szxc/jminfo/index.vue
+++ b/ruoyi-ui/src/views/szxc/jminfo/index.vue
@@ -1,6 +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 :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="部门id" prop="deptId">
         <el-input
           v-model="queryParams.deptId"
@@ -33,13 +33,35 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="性别" prop="sex">
+        <el-select
+          v-model="queryParams.sex"
+          placeholder="性别"
+          clearable
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.sys_user_sex"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="国籍" prop="nationality">
-        <el-input
+        <el-select
           v-model="queryParams.nationality"
-          placeholder="请输入国籍"
+          placeholder="国籍"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_gj"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="身份证号" prop="cardId">
         <el-input
@@ -74,28 +96,49 @@
         />
       </el-form-item>
       <el-form-item label="与户主关系" prop="relation">
-        <el-input
+        <el-select
           v-model="queryParams.relation"
-          placeholder="请输入与户主关系"
+          placeholder="与户主关系"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          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="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="请输入是否常住"
+          placeholder="是否常住"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_long_live"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="户籍地址" prop="hjAddress">
         <el-input
@@ -122,92 +165,124 @@
         />
       </el-form-item>
       <el-form-item label="本人情况" prop="brqk">
-        <el-input
+        <el-select
           v-model="queryParams.brqk"
-          placeholder="请输入本人情况"
+          placeholder="本人情况"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_brqk"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="婚姻" prop="hy">
-        <el-input
+        <el-select
           v-model="queryParams.hy"
-          placeholder="请输入婚姻"
+          placeholder="婚姻"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_hyzk"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="学历" prop="xueli">
-        <el-input
+        <el-select
           v-model="queryParams.xueli"
-          placeholder="请输入学历"
+          placeholder="学历"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_xueli"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="政治面貌" prop="zzmm">
-        <el-input
+        <el-select
           v-model="queryParams.zzmm"
-          placeholder="请输入政治面貌"
+          placeholder="政治面貌"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_zzmm"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="宗教信仰" prop="zjxy">
-        <el-input
+        <el-select
           v-model="queryParams.zjxy"
-          placeholder="请输入宗教信仰"
+          placeholder="宗教信仰"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_zjxy"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="健康状况" prop="jkzk">
-        <el-input
+        <el-select
           v-model="queryParams.jkzk"
-          placeholder="请输入健康状况"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="疾病描述" prop="ills">
-        <el-input
-          v-model="queryParams.ills"
-          placeholder="请输入疾病描述"
+          placeholder="健康状况"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_jkzk"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="是否户主 0:户主 1:非户主" prop="head">
-        <el-input
+      <el-form-item label="是否户主" prop="head">
+        <el-select
           v-model="queryParams.head"
-          placeholder="请输入是否户主 0:户主 1:非户主"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="同户人员ids" prop="sameHeadIds">
-        <el-input
-          v-model="queryParams.sameHeadIds"
-          placeholder="请输入同户人员ids"
+          placeholder="是否户主"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_head"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="是否注销 0:正常 1:注销" prop="off">
-        <el-input
+      <el-form-item label="是否注销" prop="off">
+        <el-select
           v-model="queryParams.off"
-          placeholder="请输入是否注销 0:正常 1:注销"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建者ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入创建者ID"
+          placeholder="是否注销"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_off"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -314,7 +389,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -324,91 +399,323 @@
     />
 
     <!-- 添加或修改居民信息对话框 -->
-    <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="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="姓名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="曾用名" prop="oldName">
-          <el-input v-model="form.oldName" placeholder="请输入曾用名" />
-        </el-form-item>
-        <el-form-item label="国籍" prop="nationality">
-          <el-input v-model="form.nationality" placeholder="请输入国籍" />
-        </el-form-item>
-        <el-form-item label="身份证号" prop="cardId">
-          <el-input v-model="form.cardId" placeholder="请输入身份证号" />
-        </el-form-item>
-        <el-form-item label="出生日期" prop="bornDate">
-          <el-date-picker clearable
-            v-model="form.bornDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择出生日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="年龄" prop="age">
-          <el-input v-model="form.age" placeholder="请输入年龄" />
-        </el-form-item>
-        <el-form-item label="籍贯" prop="jg">
-          <el-input v-model="form.jg" 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="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="hjAddress">
-          <el-input v-model="form.hjAddress" placeholder="请输入户籍地址" />
-        </el-form-item>
-        <el-form-item label="手机号" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入手机号" />
-        </el-form-item>
-        <el-form-item label="现居住地" prop="currentAddress">
-          <el-input v-model="form.currentAddress" placeholder="请输入现居住地" />
-        </el-form-item>
-        <el-form-item label="本人情况" prop="brqk">
-          <el-input v-model="form.brqk" placeholder="请输入本人情况" />
-        </el-form-item>
-        <el-form-item label="婚姻" prop="hy">
-          <el-input v-model="form.hy" placeholder="请输入婚姻" />
-        </el-form-item>
-        <el-form-item label="学历" prop="xueli">
-          <el-input v-model="form.xueli" placeholder="请输入学历" />
-        </el-form-item>
-        <el-form-item label="政治面貌" prop="zzmm">
-          <el-input v-model="form.zzmm" placeholder="请输入政治面貌" />
-        </el-form-item>
-        <el-form-item label="宗教信仰" prop="zjxy">
-          <el-input v-model="form.zjxy" placeholder="请输入宗教信仰" />
-        </el-form-item>
-        <el-form-item label="健康状况" prop="jkzk">
-          <el-input v-model="form.jkzk" placeholder="请输入健康状况" />
-        </el-form-item>
-        <el-form-item label="疾病描述" prop="ills">
-          <el-input v-model="form.ills" placeholder="请输入疾病描述" />
-        </el-form-item>
-        <el-form-item label="是否户主 0:户主 1:非户主" prop="head">
-          <el-input v-model="form.head" placeholder="请输入是否户主 0:户主 1:非户主" />
-        </el-form-item>
-        <el-form-item label="同户人员ids" prop="sameHeadIds">
-          <el-input v-model="form.sameHeadIds" placeholder="请输入同户人员ids" />
-        </el-form-item>
-        <el-form-item label="是否注销 0:正常 1:注销" prop="off">
-          <el-input v-model="form.off" placeholder="请输入是否注销 0:正常 1:注销" />
-        </el-form-item>
-        <el-form-item label="创建者ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="户号" prop="acountNo">
+              <el-input v-model="queryParams.acountNo" placeholder="请输入户号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所属网格" prop="deptName">
+              <el-input v-model="form.deptName" placeholder="请输入所属网格" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="户籍地址" prop="hjAddress">
+              <el-input v-model="form.hjAddress" placeholder="请输入户籍地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="户籍性质" prop="jgNature">
+              <el-select
+                v-model="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-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="是否户主" prop="head">
+              <el-select
+                v-model="form.head"
+                placeholder="是否户主"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_head"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="与户主关系" prop="relation">
+              <el-select
+                v-model="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-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="是否常住" prop="longLive">
+              <el-select
+                v-model="form.longLive"
+                placeholder="是否常住"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_long_live"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否注销" prop="off">
+              <el-select
+                v-model="form.off"
+                placeholder="是否注销"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_off"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-divider content-position="left">人员基本信息</el-divider>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model="form.name" placeholder="请输入姓名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="曾用名" prop="oldName">
+              <el-input v-model="form.oldName" placeholder="请输入曾用名" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="国籍" prop="nationality">
+              <el-select
+                v-model="form.nationality"
+                placeholder="国籍"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_gj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="身份证号" prop="cardId">
+              <el-input v-model="form.cardId" placeholder="请输入身份证号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="出生日期" prop="bornDate">
+              <el-date-picker clearable style="width:100%;"
+                              v-model="form.bornDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择出生日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="年龄" prop="age">
+              <el-input v-model="form.age" placeholder="请输入年龄" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="性别" prop="sex">
+              <el-select
+                v-model="form.sex"
+                placeholder="性别"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_user_sex"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="籍贯" prop="jg">
+              <el-input v-model="form.jg" placeholder="请输入籍贯" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider content-position="left">联系信息</el-divider>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="手机号" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入手机号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="现居住地" prop="currentAddress">
+              <el-input v-model="form.currentAddress" placeholder="请输入现居住地" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider content-position="left">本人情况</el-divider>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="本人情况" prop="brqk">
+              <el-select
+                v-model="form.brqk"
+                placeholder="本人情况"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_brqk"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="婚姻" prop="hy">
+              <el-select
+                v-model="form.hy"
+                placeholder="婚姻"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_hyzk"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="学历" prop="xueli">
+              <el-select
+                v-model="form.xueli"
+                placeholder="学历"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_xueli"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="政治面貌" prop="zzmm">
+              <el-select
+                v-model="form.zzmm"
+                placeholder="政治面貌"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_zzmm"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="宗教信仰" prop="zjxy">
+              <el-select
+                v-model="form.zjxy"
+                placeholder="宗教信仰"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_zjxy"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="健康状况" prop="jkzk">
+              <el-select
+                v-model="form.jkzk"
+                placeholder="健康状况"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_jkzk"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="疾病描述" prop="ills">
+              <el-input v-model="form.ills" placeholder="请输入疾病描述" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -423,6 +730,8 @@ import { listJminfo, getJminfo, delJminfo, addJminfo, updateJminfo } from "@/api
 
 export default {
   name: "Jminfo",
+  dicts: ['szxc_hjxz', 'szxc_gj', 'szxc_head', 'szxc_hzgx', 'szxc_long_live', 'szxc_off', 'szxc_gj', 'sys_user_sex',
+    'szxc_brqk', 'szxc_hyzk', 'szxc_xueli', 'szxc_zjxy', 'szxc_jkzk'],
   data() {
     return {
       // 遮罩层