房屋管理功能完成，接下来储藏室

2026-04-09 12:40:17 +08:00
parent 6e998d4e87
commit 267a9a5f29
19 changed files with 1569 additions and 451 deletions
--- a/src/views/system/house/AddBuilding.vue
+++ b/src/views/system/house/AddBuilding.vue
@@ -84,7 +84,7 @@ if (buildingId) {
 function getBuildingById() {
  console.log(houseStore.currentBuildingInfoList);
  houseStore.currentBuildingInfoList.forEach((item) => {
-    if (item.id === parseInt(buildingId)) {
+    if (item.id == buildingId) {
      form.value.buildingName = item.buildingName;
      form.value.buildToward = item.buildToward;
      form.value.buildingUse = item.buildingUse;
@@ -104,7 +104,7 @@ const submitForm = () => {
        editBuildingApi({
          ...form.value,
          villageId: currentVilageInfo.value.villageId,
-          id: parseInt(buildingId)
+          id: buildingId
        })
          .then((res) => {
            ElMessage.success('修改成功');
--- a/src/views/system/house/AddHouse.vue
+++ b/src/views/system/house/AddHouse.vue
@@ -1,43 +1,43 @@
 <template>
  <div class="AddBuildingBox">
-    <PageHeader title="新建楼栋"></PageHeader>
+    <PageHeader :title="houseid ? '添加房屋' : '编辑房屋'"></PageHeader>
    <div class="AddBuildingBody">
      <div class="title">基本信息</div>
      <div class="addBuildingFormBody">
        <el-form class="formBody" label-position="left" ref="formRef" :model="form" :rules="rules" label-width="100px">
-          <el-form-item label="楼栋" prop="buildingID">
-            <el-select v-model="form.buildingID" class="m-2" placeholder="请选择">
-              <el-option v-for="item in building" :key="item.id" :label="item.name" :value="item.id" />
+          <el-form-item label="楼栋" prop="buildingId">
+            <el-select @change="handlechangeBuild" v-model="form.buildingId" class="m-2" placeholder="请选择">
+              <el-option v-for="item in houseStore.currentBuildingInfoList" :key="item.id" :label="item.buildingName" :value="item.id" />
            </el-select>
          </el-form-item>
          <el-form-item label="单元" prop="unit">
-            <el-select v-model="form.unit" class="m-2" placeholder="请选择">
+            <el-select v-model.number="form.unitNo" class="m-2" placeholder="请选择">
              <el-option v-for="item in units" :key="item.no" :label="item.name" :value="item.no" />
            </el-select>
          </el-form-item>
          <el-form-item label="楼层" prop="floor">
-            <el-select v-model="form.floor" class="m-2" placeholder="请选择">
+            <el-select v-model.number="form.floorNo" class="m-2" placeholder="请选择">
              <el-option v-for="item in floors" :key="item.no" :label="item.name" :value="item.no" />
            </el-select>
          </el-form-item>
-          <el-form-item label="房间号" prop="buildingName">
-            <el-input v-model="form.buildingName" placeholder="请输入房间号" />
+          <el-form-item label="房间号" prop="houseNo">
+            <el-input v-model="form.houseNo" placeholder="请输入房间号" />
          </el-form-item>
-          <el-form-item label="建筑面积" prop="buildingArea">
+          <el-form-item label="建筑面积" prop="houseArea">
            <div class="unitBox flex align-center">
-              <el-input v-model="form.buildingArea" placeholder="请输入建筑面积" />
+              <el-input v-model="form.houseArea" placeholder="请输入建筑面积" />
              <span>㎡</span>
            </div>
          </el-form-item>
-          <el-form-item label="套内面积" prop="internalFloorArea">
+          <el-form-item label="套内面积" prop="internalArea">
            <div class="unitBox flex align-center">
-              <el-input v-model="form.internalFloorArea" placeholder="请输入套内面积" />
+              <el-input v-model="form.internalArea" placeholder="请输入套内面积" />
              <span>㎡</span>
            </div>
          </el-form-item>
-          <el-form-item label="公摊面积" prop="CommonArea">
+          <el-form-item label="公摊面积" prop="shareArea">
            <div class="unitBox flex align-center">
-              <el-input v-model="form.CommonArea" placeholder="请输入公摊面积" />
+              <el-input v-model="form.shareArea" placeholder="请输入公摊面积" />
              <span>㎡</span>
            </div>
          </el-form-item>
@@ -51,7 +51,7 @@
              <span>卫</span>
            </div>
          </el-form-item>
-          <el-form-item label="车位号" prop="buildingAddress">
+          <!-- <el-form-item label="车位号" prop="buildingAddress">
            <el-select v-model="form.ParkingSpaceNumber" class="m-2" placeholder="请选择车位号">
              <el-option v-for="item in building" :key="item.id" :label="item.name" :value="item.id" />
            </el-select>
@@ -60,7 +60,7 @@
            <el-select v-model="form.storeroom" class="m-2" placeholder="请选择储藏室">
              <el-option v-for="item in building" :key="item.id" :label="item.name" :value="item.id" />
            </el-select>
-          </el-form-item>
+          </el-form-item> -->
          <el-form-item style="margin-top: 30px">
            <el-button type="primary" @click="submitForm">确定</el-button>
            <el-button @click="cancelForm">取消</el-button>
@@ -74,67 +74,110 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
+import { useHouseStore } from '@/store/modules/house';
+import { addHouseAPI, EditHouseApi, getHouseApi, getHouselistAPI } from '@/api/system/house';
+import { addHouseType } from '@/api/system/house/type';
+
+const router = useRouter();
+const route = useRoute();
+const houseStore = useHouseStore();
 const formRef = ref();
-const form = ref({
-  buildingID: '',
-  unit: '',
-  floor: '',
-  buildingName: '', // 房间号
-  buildingArea: '', //建筑面积
-  internalFloorArea: '', //套内面积
-  CommonArea: '', // 公摊面积
-  Housetype: '', // 房屋户型
-  ParkingSpaceNumber: '', // 车位号
-  storeroom: '' // 储藏室
+const form = ref<addHouseType>({
+  buildingId: '',
+  unitNo: '',
+  floorNo: '',
+  houseNo: '', // 房间号
+  houseArea: '', //建筑面积
+  internalArea: '', //套内面积
+  shareArea: '', // 公摊面积
+  houseType: '' // 房屋户型
 });
-const housetype = ref([]);
 const rules = ref({
-  buildingID: [{ required: true, message: '请输入楼栋', trigger: 'blur' }],
-  unit: [{ required: true, message: '请选择单元', trigger: 'blur' }],
-  floor: [{ required: true, message: '请选择楼层', trigger: 'blur' }],
+  buildingId: [{ required: true, message: '请输入楼栋', trigger: 'blur' }],
+  unitNo: [{ required: true, message: '请选择单元', trigger: 'blur' }],
+  floorNo: [{ required: true, message: '请选择楼层', trigger: 'blur' }],
  buildingName: [{ required: true, message: '请输入房间号', trigger: 'blur' }],
  buildingArea: [{ required: true, message: '请输入建筑面积', trigger: 'blur' }],
  internalFloorArea: [{ required: true, message: '请输入套内面积', trigger: 'blur' }],
  CommonArea: [{ required: true, message: '请输入公摊面积', trigger: 'blur' }]
 });
+const housetype = ref([]);
+const units = ref([]);
+const floors = ref([]);

-// 楼栋
-const building = ref([
-  {
-    id: '1',
-    name: '1号楼'
-  }
-]);
-const units = ref([
-  {
-    no: '1',
-    name: '1单元'
-  },
-  {
-    no: '2',
-    name: '2单元'
-  }
-]);
-const floors = ref([
-  {
-    no: '1',
-    name: '1层'
-  },
-  {
-    no: '2',
-    name: '2层'
-  }
-]);
+const houseid = ref(null);
+if (route.query.id) {
+  houseid.value = route.query.id;
+  getHouseApi(houseid.value).then((res) => {
+    form.value = {
+      ...form.value,
+      buildingId: res.data.buildingId, // 楼栋id
+      houseId: res.data.houseId, // 房屋id
+      unitNo: res.data.unitNo,
+      floorNo: res.data.floorNo,
+      houseNo: res.data.houseNo, // 房间号
+      houseArea: res.data.houseArea, //建筑面积
+      internalArea: res.data.internalArea, //套内面积
+      shareArea: res.data.shareArea // 公摊面积
+    };
+    housetype.value = res.data.houseType.split('');
+    handlechangeBuild(form.value.buildingId);
+    console.log(form.value);
+  });
+}

+// 选择楼栋
+function handlechangeBuild(id: string) {
+  getHouselistAPI(id).then((res) => {
+    units.value = Array.from({ length: res.data.unitCount }).map((_, index) => {
+      return {
+        no: index + 1,
+        name: index + 1 + '单元'
+      };
+    });
+    floors.value = Array.from({ length: res.data.floorCount }).map((_, index) => {
+      return {
+        no: index + 1,
+        name: index + 1 + '楼'
+      };
+    });
+    console.log(units.value, floors.value);
+  });
+}
 const submitForm = () => {
  formRef.value?.validate(async (valid: boolean) => {
    if (valid) {
-      console.log(form.value);
+      const data = {
+        ...form.value,
+        houseType: housetype.value.join(''),
+        villageId: houseStore.currentBuildingInfo.villageId
+      };
+      if (houseid.value) {
+        EditHouseApi(data).then(() => {
+          ElMessage.success('修改成功');
+          houseStore.switchBuilding(houseStore.currentBuildingInfo.id);
+          router.push({
+            path: '/house/houselist'
+          });
+        });
+      } else {
+        addHouseAPI(data).then((res) => {
+          console.log(res);
+          ElMessage.success('添加成功');
+          houseStore.switchBuilding(houseStore.currentBuildingInfo.id);
+          router.push({
+            path: '/house/houselist'
+          });
+        });
+      }
    }
  });
 };
 const cancelForm = () => {
-  console.log('取消');
+  formRef?.value.resetFields();
+  router.push({
+    path: '/house/houselist'
+  });
 };
 </script>

--- a/src/views/system/house/components/components/houseItem.vue
+++ b/src/views/system/house/components/components/houseItem.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="house-list">
    <div class="house flex align-center" @contextmenu="contextMenu.open($event, house.houseId)" v-for="house in list.houses" :key="house.houseId">
-      <el-checkbox @click="handleClick(house)" :label="house.houseNo" :value="house.houseId" />
+      <el-checkbox :label="house.houseNo" :value="house.houseId" />
    </div>
    <!-- 右键菜单组件 -->
    <ContextMenu ref="contextMenu" :menu="menuList" @select="handleSelect" />
@@ -20,23 +20,15 @@ const props = defineProps<{
    value: string;
  }[];
 }>();
-const list = props.unit.find((item) => item.floorNo === props.fIdx);
-const checked = ref<string[]>([]);
+const list = props.unit.find((item) => item.floorNo === props.fIdx) ?? { floorNo: '', houses: [] };
 // 菜单ref
 const contextMenu = ref();
 // 点击事件
 const handleSelect = (data: { type: string; value: string }) => {
  emit('contextmenufun', data);
 };
-function handleClick(house: HouseType) {
-  checked.value = checked.value.includes(house.houseId)
-    ? checked.value.filter((item) => item !== house.houseId)
-    : checked.value.concat(house.houseId);
-  emit('change', checked.value);
-}

 const emit = defineEmits<{
-  change: [value: string[]];
  contextmenufun: [value: { type: string; value: string }];
 }>();
 </script>
--- a/src/views/system/house/components/components/table.vue
+++ b/src/views/system/house/components/components/table.vue
@@ -1,43 +1,56 @@
 <template>
-  <div class="TableBox p-5 h-full">
-    <el-table border :data="houseStore.currentFloorInfoList">
-      <el-table-column align="center" fixed label="楼层\单元" min-width="85">
-        <template #default="{ row }">
-          <span>{{ row }}楼</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        min-width="160"
-        class="column"
-        align="center"
-        :label="`${unit.unitNo}单元`"
-        v-for="(unit, index) in houseStore.currentHouseInfoList?.units ?? []"
-        :key="index"
-      >
-        <template #default="{ row }">
-          <houseItem @contextmenufun="contextMenuFun" @change="handleChange" :menu-list="menutlist" :unit="unit.floors" :f-idx="row"></houseItem>
-        </template>
-      </el-table-column>
-    </el-table>
+  <div class="TableBox p-5 h-full" v-if="houseStore.currentHouseInfoList !== null">
+    <el-checkbox-group @change="handleChangeCheckhouses" v-model="houseStore.checkoutHouses">
+      <el-table border :data="houseStore.currentFloorInfoList">
+        <el-table-column align="center" fixed label="楼层\单元" min-width="85">
+          <template #default="{ row }">
+            <span>{{ row }}楼</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          min-width="160"
+          class="column"
+          align="center"
+          :label="`${unit.unitNo}单元`"
+          v-for="(unit, index) in houseStore.currentHouseInfoList?.units ?? []"
+          :key="index"
+        >
+          <template #default="{ row }">
+            <houseItem @contextmenufun="contextMenuFun" :menu-list="menutlist" :unit="unit.floors" :f-idx="row"></houseItem>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-checkbox-group>
  </div>
 </template>

 <script setup lang="ts">
+import { deleteHouseApi } from '@/api/system/house';
 import houseItem from './houseItem.vue';
 import { useHouseStore } from '@/store/modules/house';
 const houseStore = useHouseStore();
-const { currentHouseInfoList, currentFloorInfoList } = storeToRefs(houseStore); // 数据
-console.log(currentHouseInfoList);
+
+const router = useRouter();
 const menutlist = [
  { label: '编辑', value: 'edit' },
  { label: '收费标准', value: 'money' },
  { label: '详情', value: 'main' },
  { label: '删除', value: 'delete' }
 ];
+function handleChangeCheckhouses(val: string[]) {
+  houseStore.checkoutHousesFun([]);
+  houseStore.checkoutHousesFun(val);
+}
 function contextMenuFun(val: { type: string; value: string }) {
  switch (val.type) {
    case 'edit':
      console.log('你选择了：', val);
+      router.push({
+        path: '/house/addHouse',
+        query: {
+          id: val.value
+        }
+      });
      break;
    case 'money':
      console.log('你选择了：', val);
@@ -47,13 +60,13 @@ function contextMenuFun(val: { type: string; value: string }) {
      break;
    case 'delete':
      console.log('你选择了：', val);
-      houseStore.deleteHouseFun(val.value);
+      deleteHouseApi(val.value).then(() => {
+        ElMessage.success('删除成功');
+        houseStore.switchBuilding(houseStore.currentBuildingInfo.id);
+      });
      break;
  }
 }
-function handleChange(data: string[]) {
-  houseStore.checkoutHousesFun(data);
-}
 </script>

 <style scoped lang="scss">
--- a/src/views/system/house/components/unit.vue
+++ b/src/views/system/house/components/unit.vue
@@ -12,7 +12,7 @@
      <div class="rightActions">
        <span class="mr-20px" @click="handleAddHouse">+增加房屋</span>
        <span class="mr-20px">收费标准设置</span>
-        <span>删除</span>
+        <span @click="deleteAllhouse">删除</span>
      </div>
    </div>
    <div class="UnitBody">
@@ -22,6 +22,7 @@
 </template>

 <script setup lang="ts">
+import { deleteHouseApi } from '@/api/system/house';
 import TableUnit from './components/table.vue';
 import { useHouseStore } from '@/store/modules/house';
 const houseStore = useHouseStore();
@@ -31,6 +32,25 @@ function handleAddHouse() {
    path: '/house/addHouse'
  });
 }
+
+function deleteAllhouse() {
+  const checkhouse = houseStore.checkoutHouses;
+  console.log(checkhouse);
+  if (checkhouse.length > 0) {
+    let deletecount = 0;
+    checkhouse.forEach((item) => {
+      deleteHouseApi(item).then(() => {
+        deletecount++;
+        if (deletecount === checkhouse.length - 1) {
+          ElMessage.success('批量删除成功');
+          houseStore.switchBuilding(houseStore.currentBuildingInfo.id);
+        }
+      });
+    });
+  } else {
+    ElMessage.warning('请选择要删除的房屋');
+  }
+}
 </script>

 <style scoped lang="scss">