From c547c75fce3c2d9badcb496da7d8e5443e22dbfc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 八月 2024 17:10:41 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/module/invoice/index.jsx | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/custom/components/module/invoice/index.jsx b/src/tabviews/custom/components/module/invoice/index.jsx
index 35de277..06fe3f8 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)
@@ -728,7 +728,7 @@
}
if (window.GLOB.debugger === true) {
- console.info(sql.replace(/\n\s{6}/ig, '\n'))
+ window.mkInfo(sql.replace(/\n\s{6}/ig, '\n'))
}
return sql
@@ -968,8 +968,8 @@
}
if (window.GLOB.debugger === true) {
- console.info('%c' + config.name + '(鍥炶皟)', 'color: blue')
- console.info(sql.replace(/\n\s{8}/ig, '\n'))
+ window.mkInfo('%c' + config.name + '(鍥炶皟)', 'color: blue')
+ window.mkInfo(sql.replace(/\n\s{8}/ig, '\n'))
}
param.LText = sql
@@ -988,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