From ddf8251ce88e4d1d28cb205d33176184604cfe7b Mon Sep 17 00:00:00 2001 From: FLL <2162874245@qq.com> Date: Sat, 5 Jul 2025 11:43:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/property/chargeManagement/model.d.ts | 32 +++++++------- .../chargeManagement/data.ts | 42 ++++++++++++------- .../chargeManagement/orderCharge-detail.vue | 12 +++--- .../chargeManagement/orderCharge-modal.vue | 4 ++ .../conservationManagement/data.ts | 2 +- .../conservationManagement/index.vue | 2 +- .../productManagement/data.ts | 5 ++- .../productManagement/index.vue | 2 +- 8 files changed, 62 insertions(+), 39 deletions(-) diff --git a/apps/web-antd/src/api/property/chargeManagement/model.d.ts b/apps/web-antd/src/api/property/chargeManagement/model.d.ts index 8313b1d2..2f5a1565 100644 --- a/apps/web-antd/src/api/property/chargeManagement/model.d.ts +++ b/apps/web-antd/src/api/property/chargeManagement/model.d.ts @@ -49,22 +49,22 @@ export interface OrderChargeVO { /** * 支付方式 */ - paymentMethod: number; + paymentMethod: string | number; /** * 开票状态 */ - invoiceStatus: number; + invoiceStatus: string | number; /** * 发票类型 */ - invoiceType: number; + invoiceType: string | number; /** * 收费状态 */ - chargeStatus: number; + chargeStatus: string | number; } export interface OrderChargeForm extends BaseEntity { @@ -116,22 +116,22 @@ export interface OrderChargeForm extends BaseEntity { /** * 支付方式 */ - paymentMethod?: number; + paymentMethod?: string | number; /** * 开票状态 */ - invoiceStatus?: number; + invoiceStatus?: string | number; /** * 发票类型 */ - invoiceType?: number; + invoiceType?: string | number; /** * 收费状态 */ - chargeStatus?: number; + chargeStatus?: string | number; } export interface OrderChargeQuery extends PageQuery { @@ -178,22 +178,22 @@ export interface OrderChargeQuery extends PageQuery { /** * 支付方式 */ - paymentMethod?: number; + paymentMethod?: string | number; /** * 开票状态 */ - invoiceStatus?: number; + invoiceStatus?: string | number; /** * 发票类型 */ - invoiceType?: number; + invoiceType?: string | number; /** * 收费状态 */ - chargeStatus?: number; + chargeStatus?: string | number; /** * 日期范围参数 @@ -250,20 +250,20 @@ export interface orderChargeDetailForm extends BaseEntity { /** * 支付方式 */ - paymentMethod?: number; + paymentMethod?: string | number; /** * 开票状态 */ - invoiceStatus?: number; + invoiceStatus?: string | number; /** * 发票类型 */ - invoiceType?: number; + invoiceType?: string | number; /** * 收费状态 */ - chargeStatus?: number; + chargeStatus?: string | number; } diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/data.ts b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/data.ts index f863fa02..4348c2d0 100644 --- a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/data.ts +++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/data.ts @@ -24,11 +24,11 @@ export const querySchema: FormSchemaGetter = () => [ fieldName: 'invoiceStatus', label: '开票状态', }, - { - component: 'Input', - fieldName: 'userName', - label: '租赁人', - }, + // { + // component: 'Select', + // fieldName: 'userName', + // label: '租赁人', + // }, // { // component: 'RangePicker', // componentProps: { @@ -135,6 +135,11 @@ export const columns: VxeGridProps['columns'] = [ { title: '发票类型', field: 'invoiceType', + slots: { + default: ({ row }) => { + return renderDict(row.invoiceType, 'pro_invoice_type'); + }, + }, minWidth: '120' }, { @@ -204,27 +209,36 @@ export const modalSchema: FormSchemaGetter = () => [ { label: '租金', fieldName: 'rent', - component: 'Input', + component: 'InputNumber', rules: 'required', + componentProps:{ + precision: 2, + } }, { label: '押金', fieldName: 'deposit', - component: 'Input', + component: 'InputNumber', rules: 'required', + componentProps:{ + precision: 2, + } }, { label: '违约金', fieldName: 'penalty', - component: 'Input', - rules: 'required', - }, - { - label: '总金额', - fieldName: 'totalAmount', - component: 'Input', + component: 'InputNumber', rules: 'required', + componentProps:{ + precision: 2, + } }, + // { + // label: '总金额', + // fieldName: 'totalAmount', + // component: 'Input', + // rules: 'required', + // }, { label: '开票状态', fieldName: 'invoiceStatus', diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/orderCharge-detail.vue b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/orderCharge-detail.vue index fd703108..244fdc68 100644 --- a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/orderCharge-detail.vue +++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/orderCharge-detail.vue @@ -39,7 +39,7 @@ async function handleOpenChange(open: boolean) { {{ orderChargeDetail.orderId }} - {{ orderChargeDetail.orderId }} + {{ orderChargeDetail.rentalOrder.contractCode }} {{ orderChargeDetail.userName}} @@ -58,8 +58,10 @@ async function handleOpenChange(open: boolean) { :is="renderDict(orderChargeDetail.invoiceStatus,'pro_invoice_status')" /> - - {{ orderChargeDetail.invoiceType }} + + - {{ orderChargeDetail.createTime }} + {{ orderChargeDetail.rentalOrder.productList.map(item => item.plantCode).join('、') }} - {{ orderChargeDetail.createTime }} + {{ orderChargeDetail.rentalOrder.productList.map(item => item.plantName).join('、') }} {{ orderChargeDetail.totalAmount }} diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/orderCharge-modal.vue b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/orderCharge-modal.vue index 3b7f4600..050393f8 100644 --- a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/orderCharge-modal.vue +++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/orderCharge-modal.vue @@ -51,6 +51,10 @@ const [BasicModal, modalApi] = useVbenModal({ isUpdate.value = !!id; if (isUpdate.value && id) { const record = await orderChargeInfo(id); + record.chargeStatus = record.chargeStatus?.toString(); + record.paymentMethod = record.paymentMethod?.toString(); + record.invoiceType = record.invoiceType?.toString(); + record.invoiceStatus = record.invoiceStatus?.toString(); await formApi.setValues(record); } await markInitialized(); diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/conservationManagement/data.ts b/apps/web-antd/src/views/property/greenPlantRentalManagement/conservationManagement/data.ts index 720c84c3..148bac10 100644 --- a/apps/web-antd/src/views/property/greenPlantRentalManagement/conservationManagement/data.ts +++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/conservationManagement/data.ts @@ -39,7 +39,7 @@ export const columns: VxeGridProps['columns'] = [ minWidth: '120' }, { - title: '服务地点（房间id）', + title: '服务地点', field: 'roomId', minWidth: '120' }, diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/conservationManagement/index.vue b/apps/web-antd/src/views/property/greenPlantRentalManagement/conservationManagement/index.vue index 910d4c5f..fbe0c5d7 100644 --- a/apps/web-antd/src/views/property/greenPlantRentalManagement/conservationManagement/index.vue +++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/conservationManagement/index.vue @@ -104,7 +104,7 @@ function handleMultiDelete() {