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

apps/web-antd/src/views/property/costManagement/houseCharge/data.ts

@@ -211,6 +211,7 @@ export const modalSchemaRefund: FormSchemaGetter = () => [
     label: '退费原因',
     fieldName: 'reason',
     component: 'Textarea',
-    formItemClass: 'col-span-2'
+    formItemClass: 'col-span-2',
+    rules:'required'
   },
 ]

apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-refund.vue

@@ -7,7 +7,7 @@ import {cloneDeep} from '@vben/utils';
 import {useVbenForm} from '#/adapter/form';
 import {
   houseChargeAdd,
-  houseChargeInfo,
+  houseChargeInfo, houseChargeRefund,
   houseChargeUpdate
 } from '#/api/property/costManagement/houseCharge';
 import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
@@ -83,9 +83,9 @@ async function handleConfirm() {
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
-    record.value.reason=data.reason
-    record.value.chargeStatus = '5'
-    await houseChargeUpdate(record.value) ;
+    data.costItemsId = record.value.costItemsId
+    data.personId = record.value.personId
+    await houseChargeRefund(data);
     resetInitialized();
     emit('reload');
     modalApi.close();
@@ -115,7 +115,7 @@ async function handleClosed() {
       </DescriptionsItem>
       <DescriptionsItem label="费用类型">
         <component
-            v-if="costItem"
+          v-if="costItem"
           :is="renderDict(costItem?.costType,'pro_expense_type')"
         />
       </DescriptionsItem>

apps/web-antd/src/views/property/costManagement/returnPayFee/data.ts

@@ -36,11 +36,11 @@ export const columns: VxeGridProps['columns'] = [
     field: 'payAcount',
     width: 100,
   },
-  {
-    title: '支付时间',
-    field: 'payTime',
-    width: 180,
-  },
+  // {
+  //   title: '支付时间',
+  //   field: 'payTime',
+  //   width: 180,
+  // },
   {
     title: '退款原因',
     field: 'reason',