From 5df578ff69f6b02e821d59a8883bc75d78695a62 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 十一月 2020 11:07:31 +0800
Subject: [PATCH] 2020-11-10

---
 src/tabviews/zshare/actionList/newpagebutton/index.jsx |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index 7115ff9..0d53b5d 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -80,11 +80,23 @@
     }
 
     let Id = ''
-    if (btn.Ot === 'requiredSgl') {
+    let name = ''
+    let MenuNo = ''
+    let Remark = ''
+    if (btn.Ot === 'requiredSgl' && data[0]) {
       Id = data[0][setting.primaryKey] || ''
+      name = data[0].PrintTempName || ''
+      MenuNo = data[0].PrintTempNO || ''
+      Remark = data[0].Remark || ''
     }
 
-    if (btn.pageTemplate === 'print') {
+    if (btn.pageTemplate === 'billprint') {
+      let src = '#/billprint/' + window.btoa(window.encodeURIComponent(JSON.stringify({ id: Id, tempId: btn.printTemp })))
+      window.open(src)
+    } 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)
+    } else if (btn.pageTemplate === 'print') {
       let cloudmsg = '&cuid=' + (sessionStorage.getItem('CloudUserID') || '') + '&clid=' + (sessionStorage.getItem('CloudLoginUID') || '') + '&cun=' + (sessionStorage.getItem('CloudUserName') || '')
       let msg = '&uid=' + sessionStorage.getItem('UserID') + '&lid=' + sessionStorage.getItem('LoginUID') + '&un=' + sessionStorage.getItem('User_Name')
       let src = '#/print/' + window.btoa('ID=' + Id + msg + cloudmsg)

--
Gitblit v1.8.0