From 3aedad63dd01f1fc5154cb520af32edab967d6e0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 12 5月 2025 09:15:26 +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 | 42 +++++++++++-------------------------------
1 files changed, 11 insertions(+), 31 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 1033632..c2b4865 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"
@@ -110,13 +110,18 @@
width:160,
},
{
- field: 'sort',
- title: '鎺掑簭',
+ field: 'remark',
+ title: '澶囨敞',
width:160,
},
{
- field: 'remark',
- title: '澶囨敞',
+ field: 'isDisabled',
+ title: '鏄惁绂佺敤',
+ width:80,
+},
+{
+ field: 'extraProperties',
+ title: '鎵╁睍灞炴��',
width:160,
},
{
@@ -125,8 +130,8 @@
width:180,
},
{
- field: 'deletionTime',
- title: '鍒犻櫎鏃堕棿',
+ field: 'lastModificationTime',
+ title: '淇敼鏃堕棿',
width:180,
},
{
@@ -137,31 +142,6 @@
{
field: 'lastModifierName',
title: '淇敼浜�',
- width:160,
-},
-{
- field: 'operationRemark',
- title: '鎿嶄綔澶囨敞',
- width:160,
-},
-{
- field: 'deleteRemark',
- title: '鍒犻櫎澶囨敞',
- width:160,
-},
-{
- field: 'extraField1',
- title: '鎵╁睍瀛楁1',
- width:160,
-},
-{
- field: 'extraField2',
- title: '鎵╁睍瀛楁2',
- width:160,
-},
-{
- field: 'extraField3',
- title: '鎵╁睍瀛楁3',
width:160,
},
]
--
Gitblit v1.9.3