From ff2ba12cdcc4ece62154e561d5877eb63f81eba6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 13 七月 2024 23:27:22 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/module/invoice/index.jsx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/custom/components/module/invoice/index.jsx b/src/tabviews/custom/components/module/invoice/index.jsx
index ad7b49b..1575193 100644
--- a/src/tabviews/custom/components/module/invoice/index.jsx
+++ b/src/tabviews/custom/components/module/invoice/index.jsx
@@ -233,7 +233,7 @@
item.setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
item.setting.tailScript = _tailScript // 鍚庣疆鑷畾涔夎剼鏈�
- item.setting.custompage = /@pageSize@|@orderBy@/i.test(item.setting.dataresource + item.setting.customScript)
+ item.setting.custompage = /@pageSize@|@orderBy@|@mk_total/i.test(item.setting.dataresource + item.setting.customScript)
return item
}
@@ -510,7 +510,7 @@
})
if (res.status) {
if (config.billSaveBtn.reTabId) {
- MKEmitter.emit('reloadMenuView', config.billSaveBtn.reTabId, 'table')
+ MKEmitter.emit('reloadMenuView', config.billSaveBtn.reTabId)
}
if (config.billSaveBtn.syncComId) {
MKEmitter.emit('reloadData', config.billSaveBtn.syncComId)
@@ -714,6 +714,7 @@
sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ sql = sql.replace(/@lang@/ig, `'${sessionStorage.getItem('lang')}'`)
sql = sql.replace(/@typename@/ig, `'admin'`)
if (window.GLOB.externalDatabase !== null) {
@@ -957,6 +958,7 @@
sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ sql = sql.replace(/@lang@/ig, `'${sessionStorage.getItem('lang')}'`)
sql = sql.replace(/@typename@/ig, `'admin'`)
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
@@ -986,7 +988,7 @@
})
if (res.status) {
if (config.billOutBtn.reTabId) {
- MKEmitter.emit('reloadMenuView', config.billOutBtn.reTabId, 'table')
+ MKEmitter.emit('reloadMenuView', config.billOutBtn.reTabId)
}
if (config.billOutBtn.syncComId) {
MKEmitter.emit('reloadData', config.billOutBtn.syncComId)
--
Gitblit v1.8.0