From 25750ab29ce4e243f4e4e17a796167f3a0f0697b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周一, 05 5月 2025 16:33:49 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/WmsMaterial.tsx | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 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/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/WmsMaterial.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/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/WmsMaterial.tsx"
index 2f9c7b1..1703d1e 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/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/WmsMaterial.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/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/WmsMaterial.tsx"
@@ -11,8 +11,7 @@
import TdButton from '@/components/TdButton/TdButton'
import { vPermission } from '@/libs/Permission/Permission'
import {
- getWmsEnumData,
- getWmsDataList,
+ getWmsEnumData
} from '@/widgets/HIAWms/Models/Service/WmsMaterialDrawer'
import {
ElInput,
@@ -67,9 +66,16 @@
const wmsMaterialQueryDrawerRef=ref(null);
// 鏂板鐨勬煡璇㈡潯浠�
const queryForm = ref({
- filter: '',
+ searchVal: '',
+ str_searchFormInputAttrs:[]
})
-
+ //瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
+ const _searchFormInputAttrs = ref([
+ 'MaterialCode',
+ 'MaterialName',
+ 'Remark'
+ ]);
+ const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ョ墿鏂欑紪鐮�/鐗╂枡鍚嶇О/澶囨敞');
// 鍔ㄦ�佹灇涓鹃�夐」
@@ -110,10 +116,11 @@
})
// 瀹氫箟鍝嶅簲寮忔煡璇㈡暟鎹�
- const _curHighQueryData = ref({ filter: '' });
+ const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[] });
// 鏂扮増鐨勬煡璇㈡柟娉曪紙涓婚〉闈腑鐨勬寜閽�愭煡璇€�戯級
const handleQueryForMain = async () => {
- _curHighQueryData.value.filter = queryForm.value.filter;
+ _curHighQueryData.value.searchVal = queryForm.value.searchVal;
+ _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;
tableRef.value.getList(_curHighQueryData.value)
}
// 鏂扮増鐨勬煡璇㈡柟娉曪紙楂樼骇鏌ヨ涓殑鎸夐挳銆愭煡璇€�戯級
@@ -124,7 +131,8 @@
}
// 鏂扮増鐨勬煡璇㈤噸缃�
const resetQuery = () => {
- queryForm.value.filter = ''
+ queryForm.value.searchVal = ''
+ queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value;
}
//鏂扮増鐨勫鍑烘柟娉�
const handleExport=()=>{
@@ -140,7 +148,8 @@
//淇濆瓨鏌ヨ鍊�
const commonSaveCurHighQueryData=(filteredData={})=>{
_curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData };
- _curHighQueryData.value.filter = queryForm.value.filter
+ _curHighQueryData.value.searchVal = queryForm.value.searchVal
+ _curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value;
}
//鑾峰彇楂樼骇鏌ヨ寮瑰嚭妗嗙殑鏌ヨ鍊�
const commonGetHighQueryForm=(extraParams={})=>{
@@ -152,7 +161,8 @@
)
)
//缁勫悎妯＄硦鏌ヨ
- filteredData.filter = queryForm.value.filter
+ filteredData.searchVal = queryForm.value.searchVal
+ filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value;
return filteredData;
}
@@ -272,17 +282,11 @@
瀵煎嚭
</IconButton>
</div>
- <Search
- placeholder="璇疯緭鍏ュ叧閿瓧"
- v-model={search.value}
- onConfirm={onSearch}
- style={{ marginTop: '-1px' }}
- />
<ElFormItem style={{ marginTop: '15px' }}>
<ElFormItem label="鍏抽敭瀛�">
<ElInput
- v-model={queryForm.value.filter}
- placeholder="璇疯緭鍏ュ叧閿瓧鎼滅储"
+ v-model={queryForm.value.searchVal}
+ placeholder={searchFormInputAttrs_Placeholder.value}
clearable
class={styles.formItem}
/>
@@ -290,12 +294,12 @@
<IconButton type="primary" icon="search" onClick={handleQueryForMain}>
鏌ヨ
</IconButton>
- <IconButton style="" icon="refresh" onClick={resetQuery}>
+ {/* <IconButton style="" icon="refresh" onClick={resetQuery}>
閲嶇疆
- </IconButton>
+ </IconButton> */}
<IconButton
v-permission="wmsMaterial-add"
- icon="add-p"
+ icon="search"
onClick={onAdvancedQuery}
type="primary"
>
--
Gitblit v1.9.3