From a8331b706b8678af9b907bf68971ce10eeb41c36 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 12 5月 2025 21:56:25 +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/Controllers/WmsMaterialQueryDrawer.tsx | 81 ++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 45 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/Controllers/WmsMaterialQueryDrawer.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/Controllers/WmsMaterialQueryDrawer.tsx"
index ea15e00..dcb33ed 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/Controllers/WmsMaterialQueryDrawer.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/Controllers/WmsMaterialQueryDrawer.tsx"
@@ -84,6 +84,13 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮侊紙鍞竴鏍囪瘑锛�',
+ highSelectOptions: [{label: '鐪�',value: true}, {label: '鍋囧晩',value: false}],
+ highSelectAttrs:{
+ prop: 'materialCodexxx',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:[]
+ }
},
{
label: '鏄惁鏈夋晥鐗╂枡',
@@ -91,7 +98,8 @@
el: 'select',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ槸鍚︽湁鏁堢墿鏂�',
- options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
+ options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}],
+ selectOptions: [{label: '鐪�',value: true}, {label: '鍋囧晩',value: false}]
},
{
label: '鏄惁鑷骇',
@@ -99,7 +107,8 @@
el: 'select',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ槸鍚﹁嚜浜�',
- options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
+ options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] ,
+ selectOptions: [{label: '鐪�',value: true}, {label: '鍋囧晩',value: false}]
},
{
label: '鏁伴噺',
@@ -300,6 +309,13 @@
options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
},
{
+ label: '鎵╁睍灞炴��',
+ prop: 'extraProperties',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ墿灞曞睘鎬�',
+ },
+ {
label: '鍒涘缓鏃堕棿',
prop: 'creationTime',
el: (props: any, { attrs }: SetupContext) => {
@@ -314,6 +330,20 @@
placeholder: '璇疯緭鍏ュ垱寤烘椂闂�',
},
{
+ label: '淇敼鏃堕棿',
+ prop: 'lastModificationTime',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(dateTimePickerRange, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ヤ慨鏀规椂闂�',
+ },
+ {
label: '鍒涘缓浜�',
prop: 'creatorName',
el: 'input',
@@ -326,41 +356,6 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ヤ慨鏀逛汉',
- },
- {
- label: '鎿嶄綔澶囨敞',
- prop: 'operationRemark',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ搷浣滃娉�',
- },
- {
- label: '鍒犻櫎澶囨敞',
- prop: 'deleteRemark',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ュ垹闄ゅ娉�',
- },
- {
- label: '鎵╁睍瀛楁1',
- prop: 'extraField1',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�1',
- },
- {
- label: '鎵╁睍瀛楁2',
- prop: 'extraField2',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�2',
- },
- {
- label: '鎵╁睍瀛楁3',
- prop: 'extraField3',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�3',
},
])
/**
@@ -398,14 +393,11 @@
redundantField3: formData.value.redundantField3 || '',
remark: formData.value.remark || '',
isDisabled: formData.value.isDisabled || '',
+extraProperties: formData.value.extraProperties || '',
creationTime: formData.value.creationTime || '',
+lastModificationTime: formData.value.lastModificationTime || '',
creatorName: formData.value.creatorName || '',
-lastModifierName: formData.value.lastModifierName || '',
-operationRemark: formData.value.operationRemark || '',
-deleteRemark: formData.value.deleteRemark || '',
-extraField1: formData.value.extraField1 || '',
-extraField2: formData.value.extraField2 || '',
-extraField3: formData.value.extraField3 || '',
+lastModifierName: formData.value.lastModifierName || '',
}
return data;
}
@@ -450,8 +442,7 @@
formData.value.RedundantField2 = ''
formData.value.RedundantField3 = ''
formData.value.Remark = ''
-formData.value.CreatorName = ''
-formData.value.LastModifierName = ''
+formData.value.DeletionTime = ''
formData.value.OperationRemark = ''
formData.value.DeleteRemark = ''
formData.value.ExtraField1 = ''
--
Gitblit v1.9.3