@@ -128,7 +128,9 @@ class DetailedList extends Component {
render: (text, record) => (
<div>
{text}
- <Tag color={["#F21212", "#34DE38", "#ffd400"][record.clockIn]}>{["未打卡", "已打卡", "异常打卡"][record.clockIn]}</Tag>
+ {record.alone == 2 && record.assist == 1
+ ? <Tag color="#58a3ff">无需打卡</Tag>
+ : <Tag color={["#F21212", "#34DE38", "#ffd400"][record.clockIn]}>{["未打卡", "已打卡", "异常打卡"][record.clockIn]}</Tag>}
</div>
)
},
@@ -146,12 +146,12 @@ class PublicSummary extends Component {
width: 120,
- {
+ {text.split("\n").map(it =>
- text.split("\n").map(it =>
+ <div>{it}</div>
- <div>{it}</div>
+ )}
- )
- }
@@ -566,7 +566,9 @@ class AccountDetails extends Component {
<span>
<div style={{ width: 70 }}>{text}</div>
</span>
@@ -394,7 +394,9 @@ const AccountTotal = React.createClass({