diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceSettings/attendanceGroupSettings/index.vue b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/index.vue similarity index 100% rename from apps/web-antd/src/views/property/attendanceManagement/attendanceSettings/attendanceGroupSettings/index.vue rename to apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/index.vue diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceSettings/festivalAndHoliday/index.vue b/apps/web-antd/src/views/property/attendanceManagement/attendanceSettings/festivalAndHoliday/index.vue deleted file mode 100644 index c8764c2e..00000000 --- a/apps/web-antd/src/views/property/attendanceManagement/attendanceSettings/festivalAndHoliday/index.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceStatistics/CheckInRecord/index.vue b/apps/web-antd/src/views/property/attendanceManagement/attendanceStatistics/CheckInRecord/index.vue deleted file mode 100644 index 7845cc97..00000000 --- a/apps/web-antd/src/views/property/attendanceManagement/attendanceStatistics/CheckInRecord/index.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceStatistics/dailyStatistics/index.vue b/apps/web-antd/src/views/property/attendanceManagement/attendanceStatistics/dailyStatistics/index.vue deleted file mode 100644 index 178bfe9f..00000000 --- a/apps/web-antd/src/views/property/attendanceManagement/attendanceStatistics/dailyStatistics/index.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/apps/web-antd/src/views/property/attendanceManagement/holidayType/index.vue b/apps/web-antd/src/views/property/attendanceManagement/holidayType/index.vue deleted file mode 100644 index d3035dd3..00000000 --- a/apps/web-antd/src/views/property/attendanceManagement/holidayType/index.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceSettings/shiftSetting/index.vue b/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/index.vue similarity index 100% rename from apps/web-antd/src/views/property/attendanceManagement/attendanceSettings/shiftSetting/index.vue rename to apps/web-antd/src/views/property/attendanceManagement/shiftSetting/index.vue diff --git a/apps/web-antd/src/views/property/costManagement/paymentReview/data.ts b/apps/web-antd/src/views/property/costManagement/paymentReview/data.ts index a0114df4..cb93ed50 100644 --- a/apps/web-antd/src/views/property/costManagement/paymentReview/data.ts +++ b/apps/web-antd/src/views/property/costManagement/paymentReview/data.ts @@ -93,80 +93,17 @@ export const modalSchema: FormSchemaGetter = () => [ triggerFields: [''], }, }, - { - label: '房屋收费id', - fieldName: 'houseChargeId', - component: 'Input', - rules: 'required', - }, - { - label: '费用项目id', - fieldName: 'itemId', - component: 'Input', - rules: 'required', - }, - { - label: '缴费开始时间', - fieldName: 'startTime', - component: 'DatePicker', - componentProps: { - showTime: true, - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'YYYY-MM-DD HH:mm:ss', - }, - rules: 'required', - }, - { - label: '缴费结束时间', - fieldName: 'endTime', - component: 'DatePicker', - componentProps: { - showTime: true, - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'YYYY-MM-DD HH:mm:ss', - }, - rules: 'required', - }, - { - label: '实付金额', - fieldName: 'receivedAmount', - component: 'Input', - }, - { - label: '应收金额', - fieldName: 'receivableAmount', - component: 'Input', - rules: 'required', - }, - { - label: '缴费时间', - fieldName: 'payTime', - component: 'DatePicker', - componentProps: { - showTime: true, - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'YYYY-MM-DD HH:mm:ss', - }, - rules: 'required', - }, { label: '审核状态', fieldName: 'state', - component: 'Select', + component: 'RadioGroup', componentProps: { - // 可选从DictEnum中获取 DictEnum.COST_REVIEW_STATUS 便于维护 - options: getDictOptions('cost_review_status'), + options: [ + { label: '已审核', value: '1' }, + { label: '已驳回', value: '2' }, + ], + // options: getDictOptions('cost_review_status'), }, - rules: 'selectRequired', - }, - { - label: '备注', - fieldName: 'remark', - component: 'Textarea', - }, - { - label: '搜索值', - fieldName: 'searchValue', - component: 'Input', + rules: 'required', }, ]; diff --git a/apps/web-antd/src/views/property/costManagement/paymentReview/index.vue b/apps/web-antd/src/views/property/costManagement/paymentReview/index.vue index 5004e4dc..91d85ef7 100644 --- a/apps/web-antd/src/views/property/costManagement/paymentReview/index.vue +++ b/apps/web-antd/src/views/property/costManagement/paymentReview/index.vue @@ -1,16 +1,15 @@ @@ -84,22 +84,16 @@ async function handleDelete(row: Required) { diff --git a/apps/web-antd/src/views/property/costManagement/paymentReview/paymentReview-detail.vue b/apps/web-antd/src/views/property/costManagement/paymentReview/paymentReview-detail.vue index f768f438..875676fc 100644 --- a/apps/web-antd/src/views/property/costManagement/paymentReview/paymentReview-detail.vue +++ b/apps/web-antd/src/views/property/costManagement/paymentReview/paymentReview-detail.vue @@ -36,7 +36,7 @@ async function handleOpenChange(open: boolean) { - + {{ paymentReviewDetail.roomNumber }} diff --git a/apps/web-antd/src/views/property/costManagement/paymentReview/paymentReview-modal.vue b/apps/web-antd/src/views/property/costManagement/paymentReview/paymentReview-modal.vue new file mode 100644 index 00000000..b398b1af --- /dev/null +++ b/apps/web-antd/src/views/property/costManagement/paymentReview/paymentReview-modal.vue @@ -0,0 +1,106 @@ + + + +