From e4994fccfb49ebfb108ba62cbd82aea4e004f6d8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 15 十月 2026 10:02:46 +0800
Subject: [PATCH] fix(mes/qc): 不合格品处理单的不合格物料改查 MDM 物料
---
src/views/erp/sale/return/data.ts | 50 ++++++++++++++++++--------------------------------
1 files changed, 18 insertions(+), 32 deletions(-)
diff --git a/src/views/erp/sale/return/data.ts b/src/views/erp/sale/return/data.ts
index 68e9e22..2d591a4 100644
--- a/src/views/erp/sale/return/data.ts
+++ b/src/views/erp/sale/return/data.ts
@@ -1,17 +1,19 @@
import type { VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import { markRaw } from 'vue';
+
import { DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
import { erpNumberFormatter, erpPriceInputFormatter } from '@vben/utils';
import { z } from '#/adapter/form';
import { getAccountSimpleList } from '#/api/erp/finance/account';
-import { getItemPage } from '#/api/mdm/item';
import { getCustomerSimpleList as getCrmCustomerSimpleList } from '#/api/crm/customer';
import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
import { getSimpleUserList } from '#/api/system/user';
import { getRangePickerDefaultProps } from '#/utils';
+import { MdmItemSelect } from '#/views/basicData/mdm/components';
/** 琛ㄥ崟绫诲瀷 */
export type FormType = 'create' | 'detail' | 'edit';
@@ -144,11 +146,11 @@
},
{
fieldName: 'discountedPrice',
- label: '浼樻儬鍚庨噾棰�',
+ label: '浼樻儬鍚庡惈绋庨噾棰�',
component: 'InputNumber',
componentProps: {
class: '!w-full',
- placeholder: '浼樻儬鍚庨噾棰�',
+ placeholder: '浼樻儬鍚庡惈绋庨噾棰�',
precision: 2,
formatter: erpPriceInputFormatter,
disabled: true,
@@ -270,17 +272,10 @@
},
{
field: 'productPrice',
- title: '浜у搧鍗曚环',
+ title: '鍚◣鍗曚环(鍏�)',
fixed: 'right',
minWidth: 120,
slots: { default: 'productPrice' },
- },
- {
- field: 'totalProductPrice',
- fixed: 'right',
- title: '浜у搧閲戦',
- minWidth: 120,
- formatter: 'formatAmount2',
},
{
fixed: 'right',
@@ -290,16 +285,23 @@
slots: { default: 'taxPercent' },
},
{
+ field: 'totalProductPrice',
+ fixed: 'right',
+ title: '涓嶅惈绋庨噾棰�(鍏�)',
+ minWidth: 120,
+ formatter: 'formatAmount2',
+ },
+ {
fixed: 'right',
field: 'taxPrice',
- title: '绋庨',
+ title: '绋庨(鍏�)',
minWidth: 120,
formatter: 'formatAmount2',
},
{
field: 'totalPrice',
fixed: 'right',
- title: '鍚堣閲戦',
+ title: '鍚◣鍚堣(鍏�)',
minWidth: 120,
formatter: 'formatAmount2',
},
@@ -328,17 +330,9 @@
{
fieldName: 'productId',
label: '浜у搧',
- component: 'ApiSelect',
+ component: markRaw(MdmItemSelect),
componentProps: {
placeholder: '璇烽�夋嫨浜у搧',
- allowClear: true,
- showSearch: true,
- api: async () => {
- const res = await getItemPage({ pageNo: 1, pageSize: 100, status: 0 });
- return res.list || [];
- },
- labelField: 'name',
- valueField: 'id',
},
},
{
@@ -529,17 +523,9 @@
{
fieldName: 'productId',
label: '浜у搧',
- component: 'ApiSelect',
+ component: markRaw(MdmItemSelect),
componentProps: {
placeholder: '璇烽�夋嫨浜у搧',
- allowClear: true,
- showSearch: true,
- api: async () => {
- const res = await getItemPage({ pageNo: 1, pageSize: 100, status: 0 });
- return res.list || [];
- },
- labelField: 'name',
- valueField: 'id',
},
},
{
@@ -604,7 +590,7 @@
},
{
field: 'totalProductPrice',
- title: '閲戦鍚堣',
+ title: '涓嶅惈绋庨噾棰濆悎璁�',
formatter: 'formatAmount2',
minWidth: 120,
},
--
Gitblit v1.9.3