同步6/16

src/views/system/storeroom/addStoreRoom.vue

@@ -15,9 +15,9 @@
             </el-col>
             <el-col :span="2"></el-col>
             <el-col :span="11">
-              <el-form-item label="单元" prop="unit">
-                <el-select v-model="form.unitNo" placeholder="请选择单元">
-                  <el-option v-for="item in units" :key="item.no" :label="item.name" :value="item.no" />
+              <el-form-item label="单元" prop="unitNoId">
+                <el-select v-model="form.unitNoId" placeholder="请选择单元">
+                  <el-option v-for="item in units" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -25,7 +25,7 @@
           <el-row>
             <el-col :span="11">
               <el-form-item label="储藏室号" prop="storeroomNo">
-                <el-input v-model.number="form.storeroomNo" placeholder="请输入储藏室号" />
+                <el-input v-model="form.storeroomNo" placeholder="请输入储藏室号" />
               </el-form-item>
             </el-col>
             <el-col :span="2"></el-col>
@@ -68,6 +68,7 @@ import PageHeader from '@/components/Pageheader/index.vue';
 import { getBuildinglistAPI, getBuildinglists, getBuildingOnly, getHouselistAPI } from '@/api/system/house';
 import { addStoreroom, getStoreroom, updateStoreroom } from '@/api/system/storeroom';
 import { StoreroomVO } from '@/api/system/storeroom/types';
+import { getByBUildingidtoUnitNo } from '@/api/system/houseUnit';
 
 const route = useRoute();
 const router = useRouter();
@@ -75,7 +76,8 @@ const formRef = ref();
 const form = ref<StoreroomVO>({
   id: null,
   buildingId: '',
-  unitNo: '',
+  unitNoId: '',
+  unitName: '',
   storeroomNo: '',
   houseArea: null,
   shareArea: null,
@@ -86,7 +88,7 @@ const form = ref<StoreroomVO>({
 });
 const rules = ref({
   buildingId: [{ required: true, message: '请选择楼栋', trigger: 'blur' }],
-  unitNo: [{ required: true, message: '请选择单元', trigger: 'blur' }],
+  unitNoId: [{ required: true, message: '请选择单元', trigger: 'blur' }],
   storeroomNo: [{ required: true, message: '请输入储藏室号', trigger: 'blur' }]
 });
 
@@ -103,9 +105,10 @@ function getStoreRoominfo(id: string) {
     };
     if (form.value.buildingId) {
       handleChangeBuild(form.value.buildingId, () => {
-        form.value.unitNo = res.data.unitNo;
+        form.value.unitNoId = res.data.unitNoId;
       });
     }
+    console.log(form.value);
   });
 }
 // 根据小区id获取楼栋单元
@@ -123,13 +126,8 @@ onMounted(() => {
 });
 // 根据楼栋id获取单元
 function handleChangeBuild(val: string, callback?: () => void) {
-  getBuildingOnly(val).then((res) => {
-    units.value = Array.from({ length: res.data.unitCount }).map((_, index) => {
-      return {
-        no: index + 1,
-        name: index + 1 + '单元'
-      };
-    });
+  getByBUildingidtoUnitNo(val).then((res) => {
+    units.value = res.data;
     callback && callback();
   });
 }