From 7e412efefa7ebb636cd591e5121ce4e9e54836c2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 20 5月 2025 12:43:22 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockQueryDrawer.tsx | 175 +++++++++++++--
HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStockDetail/WmsMaterialStockDetail.tsx | 52 +++
HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Models/WmsMaterialStockDetailQueryDrawer.ts | 4
HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/Dialog/WmsMaterialStockQuery/WmsMaterialStockQueryDrawer.tsx | 6
HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/Dialog/WmsMaterialStockDetailQuery/WmsMaterialStockDetailQueryDrawer.tsx | 10
HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStockDetail/Config.ts | 4
HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDetailQueryDrawer.tsx | 340 +++++++++++++++++++++++++-----
HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx | 66 ++++-
8 files changed, 521 insertions(+), 136 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDetailQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDetailQueryDrawer.tsx
index a7ecbbf..5aaa3da 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDetailQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDetailQueryDrawer.tsx
@@ -9,16 +9,23 @@
h,
} from 'vue'
import { injectModel } from '@/libs/Provider/Provider'
-import { WmsMaterialStockDrawer } from '../Models/WmsMaterialStockDrawer'
+import { WmsMaterialStockDetailQueryDrawer } from '../Models/WmsMaterialStockDetailQueryDrawer'
import { ElMessage } from 'element-plus'
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'
+import { getAreaAreaDataList } from '@/widgets/HIAWms/Models/Service/WmsMaterialDrawer'
+// 寮曞叆鍏叡閫夐」閰嶇疆
+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 useWmsMaterialStockDetalQueryDrawer = (props: any, ctx?: any) => {
- const wmsMaterialStockDetailDrawer = injectModel<WmsMaterialStockDrawer>(
- 'WmsMaterialStockDrawer'
- )
+export const useWmsMaterialStockDetailQueryDrawer = (props: any, ctx?: any) => {
+ const wmsMaterialStockDetailDrawer =
+ injectModel<WmsMaterialStockDetailQueryDrawer>('wmsMaterialStockDrawer')
/**
* 鐢ㄦ潵瀵规瘮鐨勫垵濮嬪寲鏁版嵁
*/
@@ -86,6 +93,12 @@
// el: 'input',
// //disabled: disabled,
// placeholder: '璇疯緭鍏ョ墿鏂橧D',
+ // highSelectAttrs: {
+ // prop: 'materialId_FilterMode',
+ // el: 'select',
+ // placeholder: '璇烽�夋嫨',
+ // options: FILTER_MODE_OPTIONS_STRING,
+ // },
// },
{
label: '鐗╂枡鍚嶇О',
@@ -93,14 +106,26 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
+ highSelectAttrs: {
+ prop: 'materialName_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
- // {
- // label: '瀹瑰櫒缂栧彿',
- // prop: 'containerNo',
- // el: 'input',
- // //disabled: disabled,
- // placeholder: '璇疯緭鍏ュ鍣ㄧ紪鍙�',
- // },
+ {
+ label: '瀹瑰櫒缂栧彿',
+ prop: 'containerNo',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ュ鍣ㄧ紪鍙�',
+ highSelectAttrs: {
+ prop: 'containerNo_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
+ },
// {
// label: '瀹瑰櫒鐘舵��',
// prop: 'containerStatus',
@@ -109,6 +134,12 @@
// option: [],
// //disabled: disabled,
// placeholder: '璇疯緭鍏ュ鍣ㄧ姸鎬�',
+ // highSelectAttrs: {
+ // prop: 'containerStatus_FilterMode',
+ // el: 'select',
+ // placeholder: '璇烽�夋嫨',
+ // options: FILTER_MODE_OPTIONS_BOOL,
+ // },
// },
// {
// label: '瀹瑰櫒绫诲瀷',
@@ -118,6 +149,12 @@
// option: [],
// //disabled: disabled,
// placeholder: '璇疯緭鍏ュ鍣ㄧ被鍨�',
+ // highSelectAttrs: {
+ // prop: 'containerType_FilterMode',
+ // el: 'select',
+ // placeholder: '璇烽�夋嫨',
+ // options: FILTER_MODE_OPTIONS_BOOL,
+ // },
// },
{
label: '鐗╂枡缂栧彿',
@@ -125,6 +162,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欑紪鍙�',
+ highSelectAttrs: {
+ prop: 'materialNo_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
label: '搴撳瓨鏁伴噺',
@@ -141,6 +184,12 @@
precision: 0,
//disabled: disabled,
placeholder: '璇疯緭鍏ュ簱瀛樻暟閲�',
+ highSelectAttrs: {
+ prop: 'stockNumber_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_NUM,
+ },
},
{
label: '鐗╂枡鎵规',
@@ -148,6 +197,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欐壒娆�',
+ highSelectAttrs: {
+ prop: 'materialBatch_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
// {
// label: '渚涘簲鍟嗙紪鍙�',
@@ -155,6 +210,12 @@
// el: 'input',
// //disabled: disabled,
// placeholder: '璇疯緭鍏ヤ緵搴斿晢缂栧彿',
+ // highSelectAttrs: {
+ // prop: 'supplierCode_FilterMode',
+ // el: 'select',
+ // placeholder: '璇烽�夋嫨',
+ // options: FILTER_MODE_OPTIONS_STRING,
+ // },
// },
{
label: '鍨嬪彿',
@@ -162,6 +223,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ瀷鍙�',
+ highSelectAttrs: {
+ prop: 'materialModel_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
label: '搴撲綅缂栧彿',
@@ -169,31 +236,56 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ簱浣嶇紪鍙�',
+ highSelectAttrs: {
+ prop: 'placeNo_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
- label: '搴撲綅鐘舵��;',
+ label: '搴撲綅鐘舵��',
prop: 'placeStatus',
el: 'select',
clearable: true,
option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ュ簱浣嶇姸鎬�;',
+ highSelectAttrs: {
+ prop: 'placeStatus_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_BOOL,
+ },
},
{
label: '搴撲綅绫诲瀷',
prop: 'storageTypeNo',
el: 'select',
- clearable: false,
+ clearable: true,
option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ュ簱浣嶇被鍨�',
+ highSelectAttrs: {
+ prop: 'storageTypeNo_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_BOOL,
+ },
},
{
- label: '鍖哄煙缂栧彿',
+ label: '搴撳尯',
prop: 'areaCode',
- el: 'input',
+ el: 'select',
+ option: [],
//disabled: disabled,
- placeholder: '璇疯緭鍏ュ尯鍩熺紪鍙�',
+ placeholder: '璇疯緭鍏ュ簱鍖�',
+ highSelectAttrs: {
+ prop: 'areaCode_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
// {
// label: '搴撳尯鍚嶇О',
@@ -201,16 +293,28 @@
// el: 'input',
// //disabled: disabled,
// placeholder: '璇疯緭鍏ュ簱鍖哄悕绉�',
+ // highSelectAttrs: {
+ // prop: 'areaName_FilterMode',
+ // el: 'select',
+ // placeholder: '璇烽�夋嫨',
+ // options: FILTER_MODE_OPTIONS_STRING,
+ // },
// },
- // {
- // label: '妫�楠岀姸鎬�(1:鏈楠�,2:妫�楠岄�氳繃,3:妫�楠屼笉閫氳繃)',
- // prop: 'checkStatus',
- // el: 'select',
- // clearable: true,
- // option: [],
- // //disabled: disabled,
- // placeholder: '璇疯緭鍏ユ楠岀姸鎬�(1:鏈楠�,2:妫�楠岄�氳繃,3:妫�楠屼笉閫氳繃)',
- // },
+ {
+ label: '妫�楠岀姸鎬�',
+ prop: 'checkStatus',
+ el: 'select',
+ clearable: true,
+ option: [],
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ楠岀姸鎬�',
+ highSelectAttrs: {
+ prop: 'checkStatus_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_BOOL,
+ },
+ },
{
label: '鏄惁閿佸畾',
prop: 'isLock',
@@ -219,16 +323,28 @@
option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ユ槸鍚﹂攣瀹�',
+ highSelectAttrs: {
+ prop: 'isLock_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_BOOL,
+ },
},
- // {
- // label: '鏄惁绌烘墭(2:鍚�,1:鏄�)',
- // prop: 'emptyContainer',
- // el: 'select',
- // clearable: true,
- // option: [],
- // //disabled: disabled,
- // placeholder: '璇疯緭鍏ユ槸鍚︾┖鎵�(2:鍚�,1:鏄�)',
- // },
+ {
+ label: '鏄惁绌烘墭',
+ prop: 'emptyContainer',
+ el: 'select',
+ clearable: true,
+ option: [],
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ槸鍚︾┖鎵�',
+ highSelectAttrs: {
+ prop: 'emptyContainer_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_BOOL,
+ },
+ },
{
label: '鍏ュ簱鏃堕棿',
prop: 'inStockTime',
@@ -242,21 +358,60 @@
width: '100%',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ叆搴撴椂闂�',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
},
- // {
- // label: '鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��',
- // prop: 'redundantField1',
- // el: 'input',
- // //disabled: disabled,
- // placeholder: '璇疯緭鍏ュ啑浣欏瓧娈�1 - 棰勭暀鎵╁睍鐢ㄩ��',
- // },
- // {
- // label: '鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��',
- // prop: 'redundantField2',
- // el: 'input',
- // //disabled: disabled,
- // placeholder: '璇疯緭鍏ュ啑浣欏瓧娈�2 - 棰勭暀鎵╁睍鐢ㄩ��',
- // },
+ {
+ label: '宸ヨ壓娴佸悜缂栧彿',
+ prop: 'redundantField1',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ュ伐鑹烘祦鍚戠紪鍙�',
+ highSelectAttrs: {
+ prop: 'redundantField1_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
+ },
+ {
+ label: '绠℃缂栫爜',
+ prop: 'redundantField2',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ョ娈电紪鐮�',
+ highSelectAttrs: {
+ prop: 'redundantField2_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
+ },
+ {
+ label: '绠℃鍚嶇О',
+ prop: 'redundantField3',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏edundantField3',
+ highSelectAttrs: {
+ prop: 'redundantField3_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: '鍒涘缓鏃堕棿',
prop: 'creationTime',
@@ -270,13 +425,7 @@
width: '100%',
//disabled: disabled,
placeholder: '璇疯緭鍏�',
- },
- {
- label: '澶囨敞',
- prop: 'remark',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ュ娉�',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
},
])
/**
@@ -292,28 +441,54 @@
const commonGetFormData = () => {
const data = {
materialId: formData.value.materialId || '',
+ materialId_FilterMode: formData.value.materialId_FilterMode || '',
materialName: formData.value.materialName || '',
+ materialName_FilterMode: formData.value.materialName_FilterMode || '',
containerNo: formData.value.containerNo || '',
+ containerNo_FilterMode: formData.value.containerNo_FilterMode || '',
containerStatus: formData.value.containerStatus || '',
+ containerStatus_FilterMode:
+ formData.value.containerStatus_FilterMode || '',
containerType: formData.value.containerType || '',
+ containerType_FilterMode: formData.value.containerType_FilterMode || '',
materialNo: formData.value.materialNo || '',
+ materialNo_FilterMode: formData.value.materialNo_FilterMode || '',
stockNumber: formData.value.stockNumber || '',
+ stockNumber_FilterMode: formData.value.stockNumber_FilterMode || '',
materialBatch: formData.value.materialBatch || '',
+ materialBatch_FilterMode: formData.value.materialBatch_FilterMode || '',
supplierCode: formData.value.supplierCode || '',
+ supplierCode_FilterMode: formData.value.supplierCode_FilterMode || '',
materialModel: formData.value.materialModel || '',
+ materialModel_FilterMode: formData.value.materialModel_FilterMode || '',
placeNo: formData.value.placeNo || '',
+ placeNo_FilterMode: formData.value.placeNo_FilterMode || '',
placeStatus: formData.value.placeStatus || '',
- storageTypeNo: formData.value.storageTypeNo || 1,
+ placeStatus_FilterMode: formData.value.placeStatus_FilterMode || '',
+ storageTypeNo: formData.value.storageTypeNo || '',
+ storageTypeNo_FilterMode: formData.value.storageTypeNo_FilterMode || '',
areaCode: formData.value.areaCode || '',
+ areaCode_FilterMode: formData.value.areaCode_FilterMode || '',
areaName: formData.value.areaName || '',
+ areaName_FilterMode: formData.value.areaName_FilterMode || '',
checkStatus: formData.value.checkStatus || '',
+ checkStatus_FilterMode: formData.value.checkStatus_FilterMode || '',
isLock: formData.value.isLock || '',
+ isLock_FilterMode: formData.value.isLock_FilterMode || '',
emptyContainer: formData.value.emptyContainer || '',
+ emptyContainer_FilterMode: formData.value.emptyContainer_FilterMode || '',
inStockTime: formData.value.inStockTime || '',
remark: formData.value.remark || '',
+ remark_FilterMode: formData.value.remark_FilterMode || '',
redundantField1: formData.value.redundantField1 || '',
+ redundantField1_FilterMode:
+ formData.value.redundantField1_FilterMode || '',
redundantField2: formData.value.redundantField2 || '',
+ redundantField2_FilterMode:
+ formData.value.redundantField2_FilterMode || '',
redundantField3: formData.value.redundantField3 || '',
+ redundantField3_FilterMode:
+ formData.value.redundantField3_FilterMode || '',
creationTime: formData.value.creationTime || '',
lastModificationTime: formData.value.lastModificationTime || '',
}
@@ -334,10 +509,38 @@
ctx.emit('confirmQuery', data)
}
/**
+ * 閲嶇疆鍏叡select鏌ヨ
+ */
+ const onResetForHighSelect = async () => {
+ formData.value.materialId_FilterMode = 1
+ formData.value.materialName_FilterMode = 1
+ formData.value.containerNo_FilterMode = 1
+ formData.value.containerStatus_FilterMode = 2
+ formData.value.containerType_FilterMode = 2
+ formData.value.materialNo_FilterMode = 1
+ formData.value.stockNumber_FilterMode = 2
+ formData.value.materialBatch_FilterMode = 1
+ formData.value.supplierCode_FilterMode = 1
+ formData.value.materialModel_FilterMode = 1
+ formData.value.placeNo_FilterMode = 1
+ formData.value.placeStatus_FilterMode = 2
+ formData.value.storageTypeNo_FilterMode = 2
+ formData.value.areaCode_FilterMode = 1
+ formData.value.areaName_FilterMode = 1
+ formData.value.checkStatus_FilterMode = 2
+ formData.value.isLock_FilterMode = 2
+ formData.value.emptyContainer_FilterMode = 2
+ formData.value.remark_FilterMode = 1
+ formData.value.redundantField1_FilterMode = 1
+ formData.value.redundantField2_FilterMode = 1
+ formData.value.redundantField3_FilterMode = 1
+ }
+ /**
* 閲嶇疆鏌ヨ
*/
const onReset = async () => {
formData.value = {}
+ onResetForHighSelect() //閲嶇疆鍏叡select鏌ヨ
formData.value.materialId = ''
formData.value.materialName = ''
formData.value.containerNo = ''
@@ -350,7 +553,7 @@
formData.value.materialModel = ''
formData.value.placeNo = ''
formData.value.placeStatus = ''
- formData.value.storageTypeNo = 1
+ formData.value.storageTypeNo = ''
formData.value.areaCode = ''
formData.value.areaName = ''
formData.value.checkStatus = ''
@@ -361,7 +564,8 @@
formData.value.redundantField1 = ''
formData.value.redundantField2 = ''
formData.value.redundantField3 = ''
- formData.value.deletionTime = ''
+ formData.value.creationTime = ''
+ formData.value.lastModificationTime = ''
//鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
ctx.emit('restQuery')
}
@@ -379,6 +583,15 @@
item.options = enumData.map((item) => ({
label: item.description,
value: item.value,
+ }))
+ }
+ }
+ const updateFormAreaOptions = (propName: string, enumData: any[]) => {
+ const item = formItems.find((item) => item.prop === propName)
+ if (item && enumData) {
+ item.options = enumData.map((item) => ({
+ label: item.areaName,
+ value: item.areaNo,
}))
}
}
@@ -415,13 +628,12 @@
const yesNoEnumEnum = await wmsMaterialStockDetailDrawer.getWmsEnumData({
EnumName: 'YesNoEnum',
})
- updateFormItemOptions('isLock', yesNoEnumEnum)
- const yesNoEnumEnum2 = await wmsMaterialStockDetailDrawer.getWmsEnumData({
- EnumName: 'YesNoEnum',
- })
- updateFormItemOptions('emptyContainer', yesNoEnumEnum2)
+ updateFormItemOptions('emptyContainer', yesNoEnumEnum)
+ const areaList = await getAreaAreaDataList()
+ updateFormAreaOptions('areaCode', areaList)
}
commonQueryEnumForFrom()
+ onResetForHighSelect() //閲嶇疆鍏叡select鏌ヨ
/**
* 寮圭獥鎵撳紑鑾峰彇璇︽儏
*/
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockQueryDrawer.tsx
index 23d375b..274c001 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockQueryDrawer.tsx
@@ -14,6 +14,12 @@
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'
+import { getAreaAreaDataList } from '@/widgets/HIAWms/Models/Service/WmsMaterialDrawer'
+import {
+ FILTER_MODE_OPTIONS_STRING,
+ FILTER_MODE_OPTIONS_NUM,
+ FILTER_MODE_OPTIONS_BOOL,
+} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'
export const useWmsMaterialStockQueryDrawer = (props: any, ctx?: any) => {
const wmsMaterialStockDrawer = injectModel<WmsMaterialStockDrawer>(
@@ -86,6 +92,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
+ highSelectAttrs: {
+ prop: 'materialName_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
// {
// label: '瀹瑰櫒缂栧彿',
@@ -118,6 +130,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欑紪鍙�',
+ highSelectAttrs: {
+ prop: 'materialNo_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
// {
// label: '搴撳瓨鏁伴噺',
@@ -141,6 +159,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欐壒娆�',
+ highSelectAttrs: {
+ prop: 'materialBatch_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
// {
// label: '渚涘簲鍟嗙紪鍙�',
@@ -155,6 +179,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ瀷鍙�',
+ highSelectAttrs: {
+ prop: 'materialModel_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
label: '搴撲綅缂栧彿',
@@ -162,15 +192,27 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ簱浣嶇紪鍙�',
+ highSelectAttrs: {
+ prop: 'placeNo_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
- label: '搴撲綅鐘舵��;',
+ label: '搴撲綅鐘舵��',
prop: 'placeStatus',
el: 'select',
clearable: true,
option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ュ簱浣嶇姸鎬�;',
+ highSelectAttrs: {
+ prop: 'placeStatus_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_BOOL,
+ },
},
{
label: '搴撲綅绫诲瀷',
@@ -180,13 +222,26 @@
option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ュ簱浣嶇被鍨�',
+ highSelectAttrs: {
+ prop: 'storageTypeNo_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_BOOL,
+ },
},
{
label: '鍖哄煙缂栧彿',
prop: 'areaCode',
- el: 'input',
+ el: 'select',
+ option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ュ尯鍩熺紪鍙�',
+ highSelectAttrs: {
+ prop: 'areaCode_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
// {
// label: '搴撳尯鍚嶇О',
@@ -212,6 +267,12 @@
option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ユ槸鍚﹂攣瀹�',
+ highSelectAttrs: {
+ prop: 'isLock_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_BOOL,
+ },
},
// {
// label: '鏄惁绌烘墭(2:鍚�,1:鏄�)',
@@ -222,27 +283,27 @@
// //disabled: disabled,
// placeholder: '璇疯緭鍏ユ槸鍚︾┖鎵�(2:鍚�,1:鏄�)',
// },
- {
- label: '鍏ュ簱鏃堕棿',
- prop: 'inStockTime',
- el: (props: any, { attrs }: SetupContext) => {
- return h(dateTimePickerRange, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
- width: '100%',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ュ叆搴撴椂闂�',
- },
- {
- label: '澶囨敞',
- prop: 'remark',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ュ娉�',
- },
+ // {
+ // label: '鍏ュ簱鏃堕棿',
+ // prop: 'inStockTime',
+ // el: (props: any, { attrs }: SetupContext) => {
+ // return h(dateTimePickerRange, {
+ // ...props,
+ // clearable: true,
+ // ...attrs,
+ // })
+ // },
+ // width: '100%',
+ // //disabled: disabled,
+ // placeholder: '璇疯緭鍏ュ叆搴撴椂闂�',
+ // },
+ // {
+ // label: '澶囨敞',
+ // prop: 'remark',
+ // el: 'input',
+ // //disabled: disabled,
+ // placeholder: '璇疯緭鍏ュ娉�',
+ // },
// {
// label: '鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��',
// prop: 'redundantField1',
@@ -305,31 +366,39 @@
}
const commonGetFormData = () => {
const data = {
- materialId: formData.value.materialId || '',
materialName: formData.value.materialName || '',
+ materialName_FilterMode: formData.value.materialName_FilterMode || '',
containerNo: formData.value.containerNo || '',
+ containerNo_FilterMode: formData.value.containerNo_FilterMode || '',
containerStatus: formData.value.containerStatus || '',
+ containerStatus_FilterMode:
+ formData.value.containerStatus_FilterMode || '',
containerType: formData.value.containerType || '',
+ containerType_FilterMode: formData.value.containerType_FilterMode || '',
materialNo: formData.value.materialNo || '',
+ materialNo_FilterMode: formData.value.materialNo_FilterMode || '',
stockNumber: formData.value.stockNumber || '',
- materialBatch: formData.value.materialBatch || '',
+ stockNumber_FilterMode: formData.value.stockNumber_FilterMode || '',
supplierCode: formData.value.supplierCode || '',
+ supplierCode_FilterMode: formData.value.supplierCode_FilterMode || '',
materialModel: formData.value.materialModel || '',
+ materialModel_FilterMode: formData.value.materialModel_FilterMode || '',
placeNo: formData.value.placeNo || '',
+ placeNo_FilterMode: formData.value.placeNo_FilterMode || '',
placeStatus: formData.value.placeStatus || '',
- storageTypeNo: formData.value.storageTypeNo || 1,
+ placeStatus_FilterMode: formData.value.placeStatus_FilterMode || '',
+ storageTypeNo: formData.value.storageTypeNo || '',
+ storageTypeNo_FilterMode: formData.value.storageTypeNo_FilterMode || '',
areaCode: formData.value.areaCode || '',
+ areaCode_FilterMode: formData.value.areaCode_FilterMode || '',
areaName: formData.value.areaName || '',
- checkStatus: formData.value.checkStatus || '',
+ areaName_FilterMode: formData.value.areaName_FilterMode || '',
isLock: formData.value.isLock || '',
- emptyContainer: formData.value.emptyContainer || '',
+ isLock_FilterMode: formData.value.isLock_FilterMode || '',
inStockTime: formData.value.inStockTime || '',
remark: formData.value.remark || '',
- redundantField1: formData.value.redundantField1 || '',
- redundantField2: formData.value.redundantField2 || '',
- redundantField3: formData.value.redundantField3 || '',
+ remark_FilterMode: formData.value.remark_FilterMode || '',
creationTime: formData.value.creationTime || '',
- lastModificationTime: formData.value.lastModificationTime || '',
}
return data
}
@@ -351,6 +420,7 @@
* 閲嶇疆鏌ヨ
*/
const onReset = async () => {
+ onResetForHighSelect() //閲嶇疆鍏叡select鏌ヨ
formData.value = {}
formData.value.materialId = ''
formData.value.materialName = ''
@@ -396,6 +466,15 @@
}))
}
}
+ const updateFormAreaOptions = (propName: string, enumData: any[]) => {
+ const item = formItems.find((item) => item.prop === propName)
+ if (item && enumData) {
+ item.options = enumData.map((item) => ({
+ label: item.areaName,
+ value: item.areaNo,
+ }))
+ }
+ }
/**
* 閫氱敤鏌ヨ鏋氫妇
*/
@@ -431,6 +510,8 @@
EnumName: 'YesNoEnum',
})
updateFormItemOptions('emptyContainer', yesNoEnumEnum2)
+ const areaList = await getAreaAreaDataList()
+ updateFormAreaOptions('areaCode', areaList)
}
commonQueryEnumForFrom()
formData.value.storageTypeNo = 1
@@ -442,6 +523,36 @@
updateCheckData()
}
+ const onResetForHighSelect = async () => {
+ formData.value.materialName_FilterMode = 1
+ formData.value.containerNo_FilterMode = 1
+ formData.value.containerStatus_FilterMode = 2
+ formData.value.containerType_FilterMode = 2
+ formData.value.materialNo_FilterMode = 1
+ formData.value.stockNumber_FilterMode = 2
+ formData.value.materialBatch_FilterMode = 1
+ formData.value.supplierCode_FilterMode = 1
+ formData.value.materialModel_FilterMode = 1
+ formData.value.placeNo_FilterMode = 1
+ formData.value.placeStatus_FilterMode = 2
+ formData.value.storageTypeNo_FilterMode = 2
+ formData.value.areaCode_FilterMode = 1
+ formData.value.areaName_FilterMode = 1
+ formData.value.checkStatus_FilterMode = 2
+ formData.value.isLock_FilterMode = 2
+ formData.value.emptyContainer_FilterMode = 2
+ formData.value.remark_FilterMode = 1
+ formData.value.redundantField1_FilterMode = 1
+ formData.value.redundantField2_FilterMode = 1
+ formData.value.redundantField3_FilterMode = 1
+ }
+
+ commonQueryEnumForFrom()
+ onResetForHighSelect() //閲嶇疆鍏叡select鏌ヨ
+
+ /**
+ * 寮圭獥鎵撳紑鑾峰彇璇︽儏
+ */
watch(() => current.value, onOpen)
return {
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Models/WmsMaterialStockDetailQueryDrawer.ts b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Models/WmsMaterialStockDetailQueryDrawer.ts
index 821f34f..4421b7e 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Models/WmsMaterialStockDetailQueryDrawer.ts
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Models/WmsMaterialStockDetailQueryDrawer.ts
@@ -7,7 +7,9 @@
} from './Service/WmsMaterialStockDetailQueryDrawer'
import { useGlobalState } from '@/libs/Store/Store'
-export class WmsMaterialStockQueryDrawer extends Base<{ [key: string]: any }> {
+export class WmsMaterialStockDetailQueryDrawer extends Base<{
+ [key: string]: any
+}> {
constructor() {
super({
data: [],
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/Dialog/WmsMaterialStockDetailQuery/WmsMaterialStockDetailQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/Dialog/WmsMaterialStockDetailQuery/WmsMaterialStockDetailQueryDrawer.tsx
index b5a331c..a167e58 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/Dialog/WmsMaterialStockDetailQuery/WmsMaterialStockDetailQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/Dialog/WmsMaterialStockDetailQuery/WmsMaterialStockDetailQueryDrawer.tsx
@@ -4,8 +4,8 @@
import { SetupContext, defineComponent } from 'vue'
import BaseQueryDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer'
import styles from './WmsMaterialStockDetailQueryDrawer.module.scss'
-import { useWmsMaterialStockDetalQueryDrawer } from '../../../../Controllers/WmsMaterialStockDetailQueryDrawer.tsx'
-import DyForm from '@/components/DyForm/DyForm'
+import { useWmsMaterialStockDetailQueryDrawer } from '../../../../Controllers/WmsMaterialStockDetailQueryDrawer.tsx'
+import DyFormForHighQuery from '@/components/DyFormForHighQuery/DyFormForHighQuery'
// @ts-ignore
export default defineComponent<{
@@ -45,7 +45,7 @@
visible,
formItems,
formData,
- } = useWmsMaterialStockDetalQueryDrawer(props, ctx)
+ } = useWmsMaterialStockDetailQueryDrawer(props, ctx)
return () => (
<BaseQueryDrawer
class={styles.drawer}
@@ -59,12 +59,12 @@
before-close={onClose}
onClose={onClose}
>
- <DyForm
+ <DyFormForHighQuery
ref={formRef}
formData={formData.value}
labelWidth="106px"
formItemProps={formItems}
- ></DyForm>
+ ></DyFormForHighQuery>
</BaseQueryDrawer>
)
},
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/Dialog/WmsMaterialStockQuery/WmsMaterialStockQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/Dialog/WmsMaterialStockQuery/WmsMaterialStockQueryDrawer.tsx
index e6f47b8..1ec899f 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/Dialog/WmsMaterialStockQuery/WmsMaterialStockQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/Dialog/WmsMaterialStockQuery/WmsMaterialStockQueryDrawer.tsx
@@ -5,7 +5,7 @@
import BaseQueryDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer'
import styles from './WmsMaterialStockQueryDrawer.module.scss'
import { useWmsMaterialStockQueryDrawer } from '../../../../Controllers/WmsMaterialStockQueryDrawer.tsx'
-import DyForm from '@/components/DyForm/DyForm'
+import DyFormForHighQuery from '@/components/DyFormForHighQuery/DyFormForHighQuery'
// @ts-ignore
export default defineComponent<{
@@ -59,12 +59,12 @@
before-close={onClose}
onClose={onClose}
>
- <DyForm
+ <DyFormForHighQuery
ref={formRef}
formData={formData.value}
labelWidth="106px"
formItemProps={formItems}
- ></DyForm>
+ ></DyFormForHighQuery>
</BaseQueryDrawer>
)
},
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx
index 6fab32f..44e5a78 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx
@@ -21,6 +21,8 @@
ElFormItem,
} from 'element-plus'
import { injectModel } from '@/libs/Provider/Provider'
+// 寮曞叆鍏叡閫夐」閰嶇疆
+import { FILTER_MODE_OPTIONS_STRING } from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'
interface RenderTableType {
url?: string
@@ -60,14 +62,13 @@
onSuccess,
onBeforeUpload,
} = useWmsMaterialStock(props, ctx)
-
//瀹氫箟楂樼骇鏌ヨ寮曠敤
const wmsMaterialStockDetailQueryDrawerRef = ref(null)
// 鏂板鐨勬煡璇㈡潯浠�
const queryForm = ref({
searchVal: '',
- storageTypeNo: 1,
str_searchFormInputAttrs: [],
+ searchVal_FilterMode: '',
})
//瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
const _searchFormInputAttrs = ref(['OrderNo', 'MaterialNo', 'MaterialId'])
@@ -138,30 +139,31 @@
}
}
- // 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹�
- onMounted(() => {
- fetchEnumData()
-
- tableRef.value = {
- dataSource: [],
- }
- // handleQueryForMain()
- })
-
// 瀹氫箟鍝嶅簲寮忔煡璇㈡暟鎹�
const _curHighQueryData = ref({
searchVal: '',
str_searchFormInputAttrs: [],
+ searchVal_FilterMode: '',
})
+ // 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹�
+ onMounted(() => {
+ fetchEnumData()
+ queryForm.value.searchVal_FilterMode =
+ FILTER_MODE_OPTIONS_STRING[0]?.value || ''
+ _curHighQueryData.value.searchVal_FilterMode =
+ queryForm.value.searchVal_FilterMode
+ _curHighQueryData.value.str_searchFormInputAttrs =
+ _searchFormInputAttrs.value
+ })
+
// 鏂扮増鐨勬煡璇㈡柟娉曪紙涓婚〉闈腑鐨勬寜閽�愭煡璇€�戯級
const handleQueryForMain = async () => {
_curHighQueryData.value.searchVal = queryForm.value.searchVal
+ _curHighQueryData.value.searchVal_FilterMode =
+ queryForm.value.searchVal_FilterMode
_curHighQueryData.value.str_searchFormInputAttrs =
_searchFormInputAttrs.value
- // if (!_curHighQueryData.value?.storageTypeNo) {
- // _curHighQueryData.value.storageTypeNo = 1
- // }
- tableRef.value?.getList(_curHighQueryData.value)
+ tableRef.value.getList(_curHighQueryData.value)
}
// 鏂扮増鐨勬煡璇㈡柟娉曪紙楂樼骇鏌ヨ涓殑鎸夐挳銆愭煡璇€�戯級
const handleQuery = async (extraParams = {}) => {
@@ -172,6 +174,8 @@
// 鏂扮増鐨勬煡璇㈤噸缃�
const resetQuery = () => {
queryForm.value.searchVal = ''
+ queryForm.value.searchVal_FilterMode =
+ FILTER_MODE_OPTIONS_STRING[0]?.value || ''
queryForm.value.str_searchFormInputAttrs = _searchFormInputAttrs.value
}
//鏂扮増鐨勫鍑烘柟娉�
@@ -189,6 +193,8 @@
const commonSaveCurHighQueryData = (filteredData = {}) => {
_curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }
_curHighQueryData.value.searchVal = queryForm.value.searchVal
+ _curHighQueryData.value.searchVal_FilterMode =
+ queryForm.value.searchVal_FilterMode
_curHighQueryData.value.str_searchFormInputAttrs =
_searchFormInputAttrs.value
}
@@ -203,6 +209,7 @@
)
//缁勫悎妯＄硦鏌ヨ
filteredData.searchVal = queryForm.value.searchVal
+ filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
return filteredData
}
@@ -337,7 +344,7 @@
/>
{/* 楂樼骇鏌ヨ */}
<WmsMaterialStockQueryDrawer
- ref="wmsMaterialStockDetailQueryDrawerRef"
+ ref="wmsMaterialStockQueryDrawerRef"
v-model={dialogConfigForQuery.visible}
title={dialogConfigForQuery.title}
row={current.value}
@@ -390,12 +397,29 @@
placement="top-start"
>
<ElInput
- v-model={queryForm.value.searchVal}
- placeholder={searchFormInputAttrs_Placeholder.value}
- clearable
+ v-mode
class={styles.formItem}
+ placeholder="鐗╂枡缂栫爜/鍨嬪彿"
/>
</el-tooltip>
+ </ElFormItem>
+ <ElFormItem label="" style="width:100px;">
+ <ElSelect
+ v-model={queryForm.value.searchVal_FilterMode}
+ // el={queryForm.value.searchVal}
+ // placeholder={searchFormInputAttrs_Placeholder.value}
+ clearable
+ placeholder="璇烽�夋嫨"
+ class={styles.formItem}
+ >
+ {FILTER_MODE_OPTIONS_STRING.map((option) => (
+ <ElOption
+ key={option.value}
+ label={option.label}
+ value={option.value}
+ />
+ ))}
+ </ElSelect>
</ElFormItem>
<IconButton
type="primary"
@@ -408,7 +432,7 @@
閲嶇疆
</IconButton> */}
<IconButton
- v-permission="wmsMaterialStockDetail-hightQuery"
+ v-permission="wmsMaterialStock-add"
icon="search"
onClick={onAdvancedQuery}
type="primary"
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStockDetail/Config.ts b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStockDetail/Config.ts
index 39c098b..4a35fab 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStockDetail/Config.ts
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStockDetail/Config.ts
@@ -17,6 +17,10 @@
title: '搴撲綅缂栧彿',
},
{
+ field: 'storageTypeNoDesc',
+ title: '搴撲綅绫诲瀷',
+ },
+ {
field: 'placeStatusDesc',
title: '搴撲綅鐘舵��',
},
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStockDetail/WmsMaterialStockDetail.tsx b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStockDetail/WmsMaterialStockDetail.tsx
index a2f4737..16ba4de 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStockDetail/WmsMaterialStockDetail.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStockDetail/WmsMaterialStockDetail.tsx
@@ -20,6 +20,8 @@
ElFormItem,
} from 'element-plus'
import { injectModel } from '@/libs/Provider/Provider'
+// 寮曞叆鍏叡閫夐」閰嶇疆
+import { FILTER_MODE_OPTIONS_STRING } from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'
interface RenderTableType {
url?: string
@@ -66,6 +68,7 @@
const queryForm = ref({
searchVal: '',
str_searchFormInputAttrs: [],
+ searchVal_FilterMode: '',
})
//瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
const _searchFormInputAttrs = ref(['OrderNo', 'MaterialNo', 'MaterialId'])
@@ -136,20 +139,28 @@
}
}
- // 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹�
- onMounted(() => {
- fetchEnumData()
- handleQueryForMain()
- })
-
// 瀹氫箟鍝嶅簲寮忔煡璇㈡暟鎹�
const _curHighQueryData = ref({
searchVal: '',
str_searchFormInputAttrs: [],
+ searchVal_FilterMode: '',
})
+ // 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹�
+ onMounted(() => {
+ fetchEnumData()
+ queryForm.value.searchVal_FilterMode =
+ FILTER_MODE_OPTIONS_STRING[0]?.value || ''
+ _curHighQueryData.value.searchVal_FilterMode =
+ queryForm.value.searchVal_FilterMode
+ _curHighQueryData.value.str_searchFormInputAttrs =
+ _searchFormInputAttrs.value
+ })
+
// 鏂扮増鐨勬煡璇㈡柟娉曪紙涓婚〉闈腑鐨勬寜閽�愭煡璇€�戯級
const handleQueryForMain = async () => {
_curHighQueryData.value.searchVal = queryForm.value.searchVal
+ _curHighQueryData.value.searchVal_FilterMode =
+ queryForm.value.searchVal_FilterMode
_curHighQueryData.value.str_searchFormInputAttrs =
_searchFormInputAttrs.value
tableRef.value.getList(_curHighQueryData.value)
@@ -163,6 +174,8 @@
// 鏂扮増鐨勬煡璇㈤噸缃�
const resetQuery = () => {
queryForm.value.searchVal = ''
+ queryForm.value.searchVal_FilterMode =
+ FILTER_MODE_OPTIONS_STRING[0]?.value || ''
queryForm.value.str_searchFormInputAttrs = _searchFormInputAttrs.value
}
//鏂扮増鐨勫鍑烘柟娉�
@@ -180,6 +193,8 @@
const commonSaveCurHighQueryData = (filteredData = {}) => {
_curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }
_curHighQueryData.value.searchVal = queryForm.value.searchVal
+ _curHighQueryData.value.searchVal_FilterMode =
+ queryForm.value.searchVal_FilterMode
_curHighQueryData.value.str_searchFormInputAttrs =
_searchFormInputAttrs.value
}
@@ -194,10 +209,10 @@
)
//缁勫悎妯＄硦鏌ヨ
filteredData.searchVal = queryForm.value.searchVal
+ filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
return filteredData
}
-
/**
* @returns 琛ㄦ牸
*/
@@ -349,13 +364,30 @@
placement="top-start"
>
<ElInput
- v-model={queryForm.value.searchVal}
- placeholder={searchFormInputAttrs_Placeholder.value}
- clearable
+ v-mode
class={styles.formItem}
+ placeholder={searchFormInputAttrs_Placeholder.value}
/>
</el-tooltip>
</ElFormItem>
+ <ElFormItem label="" style="width:100px;">
+ <ElSelect
+ v-model={queryForm.value.searchVal_FilterMode}
+ // el={queryForm.value.searchVal}
+ // placeholder={searchFormInputAttrs_Placeholder.value}
+ clearable
+ placeholder="璇烽�夋嫨"
+ class={styles.formItem}
+ >
+ {FILTER_MODE_OPTIONS_STRING.map((option) => (
+ <ElOption
+ key={option.value}
+ label={option.label}
+ value={option.value}
+ />
+ ))}
+ </ElSelect>
+ </ElFormItem>
<IconButton
type="primary"
icon="search"
--
Gitblit v1.9.3