Merge branch 'dev-huji' into dev

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

@@ -21,6 +21,7 @@
             size="small"
             clearable
             class="item_width_1"
+            :disabled="formType === 'edit'"
             @change="handleChangeGrid"
           >
             <el-option
@@ -47,6 +48,7 @@
             class="resi-cell-select"
             @clear="handleClearVillage"
             @change="handleChangeV"
+            :disabled="formType === 'edit'"
             style="margin-right: 8px; width: 120px"
           >
             <el-option
@@ -64,7 +66,7 @@
             clearable
             style="margin-right: 8px; width: 120px"
             class="resi-cell-select"
-            :disabled="changeVDisabled"
+            :disabled="changeVDisabled || formType === 'edit'"
             @clear="handleClearBuild"
             @change="handleChangeB"
           >
@@ -78,7 +80,7 @@
           </el-select>
           <el-select
             v-model.trim="fmData.unitId"
-            :disabled="changeBDisabled"
+            :disabled="changeBDisabled || formType === 'edit'"
             placeholder="单元"
             size="small"
             clearable
@@ -97,7 +99,7 @@
           </el-select>
           <el-select
             v-model.trim="fmData.homeId"
-            :disabled="changeDDisabled"
+            :disabled="changeDDisabled || formType === 'edit'"
             placeholder="房号"
             size="small"
             clearable
@@ -126,16 +128,18 @@
             style="margin-right: 20px"
             placeholder="请输入姓名	"
             v-model="fmData.name"
+            :disabled="formType === 'edit'"
           >
           </el-input>
 
-          <el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0"
+          <el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0" :disabled="formType === 'edit'"
             >享受福利</el-checkbox
           >
           <el-checkbox
             v-model="fmData.isCheck"
             true-label="1"
             false-label="0"
+            :disabled="formType === 'edit'"
             @change="checkResiAvailable"
             >补充居民信息</el-checkbox
           >
@@ -153,6 +157,7 @@
             maxlength="11"
             show-word-limit
             placeholder="请输入手机号	"
+            :disabled="formType === 'edit'"
             v-model="fmData.mobile"
           >
           </el-input>
@@ -168,6 +173,7 @@
             class="item_width_1"
             placeholder="请输入身份证号"
             v-model="fmData.idCard"
+            :disabled="formType === 'edit'"
             @blur="handleBlurId"
           ></el-input>
         </el-form-item>
@@ -184,6 +190,7 @@
             size="small"
             clearable
             class="item_width_1"
+            :disabled="formType === 'edit'"
           >
             <el-option
               v-for="item in optionsGender"
@@ -204,8 +211,9 @@
             class="item_width_1"
             type="number"
             show-word-limit
-            placeholder="请输入手机号	"
+            placeholder="请输入"
             v-model="fmData.age"
+            :disabled="formType === 'edit'"
           >
           </el-input>
         </el-form-item>
@@ -222,6 +230,7 @@
             placeholder="迁入时间"
             value-format="yyyy-MM-dd HH:mm:ss"
             class="item_width_1"
+            :disabled="formType === 'edit'"
           >
           </el-date-picker>
         </el-form-item>
@@ -541,6 +550,8 @@ export default {
       this.fmData.buildId = ''
       this.fmData.unitId = ''
       this.fmData.homeId = ''
+      this.fmData.householderName = ''
+      this.fmData.householderRelation = ''
       this.getValiheList()
     },
     handleChangeV(val) {
@@ -548,17 +559,23 @@ export default {
       this.fmData.buildId = ''
       this.fmData.unitId = ''
       this.fmData.homeId = ''
+      this.fmData.householderName = ''
+      this.fmData.householderRelation = ''
       this.getBuildList()
     },
     handleChangeB(val) {
       console.log('val', val)
       this.fmData.unitId = ''
       this.fmData.homeId = ''
+      this.fmData.householderName = ''
+      this.fmData.householderRelation = ''
       this.getUniList()
     },
     handleChangeD(val) {
       console.log('val', val)
       this.fmData.homeId = ''
+      this.fmData.householderName = ''
+      this.fmData.householderRelation = ''
       this.getHouseList()
     },
     handleChangeH(val) {

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

@@ -523,7 +523,7 @@ export default {
     this.getGridList()
     this.getValiheList()
     this.getTableData()
-    this.searchH = this.$refs.searchCard.$el.offsetHeight + 260
+    this.searchH = this.$refs.searchCard.$el.offsetHeight + 270
     console.log('searchH----', this.$refs.searchCard.$el.offsetHeight)
   },
   methods: {