From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterial.ts | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterial.ts b/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterial.ts
index 3684341..4f90306 100644
--- a/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterial.ts
+++ b/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterial.ts
@@ -51,6 +51,11 @@
title: '',
isAdd: false,
})
+ const dialogConfigForQuery = reactive({
+ visible: false,
+ title: '',
+ isAdd: false,
+ })
const dialogSettingConfig = reactive({
visible: false,
@@ -149,6 +154,15 @@
sort.value = params.totalCount + 1
}
+ //鐐瑰嚮鎸夐挳銆愰珮绾ф煡璇€��
+ const onAdvancedQuery = () => {
+ const params = tableRef.value?.getPaginationParams()
+ current.value = null
+ dialogConfigForQuery.visible = true
+ dialogConfigForQuery.isAdd = true
+ dialogConfigForQuery.title = '楂樼骇鏌ヨ'
+ }
+
const onConfirmWmsMaterial = async () => {
dialogConfig.visible = false
if (dialogConfig.isAdd) {
@@ -170,11 +184,10 @@
/**
* 瀵煎嚭
*/
- const onExport = () => {
- const params = tableRef.value?.getParams()
- exportFile('/api/v1/hIAWms/wmsMaterial/export', params, 'hIAWms')
+ const onExport = (data = {}) => {
+ //const params = tableRef.value?.getParams()
+ exportFile('/api/v1/HIAWms/wmsMaterial/export', data, '鐗╂枡鍩虹')
}
-
/**
* 鍏抽敭瀛楁悳绱�
*/
@@ -236,6 +249,7 @@
dataSource,
contextMenu,
dialogConfig,
+ dialogConfigForQuery,
dialogSettingConfig,
tableRef,
current,
@@ -253,6 +267,7 @@
onRowClick,
onConfirmWmsMaterial,
onCheck,
+ onAdvancedQuery,
onAddWmsMaterial,
}
}
--
Gitblit v1.9.3