From ec3cfd144de6fcf5e5cbfaf02585c17805300602 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周三, 21 5月 2025 13:35:16 +0800 Subject: [PATCH] 优化 --- HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStockDetail/WmsMaterialStockDetail.tsx | 52 ++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 42 insertions(+), 10 deletions(-) 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..135caf0 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_KEY } 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_KEY[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_KEY[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_KEY.map((option) => ( + <ElOption + key={option.value} + label={option.label} + value={option.value} + /> + ))} + </ElSelect> + </ElFormItem> <IconButton type="primary" icon="search" -- Gitblit v1.9.3