From d7534812c8199bf1e9faa0279b63e434737d6374 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 16 四月 2021 16:06:27 +0800
Subject: [PATCH] 2021-04-16
---
src/tabviews/zshare/actionList/newpagebutton/index.jsx | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index dcf07e8..1ee735a 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -69,14 +69,6 @@
duration: 5
})
return
- } else if (btn.Ot !== 'notRequired' && !setting.primaryKey) {
- // 闇�瑕侀�夋嫨琛屾椂锛屾牎楠屾槸鍚﹁缃富閿�
- notification.warning({
- top: 92,
- message: '鏈缃富閿紒',
- duration: 5
- })
- return
} else if (!btn.pageTemplate) {
notification.warning({
top: 92,
@@ -91,7 +83,7 @@
let MenuNo = ''
let Remark = ''
if (btn.Ot === 'requiredSgl' && data[0]) {
- Id = data[0][setting.primaryKey] || ''
+ Id = setting.primaryKey ? (data[0][setting.primaryKey] || '') : ''
name = data[0].PrintTempName || ''
MenuNo = data[0].PrintTempNO || ''
Remark = data[0].Remark || ''
@@ -103,7 +95,7 @@
_name = '鍗曟嵁鎵撳嵃'
if (btn.Ot === 'required' && data && data.length > 0) {
data.forEach((item, i) => {
- let _id = item[setting.primaryKey] || ''
+ let _id = setting.primaryKey ? (item[setting.primaryKey] || '') : ''
let url = '#/billprint/' + window.btoa(window.encodeURIComponent(JSON.stringify({ id: _id, tempId: btn.printTemp, dataM: sessionStorage.getItem('dataM') })))
window.open(url)
})
@@ -178,7 +170,7 @@
<Button
type="link"
title={show === 'icon' ? btn.label : ''}
- style={btn.btnstyle}
+ style={btn.style}
icon={show === 'text' ? '' : (btn.icon || '')}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{show === 'icon' && btn.icon ? '' : btn.label}</Button>
--
Gitblit v1.8.0