|
@@ -79,16 +79,17 @@ class PublicSummary extends Component {
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- title: "公出打卡人",
|
|
|
|
|
|
+ title: "公出人员",
|
|
dataIndex: "aname",
|
|
dataIndex: "aname",
|
|
key: "aname",
|
|
key: "aname",
|
|
- width: 130,
|
|
|
|
|
|
+ width: 190,
|
|
render: (text, record) => {
|
|
render: (text, record) => {
|
|
return (
|
|
return (
|
|
<Tooltip title={text}>
|
|
<Tooltip title={text}>
|
|
<div>
|
|
<div>
|
|
- {text}
|
|
|
|
- {record.assist !== 0 && <span>(协单人:{record.assistAidName})</span>}
|
|
|
|
|
|
+ <p style={{ color: "red" }}>[ 打卡人:{text} ]</p>
|
|
|
|
+ {record.assist !== 0 && <p style={{ color: "#8552A1" }} >[ 协单人:{record.assistAidName}]</p>}
|
|
|
|
+ {!!record.assistantName && <p style={{ color: "#228fbd" }} >[ 协单助手:{record.assistantName}]</p>}
|
|
</div>
|
|
</div>
|
|
</Tooltip>
|
|
</Tooltip>
|
|
);
|
|
);
|
|
@@ -125,10 +126,10 @@ class PublicSummary extends Component {
|
|
key: "clockInTimes",
|
|
key: "clockInTimes",
|
|
width: 80,
|
|
width: 80,
|
|
render: (text, record) => (
|
|
render: (text, record) => (
|
|
- <div>
|
|
|
|
- {text}
|
|
|
|
|
|
+ <span>
|
|
|
|
+ <div style={{ width: 70 }}>{text}</div>
|
|
<Tag color={["#F21212", "#34DE38", "#ffd400"][record.clockIn]}>{["未打卡", "已打卡", "异常打卡"][record.clockIn]}</Tag>
|
|
<Tag color={["#F21212", "#34DE38", "#ffd400"][record.clockIn]}>{["未打卡", "已打卡", "异常打卡"][record.clockIn]}</Tag>
|
|
- </div>
|
|
|
|
|
|
+ </span>
|
|
)
|
|
)
|
|
},
|
|
},
|
|
{
|
|
{
|
|
@@ -139,14 +140,15 @@ class PublicSummary extends Component {
|
|
render: (text, record) => (
|
|
render: (text, record) => (
|
|
<div style={{ display: "flex", flexDirection: "row" }}>
|
|
<div style={{ display: "flex", flexDirection: "row" }}>
|
|
<Tag
|
|
<Tag
|
|
- color={["#45b97c", "#69541b", "#f47920", "#8552a1"][record.type]}
|
|
|
|
|
|
+ color={["#45b97c", "#69541b", "#f47920", "#8552a1", "#228fbd"][record.type]}
|
|
>
|
|
>
|
|
{
|
|
{
|
|
record.type === 0
|
|
record.type === 0
|
|
? "业务公出" : record.type === 1
|
|
? "业务公出" : record.type === 1
|
|
? "技术公出" : record.type === 2
|
|
? "技术公出" : record.type === 2
|
|
? "行政公出" : record.type === 3
|
|
? "行政公出" : record.type === 3
|
|
- ? "技术协单" : ""
|
|
|
|
|
|
+ ? "技术协单" : record.type === 4
|
|
|
|
+ ? "协单助手" : ""
|
|
}
|
|
}
|
|
</Tag>
|
|
</Tag>
|
|
<Tag color={getClockState(text).color}>
|
|
<Tag color={getClockState(text).color}>
|
|
@@ -335,7 +337,7 @@ class PublicSummary extends Component {
|
|
}
|
|
}
|
|
|
|
|
|
addRowColor(record) {
|
|
addRowColor(record) {
|
|
- if (record.assist === 1 || record.assist === 2) {
|
|
|
|
|
|
+ if (record.assist === 1 || record.assist === 2 || record.assist === 3) {
|
|
return 'light'
|
|
return 'light'
|
|
} else {
|
|
} else {
|
|
return 'dark'
|
|
return 'dark'
|
|
@@ -749,6 +751,7 @@ class PublicSummary extends Component {
|
|
<Select.Option value={1}>技术打卡</Select.Option>
|
|
<Select.Option value={1}>技术打卡</Select.Option>
|
|
<Select.Option value={2}>行政打卡</Select.Option>
|
|
<Select.Option value={2}>行政打卡</Select.Option>
|
|
<Select.Option value={3}>技术协单</Select.Option>
|
|
<Select.Option value={3}>技术协单</Select.Option>
|
|
|
|
+ <Select.Option value={4}>协单助手</Select.Option>
|
|
</Select>
|
|
</Select>
|
|
</span>
|
|
</span>
|
|
<span style={{ marginRight: "10px" }}>
|
|
<span style={{ marginRight: "10px" }}>
|