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/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx
index 977dd17..6fab32f 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx
@@ -145,7 +145,7 @@
tableRef.value = {
dataSource: [],
}
- handleQueryForMain()
+ // handleQueryForMain()
})
// 瀹氫箟鍝嶅簲寮忔煡璇㈡暟鎹�
@@ -158,10 +158,10 @@
_curHighQueryData.value.searchVal = queryForm.value.searchVal
_curHighQueryData.value.str_searchFormInputAttrs =
_searchFormInputAttrs.value
- if (!_curHighQueryData.value?.storageTypeNo) {
- _curHighQueryData.value.storageTypeNo = 1
- }
- tableRef.value.getList(_curHighQueryData.value)
+ // if (!_curHighQueryData.value?.storageTypeNo) {
+ // _curHighQueryData.value.storageTypeNo = 1
+ // }
+ tableRef.value?.getList(_curHighQueryData.value)
}
// 鏂扮増鐨勬煡璇㈡柟娉曪紙楂樼骇鏌ヨ涓殑鎸夐挳銆愭煡璇€�戯級
const handleQuery = async (extraParams = {}) => {
@@ -350,7 +350,7 @@
<div class={styles.headerContent}>
<div class={styles.header}>
<IconButton
- v-permission="wmsMaterialStockDetail-add"
+ v-permission="wmsMaterialStock-add"
icon="add-p"
onClick={onAddWmsMaterialStock}
type="primary"
@@ -374,7 +374,7 @@
</el-upload> */}
<IconButton
- v-permission="wmsMaterialStockDetail-output"
+ v-permission="wmsMaterialStock-output"
icon="out"
onClick={handleExport}
>
@@ -408,7 +408,7 @@
閲嶇疆
</IconButton> */}
<IconButton
- v-permission="wmsMaterialStock-add"
+ v-permission="wmsMaterialStockDetail-hightQuery"
icon="search"
onClick={onAdvancedQuery}
type="primary"
--
Gitblit v1.9.3