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

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

@@ -138,6 +138,7 @@
             placeholder="请输入姓名	"
             v-model="fmData.name"
             :disabled="formType === 'edit'"
+            maxlength="30"
           >
           </el-input>
 
@@ -199,7 +200,7 @@
             size="small"
             clearable
             class="item_width_1"
-            :disabled="formType === 'edit'"
+            :disabled="true"
           >
             <el-option
               v-for="item in optionsGender"
@@ -222,7 +223,7 @@
             show-word-limit
             placeholder="请输入"
             v-model="fmData.age"
-            :disabled="formType === 'edit'"
+            :disabled="true"
           >
           </el-input>
         </el-form-item>
@@ -235,9 +236,9 @@
         >
           <el-date-picker
             v-model="fmData.inTime"
-            type="datetime"
+            type="date"
             placeholder="迁入时间"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd"
             class="item_width_1"
             :disabled="formType === 'edit'"
           >
@@ -797,7 +798,7 @@ export default {
             })
           }
           this.btnDisable = true
-          if (this.fmData.isCheck && this.userInfo && this.userInfo.resiHomeId) {
+          if (this.fmData.isCheck == '1' && this.userInfo && this.userInfo.resiHomeId) {
             const { user } = this.$store.state
             if (user.agencyId == this.userInfo.resiAgencyId) {
               if (this.userInfo.resiHomeId !== this.fmData.homeId) {

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

@@ -53,9 +53,10 @@
                 <el-form-item prop="buildId">
                   <el-select
                     v-model.trim="fmData.buildId"
-                    placeholder="请选择楼号"
+                    placeholder="楼号"
                     size="small"
                     clearable
+                    :disabled="changeVDisabled"
                     class="resi-cell-select resi-cell-select-middle"
                     @change="handleChangeB"
                   >
@@ -71,9 +72,10 @@
                 <el-form-item prop="unitId">
                   <el-select
                     v-model.trim="fmData.unitId"
-                    placeholder="请选择单元"
+                    placeholder="单元"
                     size="small"
                     clearable
+                    :disabled="changeBDisabled"
                     class="resi-cell-select resi-cell-select-middle"
                     @change="handleChangeD"
                   >
@@ -89,9 +91,10 @@
                 <el-form-item prop="homeId">
                   <el-select
                     v-model.trim="fmData.homeId"
-                    placeholder="请选择房号"
+                    placeholder="房号"
                     size="small"
                     clearable
+                    :disabled="changeDDisabled"
                     class="resi-cell-select resi-cell-select-middle"
                   >
                     <el-option
@@ -1032,7 +1035,7 @@ export default {
     box-sizing: border-box;
     margin-right: 10px;
     &-middle {
-      width: 130px;
+      width: 120px;
     }
     &-small {
       width: 88px;