From 84804b405cb88f659d055b16eb3bd00b813ccb4a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 十二月 2020 10:58:38 +0800
Subject: [PATCH] 2020-12-10
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index e971fce..db519ce 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -24,7 +24,6 @@
class CardCellComponent extends Component {
static propTpyes = {
- BID: PropTypes.any, // 涓婄骇ID
seq: PropTypes.any, // 搴忓彿
cards: PropTypes.object, // 鑿滃崟閰嶇疆淇℃伅
cardCell: PropTypes.object,
@@ -80,7 +79,7 @@
con = '&'
}
- if (cards.subtype === 'propcard') {
+ if (cards.subtype === 'propcard' && cardCell) {
Id = cardCell.setting.primaryId || ''
} else {
Id = data[cards.setting.primaryKey] || ''
@@ -94,7 +93,7 @@
}
getContent = (card) => {
- const { data, BID, cards, seq } = this.props
+ const { data, cards, seq } = this.props
if (card.eleType === 'sequence') {
return (
@@ -339,7 +338,7 @@
<Col key={card.uuid} span={card.width}>
<div style={card.style}>
<NormalButton
- BID={BID}
+ BID={data.$$BID}
btn={card}
show={card.show}
style={card.btnstyle}
@@ -356,7 +355,7 @@
<Col key={card.uuid} span={card.width}>
<div style={card.style}>
<ExcelInButton
- BID={BID}
+ BID={data.$$BID}
btn={card}
show={card.show}
style={card.btnstyle}
@@ -372,7 +371,7 @@
<Col key={card.uuid} span={card.width}>
<div style={card.style}>
<ExcelOutButton
- BID={BID}
+ BID={data.$$BID}
btn={card}
show={card.show}
style={card.btnstyle}
@@ -388,7 +387,7 @@
<Col key={card.uuid} span={card.width}>
<div style={card.style}>
<PopupButton
- BID={BID}
+ BID={data.$$BID}
btn={card}
show={card.show}
style={card.btnstyle}
@@ -435,7 +434,7 @@
<Col key={card.uuid} span={card.width}>
<div style={card.style}>
<ChangeUserButton
- BID={BID}
+ BID={data.$$BID}
btn={card}
show={card.show}
style={card.btnstyle}
@@ -451,7 +450,7 @@
<Col key={card.uuid} span={card.width}>
<div style={card.style}>
<PrintButton
- BID={BID}
+ BID={data.$$BID}
btn={card}
show={card.show}
style={card.btnstyle}
--
Gitblit v1.8.0