房屋详情，单元变更

src/views/system/house/HouseDetails.vue

@@ -4,9 +4,9 @@
     <div class="AddBuildingBody">
       <div class="title">
         <span>基本信息</span>
-        <el-button type="primary" text @click="editHouse">编辑</el-button>
+        <el-button v-hasPermi="['system:house:edit']" type="primary" text v-if="HouseInfo.house" @click="editHouse">编辑</el-button>
       </div>
-      <div class="addBuildingFormBody">
+      <div class="addBuildingFormBody" v-if="HouseInfo.house">
         <div class="descriptionsbox">
           <div class="label">房号:</div>
           <div class="value">{{ HouseInfo.house?.houseNo ?? '--' }}</div>
@@ -21,7 +21,7 @@
         </div>
         <div class="descriptionsbox">
           <div class="label">单元:</div>
-          <div class="value">{{ HouseInfo.house?.unitNo ?? '--' }} 单元</div>
+          <div class="value">{{ HouseInfo.house?.unitNoName ?? '--' }} 单元</div>
         </div>
         <div class="descriptionsbox">
           <div class="label">楼层:</div>
@@ -29,11 +29,11 @@
         </div>
         <div class="descriptionsbox">
           <div class="label">建筑面积:</div>
-          <div class="value">{{ HouseInfo.house?.houseArea ?? '--' }}㎡</div>
+          <div class="value">{{ HouseInfo.house?.houseArea ? `${HouseInfo.house?.houseArea} ㎡` : '--' }}</div>
         </div>
         <div class="descriptionsbox">
           <div class="label">公摊面积:</div>
-          <div class="value">{{ HouseInfo.house?.shareArea ?? '--' }}㎡</div>
+          <div class="value">{{ HouseInfo.house?.shareArea ? `${HouseInfo.house?.shareArea} ㎡` : '--' }}</div>
         </div>
         <div class="descriptionsbox">
           <div class="label">户型:</div>
@@ -44,14 +44,17 @@
           </div>
         </div>
       </div>
+      <div v-else class="w-full h-full flex flex-center min-h-4rem">
+        <span style="color: #999; font-weight: 500; font-size: 1.1rem; letter-spacing: 10px">暂无信息</span>
+      </div>
     </div>
     <!-- 储藏室信息 -->
     <div class="AddBuildingBody">
       <div class="title">
         <span>储藏室信息 </span>
-        <el-button type="primary" text @click="editStoreRoom">编辑</el-button>
+        <el-button v-hasPermi="['storeroom:storeroom:edit']" type="primary" text v-if="HouseInfo.storeroom" @click="editStoreRoom">编辑</el-button>
       </div>
-      <div class="addBuildingFormBody">
+      <div class="addBuildingFormBody" v-if="HouseInfo.storeroom">
         <div class="descriptionsbox">
           <div class="label">楼栋:</div>
           <div class="value">{{ HouseInfo.storeroom?.buildingName ?? '--' }}</div>
@@ -81,53 +84,70 @@
           <div class="value"></div>
         </div>
       </div>
+      <div v-else class="w-full h-full flex flex-center min-h-4rem">
+        <span style="color: #999; font-weight: 500; font-size: 1.1rem; letter-spacing: 10px">暂无信息</span>
+      </div>
     </div>
     <!-- 车位信息 -->
     <div class="AddBuildingBody">
       <div class="title">
         <span>车位信息</span>
-        <el-button type="primary" text @click="handleEditParking" v-if="HouseInfo.parking">编辑</el-button>
+        <el-button v-hasPermi="['parking:parking:edit']" type="primary" text @click="handleEditParking" v-if="HouseInfo.parking">编辑</el-button>
       </div>
       <div class="addBuildingFormBody" v-if="HouseInfo.parking">
         <div class="descriptionsbox">
           <div class="label">区域:</div>
-          <div class="value">{{ HouseInfo.storeroom?.shareArea ?? '--' }}</div>
+          <div class="value">{{ HouseInfo.parking?.areaName ?? '--' }}</div>
         </div>
         <div class="descriptionsbox">
           <div class="label">车位编号:</div>
