From 413f167eacffa8958341bcdcf7bc97d547664868 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 13 5月 2025 06:13:02 +0800
Subject: [PATCH] 高级查询初步
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/components/DyFormForHighQuery/DyFormForHighQuery.tsx | 18 ++++++++++++------
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/components/DyFormForHighQuery/DyFormForHighQuery.d.ts | 1 +
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx | 18 ++++++++++++++++--
3 files changed, 29 insertions(+), 8 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/components/DyFormForHighQuery/DyFormForHighQuery.d.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/components/DyFormForHighQuery/DyFormForHighQuery.d.ts"
index 37a99ee..966d115 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/components/DyFormForHighQuery/DyFormForHighQuery.d.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/components/DyFormForHighQuery/DyFormForHighQuery.d.ts"
@@ -13,6 +13,7 @@
label?: String | Ref<string>
rules?: any[] | Ref<any[]>
disabled?: boolean | Ref<boolean>
+ isDateControl?: boolean | Ref<boolean>
placeholder?: string | Ref<string>
type?: string | Ref<string>
width?: string | Ref<string>
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/components/DyFormForHighQuery/DyFormForHighQuery.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/components/DyFormForHighQuery/DyFormForHighQuery.tsx"
index b56f993..eab58b1 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/components/DyFormForHighQuery/DyFormForHighQuery.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/components/DyFormForHighQuery/DyFormForHighQuery.tsx"
@@ -170,7 +170,7 @@
const Component = el
const el2 =
formItemElementMap['select'];
- const Component2 = el2
+ const ComponentForHighSelect = el2
return Component && !item.isHide ? (
<el-form-item
@@ -201,15 +201,21 @@
<el-option label="绛変簬" value="2" />
<el-option label="涓嶇瓑浜�" value="8" />
</el-select> */}
-
- <Component2 style="width:150px;"
+ {/* 褰撶粍浠剁被鍨嬩笉鏄棩鏈熸帶浠舵椂鏄剧ずComponentForHighSelect */}
+ {(!itemProps.isDateControl && (
+ // ComponentForHighSelect 鐨勬覆鏌撲唬鐮�
+ <ComponentForHighSelect style="width:150px;"
{...itemProps.highSelectAttrs}
- modelValue={currentWidgetModel.value(itemProps.highSelectAttrs)}
+ modelValue={currentWidgetModel.value(itemProps.highSelectAttrs?.prop || '')}
onUpdate:modelValue={(val: string | number) =>
- onUpdateModelValue(val, itemProps.highSelectAttrs)
+ onUpdateModelValue(val, itemProps.highSelectAttrs?.prop || '')
}>
<FormRenderForHighSelectOptions item={itemProps} />
- </Component2>
+ </ComponentForHighSelect>
+))}
+ {/* 鏃ユ湡鎺т欢鏃剁殑鍗犱綅鍏冪礌 */}
+{itemProps.isDateControl && <span style="width:150px;margin-right:8px;"></span>}
+
<Component
style={{
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 dcb33ed..6531e05 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,9 +84,9 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮侊紙鍞竴鏍囪瘑锛�',
- highSelectOptions: [{label: '鐪�',value: true}, {label: '鍋囧晩',value: false}],
+ highSelectOptions: [{label: '妯＄硦鏌ヨ',value: 1}, {label: '绮惧噯鏌ヨ',value: 2}],
highSelectAttrs:{
- prop: 'materialCodexxx',
+ prop: 'materialCode_FilterMode',
el: 'select',
placeholder: '璇烽�夋嫨',
options:[]
@@ -318,6 +318,7 @@
{
label: '鍒涘缓鏃堕棿',
prop: 'creationTime',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
el: (props: any, { attrs }: SetupContext) => {
return h(dateTimePickerRange, {
...props,
@@ -332,6 +333,7 @@
{
label: '淇敼鏃堕棿',
prop: 'lastModificationTime',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
el: (props: any, { attrs }: SetupContext) => {
return h(dateTimePickerRange, {
...props,
@@ -369,8 +371,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 || '',
@@ -416,10 +420,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 = ''
--
Gitblit v1.9.3