From 27ba504441037666e787ded85b4af2f65be65c17 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 29 4月 2025 18:06:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/Config.ts | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 4 deletions(-)
diff --git a/HIAWms/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/Config.ts b/HIAWms/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/Config.ts
index fc700db..7b9e98c 100644
--- a/HIAWms/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/Config.ts
+++ b/HIAWms/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/Config.ts
@@ -5,12 +5,79 @@
title: '搴忓彿',
},
{
- field: 'name',
- title: '鍚嶇О',
+ field: 'materialCode',
+ title: '鐗╂枡缂栫爜',
},
{
- field: 'code',
- title: '缂栧彿',
+ field: 'materialName',
+ title: '鐗╂枡鍚嶇О',
+ },
+ {
+ field: 'purchaseType',
+ title: '閲囪喘绫诲瀷',
+ formatter: ({ cellValue }) => {
+ // You'll need to map the enum values to display text
+ const purchaseTypeMap = {
+ 0: '绫诲瀷1',
+ 1: '绫诲瀷2',
+ // Add all enum values
+ }
+ return purchaseTypeMap[cellValue] || cellValue
+ },
+ },
+ {
+ field: 'materialType',
+ title: '鐗╂枡绫诲瀷',
+ formatter: ({ cellValue }) => {
+ // Map material type enum to display text
+ const materialTypeMap = {
+ 0: '绫诲瀷A',
+ 1: '绫诲瀷B',
+ // Add all enum values
+ }
+ return materialTypeMap[cellValue] || cellValue
+ },
+ },
+ {
+ field: 'primaryUnit',
+ title: '涓诲崟浣�',
+ },
+ {
+ field: 'standard',
+ title: '瑙勬牸/鏍囧噯',
+ },
+ {
+ field: 'outerDiameter',
+ title: '澶栧緞(mm)',
+ },
+ {
+ field: 'wallThickness',
+ title: '澹佸帤(mm)',
+ },
+ {
+ field: 'materialQuality',
+ title: '鏉愯川',
+ },
+ {
+ field: 'length',
+ title: '闀垮害(m)',
+ },
+ {
+ field: 'isMainBranch',
+ title: '涓绘敮绠�',
+ formatter: ({ cellValue }) => (cellValue ? '鏄�' : '鍚�'),
+ },
+ {
+ field: 'factory',
+ title: '鐢熶骇宸ュ巶',
+ },
+ {
+ field: 'certification',
+ title: '璇佷功缂栧彿',
+ },
+ {
+ field: 'sort',
+ title: '鎺掑簭',
},
{
field: 'remark',
--
Gitblit v1.9.3