From d59ce970d04003b30178b840f3a1facb9734d96b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周一, 12 5月 2025 08:44:03 +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/WmsMaterial.tsx | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 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/WmsMaterial.tsx" "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/WmsMaterial.tsx"
index 0dd2315..6fa6a4a 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/WmsMaterial.tsx"
+++ "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/WmsMaterial.tsx"
@@ -207,7 +207,28 @@
isHidePagination={isHidePagination}
pageSize={20}
v-slots={{
- creationTime: ({ row }: any) => {
+ isValid: ({ row }: any) => {
+ return (
+ <div>
+ {row.isValid != null ? (row.isValid ? '鏄�' : '鍚�') : '-'}
+ </div>
+ )
+},
+isSelfMade: ({ row }: any) => {
+ return (
+ <div>
+ {row.isSelfMade != null ? (row.isSelfMade ? '鏄�' : '鍚�') : '-'}
+ </div>
+ )
+},
+isDisabled: ({ row }: any) => {
+ return (
+ <div>
+ {row.isDisabled != null ? (row.isDisabled ? '鏄�' : '鍚�') : '-'}
+ </div>
+ )
+},
+creationTime: ({ row }: any) => {
return (
<div>
{row.creationTime != null
@@ -238,27 +259,6 @@
{row.deletionTime != null
? dayjs(row.deletionTime).format('YYYY-MM-DD HH:mm:ss')
: '-'}
- </div>
- )
-},
-isDisabled: ({ row }: any) => {
- return (
- <div>
- {row.isDisabled != null ? (row.isDisabled ? '鏄�' : '鍚�') : '-'}
- </div>
- )
-},
-isSelfMade: ({ row }: any) => {
- return (
- <div>
- {row.isSelfMade != null ? (row.isSelfMade ? '鏄�' : '鍚�') : '-'}
- </div>
- )
-},
-isValid: ({ row }: any) => {
- return (
- <div>
- {row.isValid != null ? (row.isValid ? '鏄�' : '鍚�') : '-'}
</div>
)
},
--
Gitblit v1.9.3