From 2ee69f2c07b7cdc5b1f209d3b4d9606374b94c25 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:52:04 +0800
Subject: [PATCH] feat(erp): 采购/销售明细按含税单价口径联算，采购申请与申请采购单合并入口
---
src/views/erp/purchase/order/data.ts | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/views/erp/purchase/order/data.ts b/src/views/erp/purchase/order/data.ts
index 81947a2..5bf882b 100644
--- a/src/views/erp/purchase/order/data.ts
+++ b/src/views/erp/purchase/order/data.ts
@@ -68,21 +68,29 @@
label: '鍏宠仈鍚堝悓',
fieldName: 'contractId',
component: 'ApiSelect',
- componentProps: (values) => ({
- placeholder: values.supplierId
- ? '璇烽�夋嫨璇ヤ緵搴斿晢鐨勯噰璐悎鍚�'
- : '璇峰厛閫夋嫨渚涘簲鍟�',
- allowClear: true,
- showSearch: true,
- disabled: !values.supplierId,
- api: values.supplierId
- ? () => getContractListBySupplier(values.supplierId)
- : () => Promise.resolve([]),
- labelField: 'name',
- valueField: 'id',
- }),
dependencies: {
triggerFields: ['supplierId'],
+ componentProps: (values) => ({
+ placeholder: values.supplierId
+ ? '璇烽�夋嫨璇ヤ緵搴斿晢鐨勯噰璐悎鍚�'
+ : '璇峰厛閫夋嫨渚涘簲鍟�',
+ allowClear: true,
+ showSearch: true,
+ disabled: !values.supplierId,
+ // 鍙垪閲囪喘鍚堝悓锛屽悎鍚屾ā鏉夸笉鑳藉叧鑱旇鍗�
+ api: () =>
+ values.supplierId
+ ? getContractListBySupplier(values.supplierId).then((list) =>
+ list.filter((item) => item.type === 1),
+ )
+ : Promise.resolve([]),
+ // 渚涘簲鍟嗗彉鍖栨椂寮哄埗閲嶆柊鎷夊彇閫夐」
+ params: { supplierId: values.supplierId },
+ labelFn: (item: { code?: string; name?: string }) =>
+ `${item.code || ''} ${item.name || ''}`.trim(),
+ labelField: 'name',
+ valueField: 'id',
+ }),
},
help: '浠呭彲閫夋嫨褰撳墠渚涘簲鍟嗗悕涓嬬殑鍚堝悓锛涘悎鍚屼笌渚涘簲鍟嗕笉鍖归厤鏃朵繚瀛樹細琚嫆缁�',
},
@@ -280,14 +288,14 @@
},
{
field: 'productPrice',
- title: '浜у搧鍗曚环',
+ title: '鍚◣鍗曚环',
minWidth: 120,
fixed: 'right',
slots: { default: 'productPrice' },
},
{
field: 'totalProductPrice',
- title: '閲戦',
+ title: '涓嶅惈绋庨噾棰�',
minWidth: 120,
fixed: 'right',
formatter: 'formatAmount2',
@@ -308,7 +316,7 @@
},
{
field: 'totalPrice',
- title: '绋庨鍚堣',
+ title: '鍚◣鎬讳环',
minWidth: 120,
fixed: 'right',
formatter: 'formatAmount2',
--
Gitblit v1.9.3