From fb4915c13885cfca728f5b4c7624cf20bdb1d968 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 03 5月 2025 14:39:38 +0800
Subject: [PATCH] 222
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/WmsMaterial.tsx | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 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 a2e2c16..83fb3fa 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"
@@ -5,6 +5,7 @@
import { useWmsMaterial } from '../../../Controllers/WmsMaterial'
import IconButton from '@/components/IconButton/IconButton'
import WmsMaterialDrawer from '../Dialog/WmsMaterialDrawer/WmsMaterialDrawer'
+import WmsMaterialQueryDrawer from '../Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer'
import Search from '@/components/Search/Search'
import { columns } from './Config'
import TdButton from '@/components/TdButton/TdButton'
@@ -43,6 +44,7 @@
dataSource,
contextMenu,
dialogConfig,
+ dialogConfigForQuery,
tableRef,
current,
search,
@@ -54,6 +56,7 @@
onConfirmWmsMaterial,
onCheck,
onAddWmsMaterial,
+ onAdvancedQuery,
onExport,
openDetail,
onSuccess,
@@ -113,10 +116,13 @@
})
// 鏂板鐨勬煡璇㈡柟娉�
- const handleQuery = async () => {
- console.log('鏌ヨ鏉′欢:', queryParams.value)
- // tableRef.value.getTableList()
- tableRef.value.getList(queryParams.value)
+ const handleQuery = async (extraParams = {}) => {
+ // 杩囨护鎺� undefined 鐨勫��
+let filteredData = Object.assign(
+ {},
+ ...Object.entries(extraParams).map(([key, value]) => ((value !== undefined) ? { [key]: value } : {}))
+);
+ tableRef.value.getList(filteredData)
}
// 閲嶇疆鏌ヨ鏉′欢
@@ -197,6 +203,14 @@
row={current.value}
sort={sort.value}
onConfirm={onConfirmWmsMaterial}
+ />
+ {/* 楂樼骇鏌ヨ */}
+ <WmsMaterialQueryDrawer
+ v-model={dialogConfigForQuery.visible}
+ title={dialogConfigForQuery.title}
+ row={current.value}
+ sort={sort.value}
+ onConfirmQuery={handleQuery}
/>
{/* 鏂板鐨勬煡璇㈣〃鍗� */}
@@ -299,6 +313,15 @@
娣诲姞
</IconButton>
<el-divider direction="vertical" />
+ <IconButton
+ v-permission="wmsMaterial-add"
+ icon="add-p"
+ onClick={onAdvancedQuery}
+ type="primary"
+ >
+ 楂樼骇鏌ヨ
+ </IconButton>
+ <el-divider direction="vertical" />
<el-upload
v-permission="wmsMaterial-import"
name="file"
@@ -321,12 +344,22 @@
瀵煎嚭
</IconButton>
</div>
- {/* <Search
+ <Search
placeholder="璇疯緭鍏ュ叧閿瓧"
v-model={search.value}
onConfirm={onSearch}
style={{ marginTop: '-1px' }}
- /> */}
+ />
+ <IconButton type="primary" icon="search" onClick={handleQuery}>
+ 鏌ヨ
+ </IconButton>
+ <IconButton
+ style=""
+ icon="refresh"
+ onClick={resetQuery}
+ >
+ 閲嶇疆
+ </IconButton>
</div>
<RenderBaseTable
--
Gitblit v1.9.3