楼栋增删改查完成， 接着房屋

src/views/system/house/AddBuilding.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="AddBuildingBox">
-    <PageHeader title="新建楼栋"></PageHeader>
+    <PageHeader title="新建楼栋">
+      <template #operate>
+        <div class="BackBox" @click="goBack">返回</div>
+      </template>
+    </PageHeader>
     <div class="AddBuildingBody">
       <div class="title">基本信息</div>
       <div class="addBuildingFormBody">
@@ -8,11 +12,16 @@
           <el-form-item label="楼栋名称" prop="buildingName">
             <el-input v-model.trim="form.buildingName" placeholder="请输入楼栋名称" />
           </el-form-item>
+          <el-form-item label="楼栋类型" prop="buildingUse">
+            <el-select v-model="form.buildingUse" placeholder="选择楼栋类型">
+              <el-option v-for="(item, index) in housetypelist" :key="index" :label="item" :value="index"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="楼栋朝向" prop="buildToward">
             <el-input v-model.trim="form.buildToward" placeholder="请输入楼栋朝向" />
           </el-form-item>
           <el-form-item label="楼高(m)" prop="buildTail">
-            <el-input v-model.trim="form.buildTail" placeholder="请输入楼高(m)" />
+            <el-input v-model.trim="form.buildTall" placeholder="请输入楼高(m)" />
           </el-form-item>
           <el-form-item label="楼栋结构" prop="buildStructure">
             <el-input v-model.trim="form.buildStructure" placeholder="请输入楼栋结构" />
@@ -37,55 +46,119 @@
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { getCommunitylistAPI } from '@/api/system/community';
-import { addBuildingApi } from '@/api/system/house';
+import { addBuildingApi, editBuildingApi } from '@/api/system/house';
+import { useRouter } from 'vue-router';
+import { useHouseStore } from '@/store/modules/house';
+
+const houseStore = useHouseStore();
+const { currentVilageInfo } = storeToRefs(houseStore);
+const route = useRoute();
+const router = useRouter();
 const formRef = ref();
 const form = ref({
   buildingName: '',
   buildToward: '',
-  buildTail: '',
+  buildTall: '',
+  buildingUse: 0,
   buildStructure: '',
   unitCount: null,
   floorCount: null
 });
+const housetypelist = ['住宅', '办公', '商用', '公寓'];
 const rules = ref({
   buildingName: [{ required: true, message: '请输入楼栋名称', trigger: 'blur' }],
+  buildingUse: [{ required: true, message: '请选择楼栋类型', trigger: 'blur' }],
   unitCount: [{ required: true, message: '请输入单元数', trigger: 'blur' }],
   floorCount: [{ required: true, message: '请输入楼层数', trigger: 'blur' }]
 });
+// 判断新增还是编辑
+const buildingId = route.query.buildingId as string;
+if (buildingId) {
+  console.log('edit');
+  getBuildingById();
+} else {
+  console.log('add');
+}
 
-// 获取当前小区信息
-const currentVilageinfo = ref();
-function getVilageFun() {
-  getCommunitylistAPI().then((res) => {
-    currentVilageinfo.value = res.rows.find((item) => item.choiceStatus === 0);
+/** 编辑楼栋 */
+function getBuildingById() {
+  console.log(houseStore.currentBuildingInfoList);
+  houseStore.currentBuildingInfoList.forEach((item) => {
+    if (item.id === parseInt(buildingId)) {
+      form.value.buildingName = item.buildingName;
+      form.value.buildToward = item.buildToward;
+      form.value.buildingUse = item.buildingUse;
+      form.value.buildTall = item.buildTall;
+      form.value.buildStructure = item.buildStructure;
+      form.value.unitCount = item.unitCount;
+      form.value.floorCount = item.floorCount;
+    }
   });
 }
-// getVilageFun();
 const submitForm = () => {
   formRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       console.log(form.value);
-      addBuildingApi({
-        ...form.value,
-        villageId: currentVilageinfo.value.id
-      })
-        .then((res) => {
-          console.log(res);
-          ElMessage.success('添加成功');
+      if (buildingId) {
+        console.log('修改');
+        editBuildingApi({
+          ...form.value,
+          villageId: currentVilageInfo.value.villageId,
+          id: parseInt(buildingId)
         })
-        .catch((err) => {
-          console.log(err);
-          ElMessage.error('添加失败');
-        });
+          .then((res) => {
+            ElMessage.success('修改成功');
+            houseStore.updateHouse();
+            cancelForm();
+          })
+          .catch((err) => {
+            ElMessage.error('修改失败');
+          });
+      } else {
+        console.log(' 添加');
+        addBuildingApi({
+          ...form.value,
+          villageId: currentVilageInfo.value.villageId
+        })
+          .then((res) => {
+            ElMessage.success('添加成功');
+            houseStore.updateHouse();
+            cancelForm();
+          })
+          .catch((err) => {
+            ElMessage.error('添加失败');
+          });
+      }
     }
   });
 };
 const cancelForm = () => {
   formRef.value?.resetFields();
+  goBack();
 };
+
+function goBack() {
+  router.push({
+    path: '/house/houselist'
+  });
+}
 </script>
 
 <style scoped lang="scss">
+.BackBox {
+  width: 100px;
+  height: 45px;
+  line-height: 40px;
+  text-align: center;
+  border-radius: 5px;
+  color: rgba(16, 16, 16, 1);
+  border: 1px solid rgba(187, 187, 187, 1);
+  cursor: pointer;
+  font-size: 14px;
+  &:hover {
+    box-shadow: 0px 2px 6px 0px rgba(26, 117, 255, 0.1);
+  }
+}
 .AddBuildingBox {
   padding: 15px;
   height: 100%;