From 1ad40156ec25db1b9d90c3f94819434e20d52b00 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 16 5月 2025 13:12:45 +0800
Subject: [PATCH] 222
---
PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrderRecord/Controllers/CallMaterialOrderRecordQueryDrawer.tsx | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 104 insertions(+), 6 deletions(-)
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrderRecord/Controllers/CallMaterialOrderRecordQueryDrawer.tsx b/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrderRecord/Controllers/CallMaterialOrderRecordQueryDrawer.tsx
index 286fb38..9363d9b 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrderRecord/Controllers/CallMaterialOrderRecordQueryDrawer.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrderRecord/Controllers/CallMaterialOrderRecordQueryDrawer.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 useCallMaterialOrderRecordQueryDrawer = (props: any, ctx?: any) => {
const callMaterialOrderRecordDrawer = injectModel<CallMaterialOrderRecordDrawer>('CallMaterialOrderRecordDrawer')
@@ -84,6 +93,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ師鏂欐爣璇�',
+ highSelectAttrs:{
+ prop: 'dataIdentifier_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '鍘熸枡鍨嬪彿',
@@ -91,6 +106,25 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ師鏂欏瀷鍙�',
+ highSelectAttrs:{
+ prop: 'materialMode_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
+ },
+ {
+ label: '鍘熸枡鎵规',
+ prop: 'materialBatch',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ュ師鏂欐壒娆�',
+ highSelectAttrs:{
+ prop: 'materialBatch_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '鍙枡鐘舵��',
@@ -100,6 +134,12 @@
option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ュ彨鏂欑姸鎬�',
+ highSelectAttrs:{
+ prop: 'callMaterialStatus_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_BOOL
+ }
},
{
label: '鍙枡鏁伴噺',
@@ -116,6 +156,12 @@
precision: 0,
//disabled: disabled,
placeholder: '璇疯緭鍏ュ彨鏂欐暟閲�',
+ highSelectAttrs:{
+ prop: 'quantity_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_NUM
+ }
},
{
label: 'WMS杩斿洖缁撴灉',
@@ -123,6 +169,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏MS杩斿洖缁撴灉',
+ highSelectAttrs:{
+ prop: 'wmsRetResult_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: 'WMS浠诲姟鍙�',
@@ -130,6 +182,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏MS浠诲姟鍙�',
+ highSelectAttrs:{
+ prop: 'wmsTaskNo_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '鍒涘缓鏃堕棿',
@@ -144,6 +202,7 @@
width: '100%',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ垱寤烘椂闂�',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
},
{
label: '淇敼鏃堕棿',
@@ -158,6 +217,7 @@
width: '100%',
//disabled: disabled,
placeholder: '璇疯緭鍏ヤ慨鏀规椂闂�',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
},
{
label: '鍒涘缓浜�',
@@ -165,6 +225,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ垱寤轰汉',
+ highSelectAttrs:{
+ prop: 'creatorName_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '澶囨敞',
@@ -172,6 +238,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ娉�',
+ highSelectAttrs:{
+ prop: 'remark_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
])
/**
@@ -187,15 +259,25 @@
const commonGetFormData=()=>{
const data = {
dataIdentifier: formData.value.dataIdentifier || '',
+dataIdentifier_FilterMode: formData.value.dataIdentifier_FilterMode || '',
materialMode: formData.value.materialMode || '',
+materialMode_FilterMode: formData.value.materialMode_FilterMode || '',
+materialBatch: formData.value.materialBatch || '',
+materialBatch_FilterMode: formData.value.materialBatch_FilterMode || '',
callMaterialStatus: formData.value.callMaterialStatus || '',
+callMaterialStatus_FilterMode: formData.value.callMaterialStatus_FilterMode || '',
quantity: formData.value.quantity || '',
+quantity_FilterMode: formData.value.quantity_FilterMode || '',
wmsRetResult: formData.value.wmsRetResult || '',
+wmsRetResult_FilterMode: formData.value.wmsRetResult_FilterMode || '',
wmsTaskNo: formData.value.wmsTaskNo || '',
+wmsTaskNo_FilterMode: formData.value.wmsTaskNo_FilterMode || '',
creationTime: formData.value.creationTime || '',
lastModificationTime: formData.value.lastModificationTime || '',
creatorName: formData.value.creatorName || '',
-remark: formData.value.remark || '',
+creatorName_FilterMode: formData.value.creatorName_FilterMode || '',
+remark: formData.value.remark || '',
+remark_FilterMode: formData.value.remark_FilterMode || '',
}
return data;
}
@@ -213,22 +295,37 @@
const data =commonGetFormData();
ctx.emit('confirmQuery', data)
}
+ /**
+ * 閲嶇疆鍏叡select鏌ヨ
+ */
+ const onResetForHighSelect = async () => {
+ formData.value.dataIdentifier_FilterMode = 1
+formData.value.materialMode_FilterMode = 1
+formData.value.materialBatch_FilterMode = 1
+formData.value.callMaterialStatus_FilterMode = 2
+formData.value.quantity_FilterMode = 2
+formData.value.wmsRetResult_FilterMode = 1
+formData.value.wmsTaskNo_FilterMode = 1
+formData.value.creatorName_FilterMode = 1
+formData.value.remark_FilterMode = 1
+ }
/**
* 閲嶇疆鏌ヨ
*/
const onReset = async () => {
formData.value = {}
+ onResetForHighSelect();//閲嶇疆鍏叡select鏌ヨ
formData.value.dataIdentifier = ''
formData.value.materialMode = ''
+formData.value.materialBatch = ''
formData.value.callMaterialStatus = ''
formData.value.quantity = ''
formData.value.wmsRetResult = ''
formData.value.wmsTaskNo = ''
-formData.value.deletionTime = ''
-formData.value.remark = ''
-formData.value.extraField1 = ''
-formData.value.extraField2 = ''
-formData.value.extraField3 = ''
+formData.value.creationTime = ''
+formData.value.lastModificationTime = ''
+formData.value.creatorName = ''
+formData.value.remark = ''
//鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
ctx.emit('restQuery');
}
@@ -260,6 +357,7 @@
}
commonQueryEnumForFrom()
+ onResetForHighSelect();//閲嶇疆鍏叡select鏌ヨ
/**
* 寮圭獥鎵撳紑鑾峰彇璇︽儏
*/
--
Gitblit v1.9.3