Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

src/views/modules/base/huji/immigration/edit.vue

@@ -261,6 +261,7 @@
           <el-select v-model.trim="fmData.householderRelation"
                      placeholder="与户主关系"
                      size="small"
+                     :disabled="initCheck == 1"
                      clearable
                      class="item_width_1">
             <el-option v-for="item in optionsRelation"
@@ -270,6 +271,24 @@
             </el-option>
           </el-select>
         </el-form-item>
+
+        <el-form-item prop="rhzk"
+                        label-width="150px"
+                        style="display: block"
+                         label="人户状况">
+            <el-select v-model.trim="fmData.rhzk"
+                     placeholder="人户状况"
+                     size="small"
+                     :disabled="initCheck == 1"
+                     clearable
+                     class="item_width_1">
+                <el-option v-for="item in optionsRhzk"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                </el-option>
+            </el-select>
+        </el-form-item>
       </el-form>
     </div>
     <div class="div_btn resi-btns">
@@ -314,7 +333,8 @@ function iniFmData () {
     moveNumber: '',
     householderRelation: '',
     alreadyHaveMaster: false,
-    isReplace: '0'
+    isReplace: '0',
+    rhzk: ''
   }
 }
 
@@ -342,6 +362,21 @@ export default {
         }
       ],
       optionsRelation: [],
+      // 人户状况
+      optionsRhzk: [
+        {
+            "value":"rhyz",
+            "label":"人户一致"
+        },
+        {
+            "value":"rzhbz",
+            "label":"人在户不在"
+        },
+        {
+            "value":"hzrbz",
+            "label":"户在人不在"
+        }
+      ],
 
       fmData: iniFmData(),
       areaProps: {

src/views/modules/base/huji/immigration/index.vue

@@ -290,6 +290,11 @@
                          min-width="100"
                          label="与户主关系">
         </el-table-column>
+        <el-table-column prop="rhzk"
+                         align="center"
+                         min-width="100"
+                         label="人户状况">
+        </el-table-column>
 
         <el-table-column fixed="right"
                          label="操作"