同步6/16

src/views/system/houseRental/addhouseResident.vue

@@ -13,8 +13,8 @@
             </el-col>
             <el-col :span="2"></el-col>
             <el-col :span="11">
-              <el-form-item label="租户姓名" prop="rentalName">
-                <el-input v-model="form.rentalName" placeholder="请输入住户姓名" />
+              <el-form-item label="业主姓名" prop="rentalName">
+                <el-input disabled v-model="form.rentalName" placeholder="请输入业主姓名" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -94,7 +94,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="房屋设施" prop="type">
-                <div class="housedevicesbox">
+                <div class="housedevicesbox" v-if="housefacilities.length > 0">
                   <div
                     v-for="item in housefacilities"
                     :key="item.id"
@@ -108,6 +108,7 @@
                     <span class="ml-2">{{ item.name }}</span>
                   </div>
                 </div>
+                <span v-else style="color: gray"> 无</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -181,7 +182,7 @@ import { HouseRentalVO } from '@/api/system/houseRental/type';
 import { CascaderValue, UploadInstance, UploadProps, UploadUserFile } from 'element-plus';
 
 import { getHousePathById, hasFormData, splitStringUrl } from '@/utils/house';
-import { addHouseRental, getHouseRental, updateHouseRental, uploadHouseImage } from '@/api/system/houseRental';
+import { addHouseRental, getHouseOwnUser, getHouseRental, updateHouseRental, uploadHouseImage } from '@/api/system/houseRental';
 import { validator } from '@/utils/Reg';
 import { useHouseStore } from '@/store/modules/house';
 import { listHouseFacilities } from '@/api/system/HouseFacilities';
@@ -241,7 +242,12 @@ const housefacilities = ref([]);
 // !==  楼栋房屋  =============================================================================
 async function gettreedata() {
   const reslist = await listHouseFacilities();
-  housefacilities.value = reslist.rows;
+  housefacilities.value = reslist.rows
+    .map((item) => {
+      if (item.status !== '1') return item;
+      return false;
+    })
+    .filter((item) => item !== false);
 
   treedata.value = await houseStore.getCurrentVilageTreeHouse();
   if (route.query.id) {
@@ -265,6 +271,10 @@ gettreedata();
 function handleChange(val: CascaderValue) {
   userHousepath.value = val;
   form.value.houseId = val[2];
+
+  getHouseOwnUser(val[2]).then((res) => {
+    form.value.rentalName = res.msg;
+  });
 }
 // !== 上传文件 =============================================================================
 const fileList = ref<UploadUserFile[]>([]);