From 90c84f7521d4979b2e40965e7255e196d07d9e75 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 13 5月 2025 11:21:27 +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 | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 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 301eb74..7244d18 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"
@@ -14,6 +14,15 @@
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'
+// 寮曞叆鍏叡閫夐」閰嶇疆
+import {
+ FILTER_MODE_OPTIONS_STRING,
+ FILTER_MODE_OPTIONS_NUM,
+ FILTER_MODE_OPTIONS_BOOL
+} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';
+import {
+ BOOLEAN_OPTIONS
+} from '@/utils/commonOptionConstants';
export const useWmsMaterialQueryDrawer = (props: any, ctx?: any) => {
const wmsMaterialDrawer = injectModel<WmsMaterialDrawer>('WmsMaterialDrawer')
@@ -84,6 +93,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮侊紙鍞竴鏍囪瘑锛�',
+ highSelectAttrs:{
+ prop: 'materialCode_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING,
+ }
},
{
label: '鏄惁鏈夋晥鐗╂枡',
@@ -91,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: '鏄惁鑷骇',
@@ -99,11 +115,18 @@
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: '鏁伴噺',
prop: 'num',
+ highSelectAttrs:{
+ prop: 'num_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_NUM,
+ },
el: (props: any, { attrs }: SetupContext) => {
return h(inputNumber, {
...props,
@@ -297,7 +320,7 @@
el: 'select',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ槸鍚︾鐢�',
- options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
+ options:BOOLEAN_OPTIONS
},
{
label: '鎵╁睍灞炴��',
@@ -309,6 +332,7 @@
{
label: '鍒涘缓鏃堕棿',
prop: 'creationTime',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
el: (props: any, { attrs }: SetupContext) => {
return h(dateTimePickerRange, {
...props,
@@ -323,6 +347,7 @@
{
label: '淇敼鏃堕棿',
prop: 'lastModificationTime',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
el: (props: any, { attrs }: SetupContext) => {
return h(dateTimePickerRange, {
...props,
@@ -360,8 +385,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 || '',
@@ -407,10 +434,17 @@
ctx.emit('confirmQuery', data)
}
/**
+ * 閲嶇疆鍏叡select鏌ヨ
+ */
+ const onResetForHighSelect = async () => {
+ formData.value.materialCode_FilterMode = 1
+ }
+ /**
* 閲嶇疆鏌ヨ
*/
const onReset = async () => {
formData.value = {}
+ onResetForHighSelect();//閲嶇疆鍏叡select鏌ヨ
formData.value.MaterialCode = ''
formData.value.IsValid = ''
formData.value.IsSelfMade = ''
@@ -478,6 +512,7 @@
}
commonQueryEnumForFrom()
+ onResetForHighSelect();//閲嶇疆鍏叡select鏌ヨ
/**
* 寮圭獥鎵撳紑鑾峰彇璇︽儏
*/
--
Gitblit v1.9.3