From 7d410c1f0d4e36f8281ce2277f355c9abf1c231b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 16:19:36 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStock.ts | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStock.ts b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStock.ts
index 9d21733..e608a16 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStock.ts
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStock.ts
@@ -52,6 +52,12 @@
isAdd: false,
})
+ const dialogConfigForQuery = reactive({
+ visible: false,
+ title: '',
+ isAdd: false,
+ })
+
const dialogSettingConfig = reactive({
visible: false,
title: '',
@@ -72,6 +78,15 @@
dialogConfig.title = row.name
dialogConfig.isAdd = false
sort.value = row.sort
+ }
+
+ //鐐瑰嚮鎸夐挳銆愰珮绾ф煡璇€��
+ const onAdvancedQuery = () => {
+ const params = tableRef.value?.getPaginationParams()
+ current.value = null
+ dialogConfigForQuery.visible = true
+ dialogConfigForQuery.isAdd = true
+ dialogConfigForQuery.title = '楂樼骇鏌ヨ'
}
const contextMenu = [
@@ -174,13 +189,15 @@
/**
* 瀵煎嚭
*/
- const onExport = () => {
- const params = tableRef.value?.getParams()
- exportFile(
- '/api/v1/HIAWms/wmsMaterialStock/export',
- params,
- 'wmsMaterialStock'
- )
+ const onExport = (data = {}) => {
+ // const params = tableRef.value?.getParams()
+ // exportFile(
+ // '/api/v1/HIAWms/wmsMaterialStock/export',
+ // params,
+ // 'wmsMaterialStock'
+
+ exportFile('/api/v1/HIAWms/wmsMaterialStock/export', data, 'HIAWms')
+ // )
}
/**
@@ -251,6 +268,7 @@
sort,
wmsMaterialStockColumns,
paginationParams,
+ dialogConfigForQuery,
headers,
onBeforeUpload,
onError,
@@ -262,5 +280,6 @@
onConfirmWmsMaterialStock,
onCheck,
onAddWmsMaterialStock,
+ onAdvancedQuery,
}
}
--
Gitblit v1.9.3