From 8190d6e5ac14616d85e3992169ecef6d99d03b76 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 13 十一月 2020 15:29:57 +0800
Subject: [PATCH] 2020-11-13
---
src/tabviews/zshare/actionList/newpagebutton/index.jsx | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index 58da1e0..764f1b7 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -63,7 +63,7 @@
duration: 5
})
return
- } else if (btn.Ot === 'requiredSgl' && !setting.primaryKey) {
+ } else if (btn.Ot !== 'notRequired' && !setting.primaryKey) {
// 闇�瑕侀�夋嫨琛屾椂锛屾牎楠屾槸鍚﹁缃富閿�
notification.warning({
top: 92,
@@ -92,8 +92,15 @@
}
if (btn.pageTemplate === 'billprint') {
- let src = '#/billprint/' + window.btoa(window.encodeURIComponent(JSON.stringify({ id: Id, tempId: btn.printTemp, dataManager: dataManager })))
- window.open(src)
+ if (btn.Ot === 'required' && data && data.length > 0) {
+ data.forEach((item, i) => {
+ let _id = item[setting.primaryKey] || ''
+ let url = '#/billprint/' + window.btoa(window.encodeURIComponent(JSON.stringify({ id: _id, tempId: btn.printTemp, dataManager: dataManager })))
+ window.open(url)
+ })
+ } else {
+ window.open('#/billprint/' + window.btoa(window.encodeURIComponent(JSON.stringify({ id: Id, tempId: btn.printTemp, dataManager: dataManager }))))
+ }
} else if (btn.pageTemplate === 'billprintTemp') {
let src = '#/menudesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({ MenuType: 'billPrint', MenuId: Id, MenuNo: MenuNo, MenuName: name || '鎵撳嵃', Remark: Remark })))
window.open(src)
--
Gitblit v1.8.0