From c8045e1da8889742c9ec354c3ae2cb17b664c13f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=90=A6?= Date: Tue, 28 Jul 2026 07:59:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=E4=BA=86=E6=A8=A1?= =?UTF-8?q?=E6=80=81=E6=A1=86=E7=9A=84=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/prescription/components/source.vue | 2 +- .../order/prescription/config/search.ts | 9 ++- .../order/product-order/components/detail.vue | 2 +- .../order/product-order/config/search.ts | 7 ++- .../business/order/register/config/search.ts | 9 ++- .../product/_shared/drug-free-shipping-api.ts | 12 ++++ .../_shared/drug-free-shipping-cell.vue | 56 +++++++++++++++++++ .../china-medicine/components/ExcelUpload.vue | 2 +- .../health-food/components/ExcelUpload.vue | 2 +- .../product/health-food/config/table.ts | 6 ++ .../business/product/health-food/index.vue | 4 ++ .../medical-device/components/ExcelUpload.vue | 2 +- .../product/medical-device/config/table.ts | 6 ++ .../business/product/medical-device/index.vue | 4 ++ .../non-drug/components/ExcelUpload.vue | 2 +- .../business/product/non-drug/config/table.ts | 6 ++ .../views/business/product/non-drug/index.vue | 4 ++ .../product/service-pack/config/table.ts | 6 ++ .../business/product/service-pack/index.vue | 4 ++ .../components/ExcelUpload.vue | 2 +- .../product/western-medicine/config/table.ts | 6 ++ .../product/western-medicine/index.vue | 4 ++ .../components/MonthlyPayment.vue | 2 +- .../withdrawal/components/card-modal.vue | 2 +- .../components/withdrawal-modal.vue | 2 +- .../views/log/api-log/components/modal.vue | 2 +- .../components/fail-detail-modal.vue | 2 +- .../views/log/ledger-log/components/modal.vue | 2 +- .../log/old-api-log/components/modal.vue | 2 +- .../src/views/log/op-log/components/modal.vue | 2 +- .../views/log/order-log/components/modal.vue | 2 +- .../log/prescription-log/components/modal.vue | 2 +- .../audit-prescription/components/source.vue | 2 +- 33 files changed, 156 insertions(+), 23 deletions(-) create mode 100644 apps/web-antd/src/views/business/product/_shared/drug-free-shipping-api.ts create mode 100644 apps/web-antd/src/views/business/product/_shared/drug-free-shipping-cell.vue diff --git a/apps/web-antd/src/views/business/order/prescription/components/source.vue b/apps/web-antd/src/views/business/order/prescription/components/source.vue index 2cc55f84..f4f53dc3 100644 --- a/apps/web-antd/src/views/business/order/prescription/components/source.vue +++ b/apps/web-antd/src/views/business/order/prescription/components/source.vue @@ -37,7 +37,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antd/src/views/business/order/prescription/config/search.ts b/apps/web-antd/src/views/business/order/prescription/config/search.ts index e0d9d2bb..4d128ad5 100644 --- a/apps/web-antd/src/views/business/order/prescription/config/search.ts +++ b/apps/web-antd/src/views/business/order/prescription/config/search.ts @@ -47,9 +47,14 @@ export const formOptions: VbenFormProps = { { component: 'RangePicker', componentProps: { - format: 'YYYY-MM-DD', // 确保格式与你需要的一致 + format: 'YYYY-MM-DD', + // 提交纯日期,后端 getWhereBetween 会把结束日扩到当天 23:59:59 + valueFormat: 'YYYY-MM-DD', }, - defaultValue: [dayjs().startOf('month'), dayjs()], + defaultValue: [ + dayjs().startOf('month').format('YYYY-MM-DD'), + dayjs().format('YYYY-MM-DD'), + ], fieldName: 'search_time', label: '时间范围', }, diff --git a/apps/web-antd/src/views/business/order/product-order/components/detail.vue b/apps/web-antd/src/views/business/order/product-order/components/detail.vue index b7d47b72..e5f044fd 100644 --- a/apps/web-antd/src/views/business/order/product-order/components/detail.vue +++ b/apps/web-antd/src/views/business/order/product-order/components/detail.vue @@ -263,7 +263,7 @@ function prescriptionStatusColor() { }