diff --git a/apps/web-antd/src/api/property/reportStatistics/index.ts b/apps/web-antd/src/api/property/reportStatistics/index.ts new file mode 100644 index 00000000..c3e0b5d9 --- /dev/null +++ b/apps/web-antd/src/api/property/reportStatistics/index.ts @@ -0,0 +1,70 @@ +import type { statisticsByTimeQuery } from './model'; + +import type { ID, IDS } from '#/api/common'; +import type { PageResult } from '#/api/common'; + +import { commonExport } from '#/api/helper'; +import { requestClient } from '#/api/request'; + +// /** +// * 查询绿植租赁-租赁方案列表 +// * @param params +// * @returns 绿植租赁-租赁方案列表 +// */ +// export function rentalPlanList(params?: RentalPlanQuery) { +// return requestClient.get>('/property/rentalPlan/list', { params }); +// } + +// /** +// * 导出绿植租赁-租赁方案列表 +// * @param params +// * @returns 绿植租赁-租赁方案列表 +// */ +// export function rentalPlanExport(params?: RentalPlanQuery) { +// return commonExport('/property/rentalPlan/export', params ?? {}); +// } + +// /** +// * 查询绿植租赁-租赁方案详情 +// * @param id id +// * @returns 绿植租赁-租赁方案详情 +// */ +// export function rentalPlanInfo(id: ID) { +// return requestClient.get(`/property/rentalPlan/${id}`); +// } + +// /** +// * 新增绿植租赁-租赁方案 +// * @param data +// * @returns void +// */ +// export function rentalPlanAdd(data: RentalPlanForm) { +// return requestClient.postWithMsg('/property/rentalPlan', data); +// } + +// /** +// * 更新绿植租赁-租赁方案 +// * @param data +// * @returns void +// */ +// export function rentalPlanUpdate(data: RentalPlanForm) { +// return requestClient.putWithMsg('/property/rentalPlan', data); +// } + +// /** +// * 删除绿植租赁-租赁方案 +// * @param id id +// * @returns void +// */ +// export function rentalPlanRemove(id: ID | IDS) { +// return requestClient.deleteWithMsg(`/property/rentalPlan/${id}`); +// } + +/** + * 查询订单数量趋势 + * @param timeUnit + * @returns void + */ +export function statisticsByTime(params:statisticsByTimeQuery) { + return requestClient.get('/property/rentalOrder/statisticsByTime', { params }); +} diff --git a/apps/web-antd/src/api/property/reportStatistics/model.d.ts b/apps/web-antd/src/api/property/reportStatistics/model.d.ts new file mode 100644 index 00000000..2f16cdbc --- /dev/null +++ b/apps/web-antd/src/api/property/reportStatistics/model.d.ts @@ -0,0 +1,7 @@ +export interface statisticsByTimeQuery { + /** + * 日期范围参数(1日 2周 3月) + * + */ + timeUnit?: number; +} diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/data.ts b/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/data.ts index 03ba2a5a..812bcc3d 100644 --- a/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/data.ts +++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/data.ts @@ -149,170 +149,29 @@ export const columns: VxeGridProps['columns'] = [ }, ]; -export const modalSchema: FormSchemaGetter = () => [ +export const planInfoColumns: VxeGridProps['columns'] = [ { - label: '主键', - fieldName: 'id', - component: 'Input', - dependencies: { - show: () => false, - triggerFields: [''], - }, + title: '序号', + field: 'id', + width: 100, + align: 'center' }, { - label: '客户名称', - fieldName: 'customerName', - component: 'Input', - rules: 'required', + title: '产品名称', + field: 'plantName', + minWidth: 100, + align: 'center' }, { - label: '客户类型', - fieldName: 'customerType', - component: 'Select', - componentProps: { - options: getDictOptions('wy_khlx') - }, - rules: 'selectRequired', + title: '产品租金', + field: 'rent', + minWidth: 100, + align: 'center' }, { - label: '租赁周期', - fieldName: 'rentalPeriod', - component: 'Select', - componentProps: { - options: getDictOptions('wy_time_unit') - }, - rules: 'selectRequired', + title: '产品数量', + field: 'inventory', + minWidth: 100, + align: 'center' }, - { - label: '租赁时间', - fieldName: 'rentalTime', - component: 'RangePicker', - componentProps: { - showTime: true, - format: 'YYYY-MM-DD', - valueFormat: 'YYYY-MM-DD', - }, - rules: 'selectRequired', - }, - { - label: '租赁方式', - fieldName: 'rentalType', - component: 'Select', - componentProps: { - options: getDictOptions('wy_zlfs') - }, - rules: 'selectRequired', - formItemClass: 'col-span-2' - }, - { - label: '租赁方案', - fieldName: 'planId', - component: 'Select', - dependencies: { - // 仅当 租赁方式 为 2（套餐） 时显示 - show: (formValues) => formValues.rentalType === '2', - triggerFields: ['rentalType'], - }, - rules: 'selectRequired', - formItemClass: 'col-span-2' - }, - { - label: '方案详情', - fieldName: 'planInfo', - component: 'Input', - dependencies: { - // 仅当 租赁方式 为 2（套餐） 时显示 - show: (formValues) => formValues.rentalType === '2' && formValues.planId != null, - triggerFields: ['rentalType'], - }, - formItemClass: 'col-span-2' - }, - { - label: '绿植产品', - fieldName: 'productId', - component: 'Select', - dependencies: { - // 仅当 租赁方式 为 1（单点） 时显示 - show: (formValues) => formValues.rentalType === '1', - triggerFields: ['rentalType'], - }, - rules: 'selectRequired', - formItemClass: 'col-span-2' - }, - { - label: '租赁数量', - fieldName: 'productNum', - component: 'InputNumber', - componentProps: { - min: 1, - precision: 0, - step: 1, - placeholder:'租赁数量不可超出绿植产品库存数量' - }, - dependencies: { - // 仅当 租赁方式 为 1（单点） 时显示 - show: (formValues) => formValues.rentalType === '1', - triggerFields: ['rentalType', 'productId'], - }, - rules: 'required', - }, - // { - // label: '应付总额', - // fieldName: 'totalAmount', - // component: 'Input', - // rules: 'required', - // }, - // { - // label: '支付状态', - // fieldName: 'paymentStatus', - // component: 'Select', - // componentProps: { - // options: getDictOptions('pro_charging_status'), - // }, - // rules: 'selectRequired', - // }, - // { - // label: '是否续租', - // fieldName: 'isRelet', - // component: 'RadioGroup', - // componentProps: { - // buttonStyle: 'solid', - // optionType: 'button', - // options: getDictOptions('wy_sf'), - // }, - // }, - { - label: '合同状态', - fieldName: 'contractStatus', - component: 'Select', - componentProps: { - options: getDictOptions('wy_htzt'), - }, - rules: 'selectRequired' - }, - { - label: '合同编号', - fieldName: 'contractCode', - component: 'Input', - dependencies: { - show: (formValues) => formValues.contractStatus != null && formValues.contractStatus != 1, - triggerFields: ['contractStatus'], - }, - rules: 'required' - }, - { - label: '签署时间', - fieldName: 'signTime', - component: 'DatePicker', - componentProps: { - showTime: true, - format: 'YYYY-MM-DD', - valueFormat: 'YYYY-MM-DD', - }, - dependencies: { - show: (formValues) => formValues.contractStatus != null && formValues.contractStatus != 1, - triggerFields: ['contractStatus'], - }, - rules: 'required' - }, -]; +] diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/index.vue b/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/index.vue index 61ddcc72..b8bbc44b 100644 --- a/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/index.vue +++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/index.vue @@ -89,10 +89,10 @@ function handleAdd() { modalApi.open(); } -async function handleEdit(row: Required) { - modalApi.setData({ id: row.id }); - modalApi.open(); -} +// async function handleEdit(row: Required) { +// modalApi.setData({ id: row.id }); +// modalApi.open(); +// } async function handleDelete(row: Required) { await rentalOrderRemove(row.id); diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/rentalOrder-modal.vue b/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/rentalOrder-modal.vue index f395285b..b693c65c 100644 --- a/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/rentalOrder-modal.vue +++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/rentalOrder-modal.vue @@ -18,12 +18,18 @@ import {rentalPlanInfo, rentalPlanList} from "#/api/property/rentalPlan"; import {getDictOptions} from "#/utils/dict"; import type {PropertyVO} from "#/api/property/productManagement/model"; import type {RentalPlanVO} from "#/api/property/rentalPlan/model"; +import {planInfoColumns} from './data'; +import {Table} from "ant-design-vue"; const emit = defineEmits<{ reload: [] }>(); const isUpdate = ref(false); const planList = ref([]); const plantsList = ref([]); +const planProducts = ref([]); +const totalAmount = ref(0); +const singleAmount = ref(0); +const plantInfo = ref(); const title = computed(() => { return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add'); }); @@ -104,7 +110,6 @@ const modalSchema = [ }, onChange: async (value: string) => { await getPlanProducts(value) - // const plan= planList.value.find(item => item.id === value); }, showSearch: true, filterOption: (input: any, option: any) => @@ -114,7 +119,8 @@ const modalSchema = [ { label: '方案详情', fieldName: 'planInfo', - component: 'Text', + component: 'Input', + slots: {default: 'planInfo'}, dependencies: { // 仅当 租赁方式 为 2（套餐） 时显示 show: (formValues: any) => formValues.rentalType === '2' && formValues.planId != null, @@ -143,22 +149,12 @@ const modalSchema = [ })); }, onChange: async (value: string) => { - const plants = plantsList.value.find(item => item.id === value); - if (plants) { - formApi.updateSchema([{ - componentProps: () => ({ - min: 1, - max: plants.inventory, - precision: 0, - }), - fieldName: 'productNum', - }]) - } - const formValues = await formApi.getValues(); - if(formValues.productNum){ - await formApi.setValues({ - totalAmount: plants.rent*formValues.productNum, - }); + plantInfo.value = plantsList.value.find(item => item.id === value); + if (plantInfo.value) { + const formValues = await formApi.getValues(); + if (formValues.productNum) { + singleAmount.value = (plantInfo.value.rent * formValues.productNum).toFixed(2); + } } }, showSearch: true, @@ -174,7 +170,12 @@ const modalSchema = [ min: 1, precision: 0, step: 1, - placeholder: '租赁数量不可超出绿植产品库存数量' + placeholder: '租赁数量不可超出绿植产品库存数量', + onChange: async (value: number) => { + if (plantInfo.value) { + singleAmount.value = (plantInfo.value.rent * value).toFixed(2); + } + }, }, dependencies: { // 仅当 租赁方式 为 1（单点） 时显示 @@ -184,20 +185,17 @@ const modalSchema = [ rules: 'required', }, { - label: '应付总额', + label: '总金额（元）', fieldName: 'totalAmount', component: 'InputNumber', + slots: {default: 'totalAmount'}, dependencies: { // 仅当 租赁方式 为 1（单点） 时显示 - show: (formValues: any) => formValues.totalAmount, - triggerFields: ['totalAmount'], - disabled:true, - }, - componentProps: { - addonAfter: '元', - precision: 2, - stringMode: true, + show: (formValues: any) => formValues.productNum&&formValues.productId&&formValues.rentalType === '1', + triggerFields: ['productNum','rentalType'], + disabled: true, }, + labelWidth: 110 }, { label: '是否续租', @@ -304,14 +302,18 @@ async function handleConfirm() { const data = cloneDeep(await formApi.getValues()); if (data.rentalType == 1) { data.planId = undefined; + data.totalAmount = singleAmount.value } else { data.productId = undefined; data.productNum = undefined; + data.productList = plantsList.value + data.totalAmount = totalAmount.value } - if(data.rentalTime){ - data.startTime=data.rentalTime[0]; - data.endTime=data.rentalTime[1]; + if (data.rentalTime) { + data.startTime = data.rentalTime[0]; + data.endTime = data.rentalTime[1]; } + await (isUpdate.value ? rentalOrderUpdate(data) : rentalOrderAdd(data)); resetInitialized(); emit('reload'); @@ -326,16 +328,19 @@ async function handleConfirm() { //获取有库存的绿植 async function getPlanProducts(id: string) { const res = await rentalPlanInfo(id) - if (res.productList) { - } - formApi.updateSchema([{ - fieldName: 'planInfo', - componentProps: { - isHtml: true, - value: '
222222222222222222
' - }, - }, - ]); + plantsList.value=res.productList; + // planProducts.value = [{ + // plantName: '发财树', + // inventory: 3, + // rent: 10, + // }, { + // plantName: '绿萝', + // inventory: 5, + // rent: 3, + // } + // ] + totalAmount.value = planProducts.value?.reduce((sum, item: any) => sum + (item.rent * item.inventory), 0).toFixed(2) + } async function handleClosed() { @@ -347,7 +352,32 @@ async function handleClosed() { diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/reportStatistics/index.vue b/apps/web-antd/src/views/property/greenPlantRentalManagement/reportStatistics/index.vue index 7e65cb3b..d5fd0d37 100644 --- a/apps/web-antd/src/views/property/greenPlantRentalManagement/reportStatistics/index.vue +++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/reportStatistics/index.vue @@ -7,6 +7,8 @@ import { EchartsUI, useEcharts } from '@vben/plugins/echarts'; import { Button } from 'ant-design-vue'; +import { statisticsByTime } from '#/api/property/reportStatistics'; + const orderLineRef = ref(); const leasePieRef = ref(); const customerTypesBarRef = ref(); @@ -27,14 +29,18 @@ const { renderEcharts: renderConservationTasksBar } = useEcharts( const { renderEcharts: renderMaintenanceQualityScoresPei } = useEcharts( maintenanceQualityScoresPeiRef, ); +const timeUnit = ref(1) -onMounted(() => { +onMounted(async () => { + // 查询订单数量趋势 + const res = await statisticsByTime({ timeUnit: timeUnit.value }); + const xAxisData = res?.time ?? []; + const seriesData = res?.counts ?? []; renderEcharts({ - title: { text: '订单数量趋势' }, tooltip: { trigger: 'axis' }, xAxis: { type: 'category', - data: ['1月', '2月', '3月', '4月', '5月', '6月'], + data: xAxisData, boundaryGap: false, }, yAxis: { type: 'value' }, @@ -42,7 +48,7 @@ onMounted(() => { { name: '订单数', type: 'line', - data: [120, 132, 101, 134, 90, 230], + data: seriesData, smooth: true, }, ], @@ -199,6 +205,15 @@ onMounted(() => { ], }); }); +const nodeOptions = [ + { label: '日', value: 1 }, + { label: '周', value: 2 }, + { label: '月', value: 3 }, +]; +function handleAssociationChange(e: any) { + console.log(e); + timeUnit.value = e.target.value; +}