Merge branch 'v1.1' into dev

src/views/components/editResi.vue

@@ -277,6 +277,7 @@
                     :options="orgOptions"
                     :props="orgOptionProps"
                     @change="handleChangeAgency(index)"
+                    :disabled="rowItem.accessable === 0"
                   ></el-cascader>
                 </el-form-item>
               </el-col>
@@ -298,6 +299,7 @@
                     class="u-item-width-communitycascader f-bto0"
                     clearable
                     @change="handleChangeV(index)"
+                    :disabled="rowItem.accessable === 0"
                   >
                     <el-option
                       v-for="item in rowItem.optionsV"
@@ -323,6 +325,7 @@
                     clearable
                     @change="handleChangeB(index)"
                     class="u-item-width-buildcascader f-bto0"
+                    :disabled="rowItem.accessable === 0"
                   >
                     <el-option
                       v-for="item in rowItem.optionsB"
@@ -340,6 +343,7 @@
                   :rules="[
                     { required: true, message: '请选择单元', trigger: 'blur' },
                   ]"
+                  :disabled="rowItem.accessable === 0"
                 >
                   <el-select
                     v-model.trim="form.resideInfoDtos[index].unitId"
@@ -365,6 +369,7 @@
                   :rules="[
                     { required: true, message: '请选择房屋', trigger: 'blur' },
                   ]"
+                  :disabled="rowItem.accessable === 0"
                 >
                   <el-select
                     v-model.trim="form.resideInfoDtos[index].homeId"
@@ -373,6 +378,7 @@
                     clearable
                     class="u-item-width-buildcascader f-bto0"
                     @change="handleChangeH(index)"
+                    :disabled="rowItem.accessable === 0"
                   >
                     <el-option
                       v-for="item in rowItem.optionsH"
@@ -413,6 +419,7 @@
                     class="list_item_width_1"
                     @change="handelChangeResiHouseRel($event, index)"
                     clearable
+                    :disabled="rowItem.accessable === 0"
                   >
                     <el-option
                       v-for="(item, i) in dicts.resiHouseRelList"
@@ -431,6 +438,7 @@
                     size="small"
                     class="list_item_width_1"
                     clearable
+                    :disabled="rowItem.accessable === 0"
                   >
                     <el-option
                       v-for="(item, index) in dicts.householdSituationList"
@@ -452,6 +460,7 @@
                     size="small"
                     class="list_item_width_1"
                     clearable
+                    :disabled="rowItem.accessable === 0"
                   >
                     <el-option
                       v-for="(item, index) in dicts.houseHolderRelList"
@@ -473,6 +482,7 @@
                     placeholder="请输入内容"
                     size="small"
                     clearable
+                    :disabled="rowItem.accessable === 0"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -488,6 +498,7 @@
                     v-model="form.resideInfoDtos[index].currentResidence"
                     placeholder="请输入内容"
                     size="small"
+                    :disabled="rowItem.accessable === 0"
                     clearable
                   ></el-input>
                 </el-form-item>
@@ -508,6 +519,7 @@
                     placeholder="选择日期"
                     format="yyyy 年 MM 月 dd 日"
                     value-format="yyyy-MM-dd"
+                    :disabled="rowItem.accessable === 0"
                   >
                   </el-date-picker>
                 </el-form-item>