diff --git a/apps/web-antd/src/api/property/costManagement/costItemSetting/model.d.ts b/apps/web-antd/src/api/property/costManagement/costItemSetting/model.d.ts index 732e49fb..d96b2701 100644 --- a/apps/web-antd/src/api/property/costManagement/costItemSetting/model.d.ts +++ b/apps/web-antd/src/api/property/costManagement/costItemSetting/model.d.ts @@ -70,6 +70,7 @@ export interface CostItemSettingVO { * 搜索值 */ searchValue: string; + chargeNo: string; } diff --git a/apps/web-antd/src/api/property/costManagement/houseCharge/index.ts b/apps/web-antd/src/api/property/costManagement/houseCharge/index.ts index cbf2d544..52efd66e 100644 --- a/apps/web-antd/src/api/property/costManagement/houseCharge/index.ts +++ b/apps/web-antd/src/api/property/costManagement/houseCharge/index.ts @@ -54,6 +54,14 @@ export function houseChargeRefund(data: HouseChargeForm) { export function houseChargeUpdate(data: HouseChargeForm) { return requestClient.putWithMsg('/property/houseCharge', data); } +/** + * 更正房屋收费 + * @param data + * @returns void + */ +export function houseChargeAddFee(data: HouseChargeForm) { + return requestClient.postWithMsg('/property/houseCharge/addFee', data); +} /** * 删除房屋收费 diff --git a/apps/web-antd/src/api/property/costManagement/houseCharge/model.d.ts b/apps/web-antd/src/api/property/costManagement/houseCharge/model.d.ts index 5d48ef7e..80fa49d3 100644 --- a/apps/web-antd/src/api/property/costManagement/houseCharge/model.d.ts +++ b/apps/web-antd/src/api/property/costManagement/houseCharge/model.d.ts @@ -43,7 +43,7 @@ export interface HouseChargeVO { */ remark: string; - chargeTime: any[]; + chargeTime: string; /** * 缴费周期 */ diff --git a/apps/web-antd/src/views/property/costManagement/houseCharge/data.ts b/apps/web-antd/src/views/property/costManagement/houseCharge/data.ts index 83284371..3d50f499 100644 --- a/apps/web-antd/src/views/property/costManagement/houseCharge/data.ts +++ b/apps/web-antd/src/views/property/costManagement/houseCharge/data.ts @@ -7,6 +7,14 @@ import { h } from 'vue'; import { resident_unitList } from '#/api/property/resident/unit'; export const querySchema: FormSchemaGetter = () => [ + { + component: 'Select', + componentProps: { + options: getDictOptions('pro_expense_type'), + }, + fieldName: 'costType', + label: '费用类型', + }, { component: 'ApiSelect', componentProps: { @@ -57,10 +65,24 @@ export const columns: VxeGridProps['columns'] = [ field: 'residentUnitText', minWidth: 150, }, + { + title: '费用类型', + field: 'costType', + slots: { + default: ({ row }) => { + return renderDict(row.costType||row.type, 'pro_expense_type'); + }, + }, + }, { title: '收费项目', field: 'chargeItemText', width: 150, + slots: { + default: ({ row }) => { + return row.chargeItemText||'-'; + }, + }, }, { title: '应收金额', @@ -71,13 +93,11 @@ export const columns: VxeGridProps['columns'] = [ title: '计费开始时间', field: 'startTime', width: 150, - slots: { default: 'startTime' }, }, { title: '计费结束时间', field: 'endTime', width: 150, - slots: { default: 'endTime' }, }, { title: '缴费状态', @@ -89,20 +109,15 @@ export const columns: VxeGridProps['columns'] = [ }, }, }, - // { - // title: '状态', - // field: 'state', - // width: 150, - // slots: { - // default: ({row}) => { - // return renderDict(row.state, 'wy_fysfzt') - // } - // } - // }, { title: '说明', field: 'remark', - width: 150, + width: 180, + slots: { + default: ({ row }) => { + return row.remark||'-'; + }, + }, }, { field: 'action', @@ -184,10 +199,11 @@ export const modalSchema: FormSchemaGetter = () => [ { label: '计费时间', fieldName: 'chargeTime', - component: 'RangePicker', + component: 'DatePicker', componentProps: { - format: 'YYYY-MM-DD', - valueFormat: 'YYYY-MM-DD', + format: 'YYYY-MM', + valueFormat: 'YYYY-MM', + picker:'month' }, rules: 'selectRequired', }, @@ -254,3 +270,21 @@ export const modalSchemaRefund: FormSchemaGetter = () => [ rules: 'required', }, ]; +export const modalSchemaCorrection: FormSchemaGetter = () => [ + { + label: '主键', + fieldName: 'id', + component: 'Input', + dependencies: { + show: () => false, + triggerFields: [''], + }, + }, + { + label: '收费项目', + fieldName: 'costItemsId', + component: 'ApiSelect', + componentProps: {}, + rules: 'selectRequired', + }, +]; diff --git a/apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-correction.vue b/apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-correction.vue new file mode 100644 index 00000000..4c728e13 --- /dev/null +++ b/apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-correction.vue @@ -0,0 +1,149 @@ + + + + diff --git a/apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-detail.vue b/apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-detail.vue index e63bfbd7..4dc5dcbc 100644 --- a/apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-detail.vue +++ b/apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-detail.vue @@ -11,7 +11,6 @@ dayjs.extend(duration); dayjs.extend(relativeTime); import {houseChargeInfo} from "#/api/property/costManagement/houseCharge"; import type {HouseChargeVO} from "#/api/property/costManagement/houseCharge/model"; -import type {RoomVO} from "#/api/property/room/model"; import type {CostItemSettingVO} from "#/api/property/costManagement/costItemSetting/model"; @@ -23,7 +22,6 @@ const [BasicModal, modalApi] = useVbenModal({ }); const houseChargeDetail = shallowRef(null); -const room = ref(); const costItem = ref(); async function handleOpenChange(open: boolean) { @@ -34,46 +32,40 @@ async function handleOpenChange(open: boolean) { const {id} = modalApi.getData() as { id: number | string }; houseChargeDetail.value = await houseChargeInfo(id); if (houseChargeDetail.value) { - room.value = houseChargeDetail.value.roomVo costItem.value = houseChargeDetail.value.costItemsVo } modalApi.modalLoading(false); } -function formatDate(dateString: string) { - if (!dateString) return ''; - const date = new Date(dateString); - return date.toISOString().split('T')[0]; -}