Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

apps/web-antd/src/api/property/carCharge/index.ts

@@ -59,3 +59,7 @@ export function carChargeUpdate(data: CarChargeForm) {
 export function carChargeRemove(id: ID | IDS) {
   return requestClient.deleteWithMsg<void>(`/property/carCharge/${id}`);
 }
+
+export function carChargeRefund(data: CarChargeForm) {
+  return requestClient.postWithMsg<void>('/property/carCharge/returnFee', data);
+}

apps/web-antd/src/api/property/carCharge/model.d.ts

@@ -16,6 +16,7 @@ export interface CarChargeVO {
    */
   personId: string | number;
 
+  chargeItem:string
   /**
    * 楼层
    */
@@ -55,6 +56,10 @@ export interface CarChargeVO {
    * 搜索值
    */
   searchValue: string;
+  amountReceivable?:any;
+  chargeStatus:any;
+  payType:any;
+  chargeCycle:any
 
 }
 

apps/web-antd/src/api/property/costMeterWater/index.ts

@@ -58,4 +58,9 @@ export function costMeterWaterUpdate(data: CostMeterWaterForm) {
  */
 export function costMeterWaterRemove(id: ID | IDS) {
   return requestClient.deleteWithMsg<void>(`/property/meterWater/${id}`);
+}
+
+// 根据业主id查询
+export function ultimoWater(id: ID | IDS) {
+  return requestClient.get<any>(`/property/meterWater/ultimoWater/${id}`);
 }

apps/web-antd/src/api/property/costMeterWater/model.d.ts

@@ -51,6 +51,8 @@ export interface CostMeterWaterVO {
    * 搜索值
    */
   searchValue: string;
+  costType:string;
+  userId:string;
 
 }