From b5d60a301038646695c7bda682ac59fa311cfbbf Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周二, 13 5月 2025 12:55:50 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo --- HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx b/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx index 9dab1a4..e62dc46 100644 --- a/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx +++ b/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx @@ -5,6 +5,7 @@ import { useWmsTask } from '../../../Controllers/WmsTask' import IconButton from '@/components/IconButton/IconButton' import WmsTaskDrawer from '../Dialog/WmsTaskDrawer/WmsTaskDrawer' +import ChangeToPlaceDialog from '../Dialog/ChangeToPlaceDialog/ChangeToPlaceDialog' import WmsTaskQueryDrawer from '../Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer' import Search from '@/components/Search/Search' import { columns } from './Config' @@ -43,6 +44,7 @@ contextMenu, dialogConfig, dialogConfigForQuery, + dialogChangeToPlaceConfig, tableRef, current, search, @@ -264,6 +266,16 @@ onRestQuery={resetQuery} onClose={closeQuery} /> + <ChangeToPlaceDialog + ref="changeToPlace" + v-model={dialogChangeToPlaceConfig.visible} + title={dialogChangeToPlaceConfig.title} + row={current.value} + sort={sort.value} + onConfirmQuery={handleQuery} + onRestQuery={resetQuery} + onClose={closeQuery} + /> <div class={styles.headerContent}> <div class={styles.header}> @@ -297,7 +309,14 @@ icon="out" onClick={handleExport} > - 瀵煎嚭 + 寮哄埗瀹屾垚 + </IconButton> + <IconButton + v-permission="wmsTask-output" + icon="out" + onClick={handleExport} + > + 鍙栨秷 </IconButton> */} </div> <ElFormItem style={{ marginTop: '15px' }}> -- Gitblit v1.9.3