-          <div class="value">18100000000</div>
+          <div class="value">{{ HouseInfo.parking?.parkingCode ?? '--' }}</div>
         </div>
         <div class="descriptionsbox">
           <div class="label">车位面积:</div>
-          <div class="value">2栋</div>
+          <div class="value">{{ HouseInfo.parking?.parkingArea ?? '--' }} ㎡</div>
         </div>
         <div class="descriptionsbox">
           <div class="label">楼层:</div>
-          <div class="value">2单元</div>
+          <div class="value">{{ HouseInfo.parking?.parkingFloor ?? '--' }}</div>
         </div>
         <div class="descriptionsbox">
           <div class="label">车位类型:</div>
-          <div class="value">3楼</div>
+          <div class="value">
+            <dict-tag :options="com_parking_type" :value="HouseInfo.parking.type" />
+          </div>
         </div>
         <div class="descriptionsbox">
           <div class="label">车位状态:</div>
-          <div class="value">112㎡</div>
+          <div class="value">
+            <dict-tag :options="com_parking_status" :value="HouseInfo.parking.parkingStatus" />
+          </div>
         </div>
         <div class="descriptionsbox">
           <div class="label">持有人:</div>
-          <div class="value">12㎡</div>
+          <div class="value">
+            <span>{{ HouseInfo.parking?.residentName ?? '--' }}</span>
+            <el-button
+              v-hasPermi="['parking:parking:edit']"
+              type="primary"
+              text
+              @click="handleEditUser(HouseInfo.parking.residentId)"
+              v-if="HouseInfo.parking"
+              >编辑</el-button
+            >
+          </div>
         </div>
         <div class="descriptionsbox">
           <div class="label">添加时间:</div>
-          <div class="value">3室2厅2卫</div>
+          <div class="value">{{ HouseInfo.parking?.createTime ?? '--' }}</div>
         </div>
         <div class="descriptionsbox">
           <div class="label">添加人:</div>
-          <div class="value">3室2厅2卫</div>
+          <div class="value">{{ HouseInfo.parking?.createName ?? '--' }}</div>
         </div>
         <div class="descriptionsbox">
           <div class="label">备注:</div>
-          <div class="value"></div>
+          <div class="value">{{ HouseInfo.parking?.remark ?? '--' }}</div>
         </div>
       </div>
       <div v-else class="w-full h-full flex flex-center min-h-4rem">
@@ -210,32 +230,12 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_resident_relationship } = toRefs<any>(proxy?.useDict('com_resident_relationship'));
 const { sys_user_sex } = toRefs<any>(proxy?.useDict('sys_user_sex'));
 const { com_pay_status } = toRefs<any>(proxy?.useDict('com_pay_status'));
-const tableData = [
-  {
-    date: '2016-05-03',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles'
-  },
-  {
-    date: '2016-05-02',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles'
-  },
-  {
-    date: '2016-05-04',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles'
-  },
-  {
-    date: '2016-05-01',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles'
-  }
-];
+const { com_parking_type } = toRefs<any>(proxy?.useDict('com_parking_type'));
+const { com_parking_status } = toRefs<any>(proxy?.useDict('com_parking_status'));
+
 const route = useRoute();
 const router = useRouter();
 const routeid = ref('');
-
 const HouseInfo = ref<Data>({
   billResidentList: [],
   chargeItemList: [],
@@ -262,12 +262,20 @@ function editStoreRoom() {
 }
 function handleEditParking() {
   router.push({
-    path: '/house/editParking',
+    path: '/carArea/editParking',
     query: {
       id: HouseInfo.value.parking.parkingId
     }
   });
 }
+function handleEditUser(id: string) {
+  router.push({
+    path: '/house/editResident',
+    query: {
+      id: id
+    }
+  });
+}
 function init() {
   if (route.query.id) {
     routeid.value = route.query.id as string;