From 0cd95d98fdf7ed22d53398242feb2a3ca185cf09 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 13 5月 2025 15:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts | 84 ++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 52 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts"
index 1e6b082..7d72d81 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts"
@@ -10,8 +10,33 @@
width:160,
},
{
+ field: 'isValid',
+ title: '鏄惁鏈夋晥鐗╂枡',
+ width:80,
+},
+{
+ field: 'isSelfMade',
+ title: '鏄惁鑷骇',
+ width:80,
+},
+{
+ field: 'num',
+ title: '鏁伴噺',
+ width:160,
+},
+{
+ field: 'selfNum',
+ title: '鑷湁鏁伴噺',
+ width:160,
+},
+{
field: 'materialName',
title: '鐗╂枡鍚嶇О',
+ width:160,
+},
+{
+ field: 'nullLength',
+ title: '鍙┖闀垮害',
width:160,
},
{
@@ -85,13 +110,18 @@
width:160,
},
{
+ field: 'remark',
+ title: '澶囨敞',
+ width:160,
+},
+{
field: 'creationTime',
title: '鍒涘缓鏃堕棿',
width:180,
},
{
- field: 'deletionTime',
- title: '鍒犻櫎鏃堕棿',
+ field: 'lastModificationTime',
+ title: '淇敼鏃堕棿',
width:180,
},
{
@@ -102,56 +132,6 @@
{
field: 'lastModifierName',
title: '淇敼浜�',
- width:160,
-},
-{
- field: 'sort',
- title: '鎺掑簭',
- width:160,
-},
-{
- field: 'remark',
- title: '澶囨敞',
- width:160,
-},
-{
- field: 'extraField1',
- title: '鎵╁睍瀛楁1',
- width:160,
-},
-{
- field: 'extraField2',
- title: '鎵╁睍瀛楁2',
- width:160,
-},
-{
- field: 'extraField3',
- title: '鎵╁睍瀛楁3',
- width:160,
-},
-{
- field: 'isSelfMade',
- title: '鏁伴噺',
- width:80,
-},
-{
- field: 'isValid',
- title: '鏄惁鏈夋晥鐗╂枡',
- width:80,
-},
-{
- field: 'nullLength',
- title: '',
- width:160,
-},
-{
- field: 'num',
- title: '鏄惁鏈夋晥鐗╂枡',
- width:160,
-},
-{
- field: 'selfNum',
- title: '鑷湁鏁伴噺',
width:160,
},
]
--
Gitblit v1.9.3