From 1772504da433bec2f1695d47e5946c1192e876fb Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 20 5月 2025 11:53:40 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Controllers/WmsInOutStockOrderDetailQueryDrawer.tsx | 153 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 129 insertions(+), 24 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Controllers/WmsInOutStockOrderDetailQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Controllers/WmsInOutStockOrderDetailQueryDrawer.tsx
index 2c514b4..0ba3362 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Controllers/WmsInOutStockOrderDetailQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Controllers/WmsInOutStockOrderDetailQueryDrawer.tsx
@@ -14,12 +14,19 @@
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 useWmsInOutStockOrderDetailQueryDrawer = (
props: any,
ctx?: any
) => {
- const wmsInOutStockOrderDetailDrawer =
+ const WmsInOutStockOrderDetailDrawer =
injectModel<WmsInOutStockOrderDetailDrawer>(
'WmsInOutStockOrderDetailDrawer'
)
@@ -81,7 +88,7 @@
},
})
/**
- * 娣诲姞鐨刦orm瀛楁
+ * 楂樼骇鏌ヨ鐨刦orm瀛楁
*/
const formItems = reactive([
{
@@ -90,6 +97,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ崟鎹紪鍙�',
+ highSelectAttrs: {
+ prop: 'orderNo_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
label: '鐗╂枡鍞竴鐮�',
@@ -97,13 +110,27 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欏敮涓�鐮�',
+ highSelectAttrs: {
+ prop: 'materialId_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
label: '鍗曟嵁绫诲瀷',
prop: 'orderType',
el: 'select',
+ clearable: true,
+ option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ュ崟鎹被鍨�',
+ highSelectAttrs: {
+ prop: 'orderType_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_BOOL,
+ },
},
{
label: '鐗╂枡浠跺彿',
@@ -111,6 +138,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欎欢鍙�',
+ highSelectAttrs: {
+ prop: 'materialNo_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
label: '鐗╂枡鍚嶇О',
@@ -118,6 +151,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
+ highSelectAttrs: {
+ prop: 'materialName_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
label: '瀹瑰櫒缂栧彿',
@@ -125,21 +164,51 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ鍣ㄧ紪鍙�',
+ highSelectAttrs: {
+ prop: 'containerNo_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
- label: '鍨嬪彿',
+ label: '鏈哄瀷',
prop: 'materialModel',
el: 'input',
//disabled: disabled,
- placeholder: '璇疯緭鍏ュ瀷鍙�',
+ placeholder: '璇疯緭鍏ユ満鍨�',
+ highSelectAttrs: {
+ prop: 'materialModel_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
label: '鐗╂枡鎵规',
prop: 'materialBatch',
el: 'input',
- width: '100%',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欐壒娆�',
+ highSelectAttrs: {
+ prop: 'materialBatch_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
+ },
+ {
+ label: '澶囨敞',
+ prop: 'remark',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ュ娉�',
+ highSelectAttrs: {
+ prop: 'remark_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
label: '鍒涘缓鏃堕棿',
@@ -154,14 +223,23 @@
width: '100%',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ槸鍚︾鐢�',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
},
- {
- label: '澶囨敞',
- prop: 'remark',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ュ娉�',
- },
+ // {
+ // label: '',
+ // prop: 'lastModificationTime',
+ // el: (props: any, { attrs }: SetupContext) => {
+ // return h(dateTimePickerRange, {
+ // ...props,
+ // clearable: true,
+ // ...attrs,
+ // })
+ // },
+ // width: '100%',
+ // //disabled: disabled,
+ // placeholder: '璇疯緭鍏�',
+ // isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
+ // },
])
/**
* 鏍￠獙鏄惁鏈夋暟鎹彉鍖�
@@ -176,16 +254,25 @@
const commonGetFormData = () => {
const data = {
orderNo: formData.value.orderNo || '',
+ orderNo_FilterMode: formData.value.orderNo_FilterMode || '',
materialId: formData.value.materialId || '',
+ materialId_FilterMode: formData.value.materialId_FilterMode || '',
orderType: formData.value.orderType || '',
+ orderType_FilterMode: formData.value.orderType_FilterMode || '',
materialNo: formData.value.materialNo || '',
+ materialNo_FilterMode: formData.value.materialNo_FilterMode || '',
materialName: formData.value.materialName || '',
+ materialName_FilterMode: formData.value.materialName_FilterMode || '',
containerNo: formData.value.containerNo || '',
+ containerNo_FilterMode: formData.value.containerNo_FilterMode || '',
materialModel: formData.value.materialModel || '',
+ materialModel_FilterMode: formData.value.materialModel_FilterMode || '',
materialBatch: formData.value.materialBatch || '',
- creationTime: formData.value.creationTime || '',
- isDisabled: formData.value.isDisabled || '',
+ materialBatch_FilterMode: formData.value.materialBatch_FilterMode || '',
remark: formData.value.remark || '',
+ remark_FilterMode: formData.value.remark_FilterMode || '',
+ creationTime: formData.value.creationTime || '',
+ lastModificationTime: formData.value.lastModificationTime || '',
}
return data
}
@@ -204,19 +291,36 @@
ctx.emit('confirmQuery', data)
}
/**
+ * 閲嶇疆鍏叡select鏌ヨ
+ */
+ const onResetForHighSelect = async () => {
+ formData.value.orderNo_FilterMode = 1
+ formData.value.materialId_FilterMode = 1
+ formData.value.orderType_FilterMode = 2
+ formData.value.materialNo_FilterMode = 1
+ formData.value.materialName_FilterMode = 1
+ formData.value.containerNo_FilterMode = 1
+ formData.value.materialModel_FilterMode = 1
+ formData.value.materialBatch_FilterMode = 1
+ formData.value.remark_FilterMode = 1
+ }
+ /**
* 閲嶇疆鏌ヨ
*/
const onReset = async () => {
formData.value = {}
- formData.value.OrderNo = ''
- formData.value.MaterialId = ''
- formData.value.OrderType = ''
- formData.value.MaterialNo = ''
- formData.value.MaterialName = ''
- formData.value.ContainerNo = ''
- formData.value.MaterialModel = ''
- formData.value.MaterialBatch = ''
- formData.value.Remark = ''
+ onResetForHighSelect() //閲嶇疆鍏叡select鏌ヨ
+ formData.value.orderNo = ''
+ formData.value.materialId = ''
+ formData.value.orderType = ''
+ formData.value.materialNo = ''
+ formData.value.materialName = ''
+ formData.value.containerNo = ''
+ formData.value.materialModel = ''
+ formData.value.materialBatch = ''
+ formData.value.remark = ''
+ formData.value.creationTime = ''
+ formData.value.lastModificationTime = ''
//鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
ctx.emit('restQuery')
}
@@ -242,12 +346,13 @@
*/
const commonQueryEnumForFrom = async () => {
const orderTypeEnumEnum =
- await wmsInOutStockOrderDetailDrawer.getWmsEnumData({
+ await WmsInOutStockOrderDetailDrawer.getWmsEnumData({
EnumName: 'OrderTypeEnum',
})
updateFormItemOptions('orderType', orderTypeEnumEnum)
}
commonQueryEnumForFrom()
+ onResetForHighSelect() //閲嶇疆鍏叡select鏌ヨ
/**
* 寮圭獥鎵撳紑鑾峰彇璇︽儏
*/
--
Gitblit v1.9.3