From 5ff6f0d837e104df003c44cff4c7066995f30827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=90=A6?= Date: Wed, 15 Jul 2026 08:46:37 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=8E=A5?= =?UTF-8?q?=E8=AF=8A=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=89=82=E9=87=8F=E3=80=81?= =?UTF-8?q?=E5=A4=A9=E6=95=B0=E8=BE=93=E5=85=A5=E6=A1=86=E8=BF=87=E7=AA=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/business/order/api/order-ops.ts | 3 +- .../order/components/order-trace-drawer.vue | 14 +- .../finance/withdrawal-audit/config/table.ts | 2 +- .../views/finance/withdrawal-audit/index.vue | 8 +- .../config/account-change-search.ts | 17 ++ .../withdrawal/config/account-change-table.ts | 3 +- .../views/finance/withdrawal/config/form.ts | 1 + .../src/views/finance/withdrawal/index.vue | 212 +++++++++--------- .../components/stock-io-modal.vue | 96 ++++++++ .../components/stock-log-drawer.vue | 110 +++++++++ 10 files changed, 358 insertions(+), 108 deletions(-) create mode 100644 apps/web-antd/src/views/system/delivery-warehouse-stock/components/stock-io-modal.vue create mode 100644 apps/web-antd/src/views/system/delivery-warehouse-stock/components/stock-log-drawer.vue diff --git a/apps/web-antd/src/views/business/order/api/order-ops.ts b/apps/web-antd/src/views/business/order/api/order-ops.ts index 9965cfa5..27c10fd0 100644 --- a/apps/web-antd/src/views/business/order/api/order-ops.ts +++ b/apps/web-antd/src/views/business/order/api/order-ops.ts @@ -19,7 +19,8 @@ export async function getOrderTraceApi(params: { export async function getOrderLedgerDetailApi(params: { order_id: number; order_type: number; - scope?: 'all' | 'platform' | 'store'; + /** 平台端可按受益方类型筛选:全部/门店/平台/供应商/配送仓库 */ + scope?: 'all' | 'platform' | 'store' | 'supplier' | 'warehouse'; }) { return requestClient.get(`${prefix}ledger-detail`, { params }); } diff --git a/apps/web-antd/src/views/business/order/components/order-trace-drawer.vue b/apps/web-antd/src/views/business/order/components/order-trace-drawer.vue index 087f695d..7c4d0bbd 100644 --- a/apps/web-antd/src/views/business/order/components/order-trace-drawer.vue +++ b/apps/web-antd/src/views/business/order/components/order-trace-drawer.vue @@ -29,7 +29,8 @@ import ReconciliationDetailTable from './reconciliation-detail-table.vue'; defineOptions({ name: 'OrderTraceDrawer' }); -type LedgerScope = 'all' | 'platform' | 'store'; +/** 分账明细 scope:与后端 allowed_scopes 对齐 */ +type LedgerScope = 'all' | 'platform' | 'store' | 'supplier' | 'warehouse'; const router = useRouter(); const userStore = useUserStore(); @@ -57,7 +58,8 @@ const ledgerColumns = [ { title: '药品编号', dataIndex: 'drug_number', key: 'drug_number' }, { title: '药品规格', dataIndex: 'specification', key: 'specification' }, { title: '分账对象', dataIndex: 'user_type_txt', key: 'user_type_txt' }, - { title: '门店', dataIndex: ['store', 'name'], key: 'store_name' }, + // 受益方名称:门店/供应商/配送仓库实体名,平台为「平台」 + { title: '受益方名称', dataIndex: 'party_name', key: 'party_name' }, { title: '分账金额', dataIndex: 'money', key: 'money' }, { title: '结算状态', dataIndex: 'status_txt', key: 'status_txt' }, { title: '创建时间', dataIndex: 'created_at', key: 'created_at' }, @@ -360,6 +362,8 @@ watch(isPlatformAdmin, (val) => { + + @@ -389,7 +393,8 @@ watch(isPlatformAdmin, (val) => { v-else-if=" column.key === 'drug_name' || column.key === 'drug_number' || - column.key === 'specification' + column.key === 'specification' || + column.key === 'party_name' " > {{ formatDrugCell(text) }} @@ -429,7 +434,8 @@ watch(isPlatformAdmin, (val) => { v-else-if=" column.key === 'drug_name' || column.key === 'drug_number' || - column.key === 'specification' + column.key === 'specification' || + column.key === 'party_name' " > {{ formatDrugCell(text) }} diff --git a/apps/web-antd/src/views/finance/withdrawal-audit/config/table.ts b/apps/web-antd/src/views/finance/withdrawal-audit/config/table.ts index 1b2a34ed..bc306b08 100644 --- a/apps/web-antd/src/views/finance/withdrawal-audit/config/table.ts +++ b/apps/web-antd/src/views/finance/withdrawal-audit/config/table.ts @@ -17,7 +17,7 @@ export const gridOptions: VxeGridProps = { }, columns: [ { field: 'id', align: 'left', title: 'ID', width: 50 }, - { field: 'user_info', title: '申请诊所/供应商/平台', slots: { default: 'user-info'} }, + { field: 'user_info', title: '申请诊所/供应商/平台/配送仓', slots: { default: 'user-info'} }, { field: 'order_no', title: '订单号' }, { field: 'apply_cash', title: '申请金额' }, { field: 'true_cash', title: '打款金额' }, diff --git a/apps/web-antd/src/views/finance/withdrawal-audit/index.vue b/apps/web-antd/src/views/finance/withdrawal-audit/index.vue index a6d10add..cc8f8a3b 100644 --- a/apps/web-antd/src/views/finance/withdrawal-audit/index.vue +++ b/apps/web-antd/src/views/finance/withdrawal-audit/index.vue @@ -57,7 +57,13 @@ const infoModal = (id, modalType = 0) => {