diff --git a/ruoyi-ui/src/views/szxc/jminfo/index.vue b/ruoyi-ui/src/views/szxc/jminfo/index.vue
index 6937109..f6ed810 100644
--- a/ruoyi-ui/src/views/szxc/jminfo/index.vue
+++ b/ruoyi-ui/src/views/szxc/jminfo/index.vue
@@ -1,10 +1,10 @@
 <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="deptId">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
+      <el-form-item label="所属组织" prop="deptId">
         <el-input
           v-model="queryParams.deptId"
-          placeholder="请输入部门id"
+          placeholder="请输入所属组织"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -57,14 +57,14 @@
                         placeholder="请选择出生日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="年龄" prop="age">
+<!--      <el-form-item label="年龄" prop="age">
         <el-input
           v-model="queryParams.age"
           placeholder="请输入年龄"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="籍贯" prop="jg">
         <el-input
           v-model="queryParams.jg"
@@ -73,14 +73,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="与户主关系" prop="relation">
+<!--      <el-form-item label="与户主关系" prop="relation">
         <el-input
           v-model="queryParams.relation"
           placeholder="请输入与户主关系"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="籍贯性质" prop="jgNature">
         <el-input
           v-model="queryParams.jgNature"
@@ -89,14 +89,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否常住" prop="longLive">
+<!--      <el-form-item label="是否常住" prop="longLive">
         <el-input
           v-model="queryParams.longLive"
           placeholder="请输入是否常住"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="户籍地址" prop="hjAddress">
         <el-input
           v-model="queryParams.hjAddress"
@@ -113,38 +113,50 @@
           @keyup.enter.native="handleQuery"
         />
       </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:非户主"
+          placeholder="是否户主"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+        >
+          <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="同户人员ids" prop="sameHeadIds">
+<!--      <el-form-item label="同户人员ids" prop="sameHeadIds">
         <el-input
           v-model="queryParams.sameHeadIds"
           placeholder="请输入同户人员ids"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="是否注销 0:正常 1:注销" prop="off">
-        <el-input
+      </el-form-item>-->
+      <el-form-item label="是否注销" prop="off">
+        <el-select
           v-model="queryParams.off"
-          placeholder="请输入是否注销 0:正常 1:注销"
+          placeholder="是否注销"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+        >
+          <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 label="创建者ID" prop="userId">
+<!--      <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-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>
@@ -197,10 +209,10 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="jminfoList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="jminfoList" @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="deptId" />
+      <el-table-column label="所属组织" align="center" prop="deptId" />
       <el-table-column label="所属网格" align="center" prop="deptName" />
       <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="曾用名" align="center" prop="oldName" />
@@ -252,67 +264,173 @@
     />
 
     <!-- 添加或修改居民信息对话框 -->
-    <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="是否户主 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>
+          <el-col :span="12">
+            <el-form-item label="所属组织" prop="deptId">
+              <el-input v-model="form.deptId" placeholder="请输入所属组织" />
+            </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>
+          <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>
+          <el-col :span="12">
+            <el-form-item label="国籍" prop="nationality">
+              <el-input v-model="form.nationality" placeholder="请输入国籍" />
+            </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>
+          <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>
+          <el-col :span="12">
+            <el-form-item label="籍贯" prop="jg">
+              <el-select v-model="form.jg" placeholder="请选择籍贯" style="width:100%;">
+                <el-option
+                  v-for="dict in dict.type.szxc_gj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="与户主关系" prop="relation">
+              <el-select v-model="form.relation" placeholder="请选择户主关系" style="width:100%;">
+                <el-option
+                  v-for="dict in dict.type.szxc_hzgx"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="籍贯性质" prop="jgNature">
+              <el-select v-model="form.jgNature" placeholder="请选择籍贯性质" style="width:100%;">
+                <el-option
+                  v-for="dict in dict.type.szxc_hjxz"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否常住" prop="longLive">
+              <el-select v-model="form.longLive" placeholder="请选择是否常住" style="width:100%;">
+                <el-option
+                  v-for="dict in dict.type.szxc_long_live"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <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="phone">
+              <el-input v-model="form.phone" placeholder="请输入手机号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否户主" prop="head">
+              <el-select v-model="form.head" placeholder="请选择籍贯" style="width:100%;">
+                <el-option
+                  v-for="dict in dict.type.szxc_head"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="同户人员ids" prop="sameHeadIds">
+              <el-input v-model="form.sameHeadIds" placeholder="请输入同户人员ids" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否注销" prop="off">
+              <el-select v-model="form.off" placeholder="请选择是否注销" style="width:100%;">
+                <el-option
+                  v-for="dict in dict.type.szxc_off"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="创建者ID" prop="userId">
+              <el-input v-model="form.userId" placeholder="请输入创建者ID" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -327,6 +445,7 @@
 
   export default {
     name: "Jminfo",
+    dicts: ['szxc_gj', 'szxc_hjxz', 'szxc_long_live', 'szxc_head', 'szxc_off', 'szxc_hzgx'],
     data() {
       return {
         // 遮罩层
@@ -376,7 +495,7 @@
         // 表单校验
         rules: {
           deptId: [
-            { required: true, message: "部门id不能为空", trigger: "blur" }
+            { required: true, message: "组织id不能为空", trigger: "blur" }
           ],
           head: [
             { required: true, message: "是否户主 0:户主 1:非户主不能为空", trigger: "blur" }