From 33f2197ea897cd3f2743ed743ebd22fc5c4cb20e Mon Sep 17 00:00:00 2001 From: fyy <2717885210@qq.com> Date: Tue, 1 Jul 2025 17:48:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9E=84=E6=9E=B6=E7=BB=BF=E6=A4=8D?= =?UTF-8?q?=E7=A7=9F=E8=B5=81=E6=96=B9=E6=A1=88=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clean/cleanOrders/clean-detail-modal.vue | 2 + .../clean/cleanOrders/clean-modal.vue | 6 +- .../views/property/clean/cleanOrders/data.ts | 41 +-- .../property/clean/cleanOrders/index.vue | 7 +- .../leasePogramManagement/data.ts | 35 ++- .../leasePogramManagement/index.vue | 22 +- .../rentalPlan-detial-modal.vue | 238 ++++++++++++++++++ .../rentalPlan-modal.vue | 128 ++++++++-- 8 files changed, 417 insertions(+), 62 deletions(-) diff --git a/apps/web-antd/src/views/property/clean/cleanOrders/clean-detail-modal.vue b/apps/web-antd/src/views/property/clean/cleanOrders/clean-detail-modal.vue index f8bca507..83cd446f 100644 --- a/apps/web-antd/src/views/property/clean/cleanOrders/clean-detail-modal.vue +++ b/apps/web-antd/src/views/property/clean/cleanOrders/clean-detail-modal.vue @@ -204,6 +204,8 @@ async function handleConfirm() { return; } const data = cloneDeep(await formApi.getValues()); + console.log(data); + // 获取选中的服务名称 const selectedService = cleanListData.find(item => item.id === data.name); if (selectedService) { diff --git a/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue b/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue index 35b1eeb1..a0e5f252 100644 --- a/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue +++ b/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue @@ -285,12 +285,12 @@ function handleEditDetailReload(data: any) { function handleDeleteDetail(record: any, index: number) { detailTable.value.splice(index, 1); } - +// 查看产品详情 function handleViewDetail(record: any) { detailModalApi.setData({ ...record, readonly: true }); detailModalApi.open(); } - +// 编辑产品详情 function handleEditDetail(record: any, index: number) { detailModalApi.setData({ ...record, index, readonly: false }); detailModalApi.open(); @@ -348,7 +348,7 @@ async function setupCommunitySelect() { // addFullName(areaList, 'areaName', ' / '); const splitStr = '/'; handleNode(areaList, 'label', splitStr, function (node: any) { - + }); formApi.updateSchema([ { diff --git a/apps/web-antd/src/views/property/clean/cleanOrders/data.ts b/apps/web-antd/src/views/property/clean/cleanOrders/data.ts index 98358eff..e2ba796c 100644 --- a/apps/web-antd/src/views/property/clean/cleanOrders/data.ts +++ b/apps/web-antd/src/views/property/clean/cleanOrders/data.ts @@ -8,22 +8,22 @@ import type { FormSchema } from '../../../../../../../packages/@core/ui-kit/form const cleanStore = useCleanStore(); export const querySchema: (areaList: any[]) => FormSchema[] = (areaList) => [ - { - label: '服务地址', - component: 'TreeSelect', - fieldName: 'location', - componentProps: { - treeData: areaList, - fieldNames: { - label: 'label', - value: 'id', - children: 'children', - }, - placeholder: '请选择服务地址', - showSearch: true, - treeDefaultExpandAll: true, - }, - }, + // { + // label: '服务地址', + // component: 'TreeSelect', + // fieldName: 'location', + // componentProps: { + // treeData: areaList || [], + // fieldNames: { + // label: 'label', + // value: 'id', + // children: 'children', + // }, + // placeholder: '请选择服务地址', + // showSearch: true, + // treeDefaultExpandAll: true, + // }, + // }, // { // label: '服务地址', // component: 'TreeSelect', @@ -83,7 +83,7 @@ export const columns: VxeGridProps['columns'] = [ field: 'payState', width: '120', slots: { - default: ({ row }) => (row.stater === 1 ? '已支付' : '待支付'), + default: ({ row }) => (row.state === 1 ? '已支付' : '待支付'), }, }, { @@ -110,6 +110,12 @@ export const columns: VxeGridProps['columns'] = [ title: '联系电话', field: 'phone', width: 'auto', + }, + { + title: '订单状态', + field: 'state', + width: 'auto', + slots: { default: 'state' }, }, // { // title: '提交时间', @@ -121,6 +127,7 @@ export const columns: VxeGridProps['columns'] = [ slots: { default: 'action' }, title: '操作', }, + ]; export const modalSchema: FormSchemaGetter = () => [ diff --git a/apps/web-antd/src/views/property/clean/cleanOrders/index.vue b/apps/web-antd/src/views/property/clean/cleanOrders/index.vue index 8eb9712e..82422130 100644 --- a/apps/web-antd/src/views/property/clean/cleanOrders/index.vue +++ b/apps/web-antd/src/views/property/clean/cleanOrders/index.vue @@ -7,7 +7,7 @@ import type { CleanForm } from '#/api/property/clean/model'; import { Page, useVbenModal } from '@vben/common-ui'; import { getVxePopupContainer } from '@vben/utils'; -import { Modal, Popconfirm, Space } from 'ant-design-vue'; +import { Modal, Popconfirm, Space, Tag } from 'ant-design-vue'; import { useVbenVxeGrid, vxeCheckboxChecked } from '#/adapter/vxe-table'; import { @@ -162,6 +162,11 @@ async function handleView(row: Required) { + +