From 8f394e7ef20cc0abba3f47c23a63b069e9dd0e45 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 19 十月 2022 15:09:30 +0800
Subject: [PATCH] 2022-10-19
---
src/tabviews/zshare/actionList/newpagebutton/index.jsx | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index 1237a91..2ca6b55 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -16,7 +16,6 @@
BData: PropTypes.any, // 涓昏〃鏁版嵁
btn: PropTypes.object, // 鎸夐挳
selectedData: PropTypes.any, // 瀛愯〃涓�夋嫨鏁版嵁
- setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
disabled: PropTypes.any, // 琛屾寜閽鐢�
}
@@ -110,7 +109,7 @@
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
actionTrigger = (triggerId, record, type) => {
- const { setting, btn, selectedData } = this.props
+ const { btn, selectedData } = this.props
const { disabled } = this.state
if (disabled) return
@@ -152,7 +151,7 @@
let MenuNo = ''
let Remark = ''
if (btn.Ot === 'requiredSgl' && data[0]) {
- Id = setting.primaryKey ? (data[0][setting.primaryKey] || '') : ''
+ Id = data[0].$$uuid || ''
name = data[0].PrintTempName || ''
MenuNo = data[0].PrintTempNO || ''
Remark = data[0].Remark || ''
@@ -164,7 +163,7 @@
_name = '鍗曟嵁鎵撳嵃'
if (btn.Ot === 'required' && data && data.length > 0) {
data.forEach((item, i) => {
- let _id = setting.primaryKey ? (item[setting.primaryKey] || '') : ''
+ let _id = item.$$uuid || ''
let url = '#/billprint/' + window.btoa(window.encodeURIComponent(JSON.stringify({ id: _id, tempId: btn.printTemp, dataM: sessionStorage.getItem('dataM') })))
window.open(url)
})
--
Gitblit v1.8.0