From dc2aad89c80958f6c444e82ab196cea931e6addc Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 13 5月 2025 06:19:24 +0800
Subject: [PATCH] 222
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx | 99 ++++++++++++++++++++++++++-----------------------
1 files changed, 52 insertions(+), 47 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 9ffe64f..3ee0c8d 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,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮侊紙鍞竴鏍囪瘑锛�',
+ highSelectAttrs:{
+ prop: 'materialCode_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:[{label: '妯＄硦鏌ヨ',value: 1}, {label: '绮惧噯鏌ヨ',value: 2}],
+ }
},
{
label: '鏄惁鏈夋晥鐗╂枡',
@@ -91,7 +97,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 +106,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: '鏁伴噺',
@@ -141,7 +149,7 @@
placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
},
{
- label: '',
+ label: '鍙┖闀垮害',
prop: 'nullLength',
el: (props: any, { attrs }: SetupContext) => {
return h(inputNumber, {
@@ -154,7 +162,7 @@
step: 0.01,
precision: 2,
//disabled: disabled,
- placeholder: '璇疯緭鍏�',
+ placeholder: '璇疯緭鍏ュ彲绌洪暱搴�',
},
{
label: '閲囪喘绫诲瀷锛堟灇涓惧�硷級',
@@ -300,8 +308,16 @@
options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
},
{
+ label: '鎵╁睍灞炴��',
+ prop: 'extraProperties',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ墿灞曞睘鎬�',
+ },
+ {
label: '鍒涘缓鏃堕棿',
prop: 'creationTime',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
el: (props: any, { attrs }: SetupContext) => {
return h(dateTimePickerRange, {
...props,
@@ -312,6 +328,21 @@
width: '100%',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ垱寤烘椂闂�',
+ },
+ {
+ label: '淇敼鏃堕棿',
+ prop: 'lastModificationTime',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(dateTimePickerRange, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ヤ慨鏀规椂闂�',
},
{
label: '鍒涘缓浜�',
@@ -326,41 +357,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',
},
])
/**
@@ -374,8 +370,10 @@
return check
}
const commonGetFormData=()=>{
+ //alert(formData.value.materialCode_FilterMode)
const data = {
materialCode: formData.value.materialCode || '',
+ materialCode_FilterMode: formData.value.materialCode_FilterMode || '',
isValid: formData.value.isValid || '',
isSelfMade: formData.value.isSelfMade || '',
num: formData.value.num || '',
@@ -398,14 +396,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;
}
@@ -424,10 +419,20 @@
ctx.emit('confirmQuery', data)
}
/**
+ * 閲嶇疆鍏叡select鏌ヨ
+ */
+ const onResetForHighSelect = async () => {
+ formData.value.materialCode_FilterMode = 1
+
+ //鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
+ ctx.emit('restQuery');
+ }
+ /**
* 閲嶇疆鏌ヨ
*/
const onReset = async () => {
formData.value = {}
+ onResetForHighSelect();//閲嶇疆鍏叡select鏌ヨ
formData.value.MaterialCode = ''
formData.value.IsValid = ''
formData.value.IsSelfMade = ''
@@ -450,8 +455,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 = ''
@@ -496,6 +500,7 @@
}
commonQueryEnumForFrom()
+ onResetForHighSelect();//閲嶇疆鍏叡select鏌ヨ
/**
* 寮圭獥鎵撳紑鑾峰彇璇︽儏
*/
--
Gitblit v1.9.3