From 889d8ddf4c13c1b1bdbabd04c2d80b904020151e Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期三, 19 八月 2026 12:49:24 +0800
Subject: [PATCH] 生产订单与报工模块改造汇总 (Git Commit 文档) feat(mes-pro): 生产订单及报工模块审批流与批次填报改造 1. 生产订单功能增强 (Work Order)
---
src/views/crm/product/components/data.ts | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/views/crm/product/components/data.ts b/src/views/crm/product/components/data.ts
index 75d25ba..462508a 100644
--- a/src/views/crm/product/components/data.ts
+++ b/src/views/crm/product/components/data.ts
@@ -14,7 +14,7 @@
title: '鐗╂枡缂栫爜',
},
{
- field: 'itemBarCode',
+ field: 'barCode',
title: '鐗╂枡鏉＄爜',
},
{
@@ -52,7 +52,22 @@
}
/** 浜у搧缂栬緫琛ㄦ牸鐨勫垪瀹氫箟 */
-export function useProductEditTableColumns(): VxeTableGridOptions['columns'] {
+export function useProductEditTableColumns(
+ showBusinessPrice: boolean = false,
+): VxeTableGridOptions['columns'] {
+ const priceColumn = showBusinessPrice
+ ? {
+ field: 'businessPrice',
+ title: '鍟嗘満浠锋牸锛堝厓锛�',
+ minWidth: 100,
+ slots: { default: 'businessPrice' },
+ }
+ : {
+ field: 'contractPrice',
+ title: '鍚堝悓浠凤紙鍏冿級',
+ minWidth: 100,
+ slots: { default: 'contractPrice' },
+ };
return [
{ type: 'seq', title: '搴忓彿', minWidth: 50 },
{
@@ -87,12 +102,7 @@
minWidth: 100,
formatter: 'formatAmount2',
},
- {
- field: 'contractPrice',
- title: '鍚堝悓浠凤紙鍏冿級',
- minWidth: 100,
- slots: { default: 'contractPrice' },
- },
+ priceColumn,
{
field: 'count',
title: '鏁伴噺',
--
Gitblit v1.9.3