同步6/16

src/api/system/house/index.ts

@@ -166,6 +166,8 @@ export interface Storeroom {
   remark: string;
   unitNoId: string;
   unitNo: number;
+
+  unitNoName:string;
 }
 
 export interface Parking {

src/permission.ts

@@ -60,7 +60,7 @@ router.beforeEach(async (to, from) => {
       removeDynamicRoutes();
 
       // 获取用户信息
-      const [err, res] = await tos(userStore.getInfo());
+      const [err] = await tos(userStore.getInfo());
       if (err) {
         await userStore.logout();
         ElMessage.error(err);

src/store/modules/house.ts

@@ -1,7 +1,7 @@
-import { getCommunitylistAPI, getVillageByIdAPI } from '@/api/system/community';
+import { getVillageByIdAPI } from '@/api/system/community';
 import { communitylist_rows_type } from '@/api/system/community/type';
-import { deleteHouseApi, getBuildinglistAPI, getHouselistAPI, getVillageTree } from '@/api/system/house';
-import type { addBuildingType, BuildingUnit, BuildingVo } from '@/api/system/house/type';
+import { getBuildinglistAPI, getHouselistAPI, getVillageTree } from '@/api/system/house';
+import type { BuildingUnit, BuildingVo } from '@/api/system/house/type';
 import { convertBuildingToTree } from '@/utils/house';
 import { defineStore } from 'pinia';
 // 数字排序
@@ -13,7 +13,6 @@ function sortNumberStr(a: string, b: string) {
   if (!isNaN(numA) && !isNaN(numB)) {
     return numA - numB;
   }
-
   // 否则按自然语言排
   return a.localeCompare(b, 'zh-CN', { numeric: true });
 }

src/views/system/Sdb/SdbCashier/history.vue

@@ -103,7 +103,7 @@
             <div class="flex-1">交款人：</div>
             <div class="flex-1 flex flex-items-center">
               <span style="white-space: nowrap">收款人： </span>
-              <el-input v-model="inHomenyUse" v-if="!isPrint" placeholder="请输入收款人姓名" style="width: 150px"></el-input>
+              <el-input v-model="inHomelyUse" v-if="!isPrint" placeholder="请输入收款人姓名" style="width: 150px"></el-input>
               <span style="white-space: nowrap" v-else> {{ inHomelyUse }}</span>
             </div>
           </div>
@@ -197,7 +197,7 @@ function printPiaoju() {
     return;
   }
   isPrint.value = false;
-  inHomenyUse.value = '';
+  inHomelyUse.value = '';
   const query = {
     'residentId': props.query.residentId,
     'detailsIds': [...ids.value.map((item) => item.detailsId)]

src/views/system/Sdb/SdbCashier/index.vue

@@ -251,7 +251,7 @@ import { listChargeItem } from '@/api/system/SdbChargeItem';
 import { ref } from 'vue';
 import { printTicketDiv } from '@/utils/print';
 import { moneyAdd } from '@/utils/money';
-import { BuildingUnitlist, BuildingVo, FloorsType, HouseType } from '@/api/system/house/type';
+import { BuildingUnitlist, BuildingVo, FloorsType } from '@/api/system/house/type';
 import { ChargeItemVO } from '@/api/system/SdbChargeItem/type';
 import { communitylist_rows_type } from '@/api/system/community/type';
 

src/views/system/house/HouseDetails.vue

@@ -244,14 +244,7 @@ function editStoreRoom() {
     }
   });
 }
-function handleEditParking() {
-  router.push({
-    path: '/carArea/editParking',
-    query: {
-      id: HouseInfo.value.parking.parkingId
-    }
-  });
-}
+
 function handleEditUser(id: string) {
   router.push({
     path: '/house/editResident',