|
@@ -52,18 +52,18 @@ class DetailedList extends Component {
|
|
|
fixed: "left",
|
|
|
render: (text) => {
|
|
|
return (
|
|
|
- // <Tooltip title={text}>
|
|
|
- <div
|
|
|
- // style={{
|
|
|
- // width: 80,
|
|
|
- // overflow: "hidden",
|
|
|
- // textOverflow: "ellipsis",
|
|
|
- // whiteSpace: "nowrap",
|
|
|
- // }}
|
|
|
- >
|
|
|
- {text}
|
|
|
- </div>
|
|
|
- // </Tooltip>
|
|
|
+ <div>{text}</div>
|
|
|
+ );
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "公出地点",
|
|
|
+ dataIndex: "userName",
|
|
|
+ key: "userName",
|
|
|
+ width: 120,
|
|
|
+ render: (text) => {
|
|
|
+ return (
|
|
|
+ <div>{text}</div>
|
|
|
);
|
|
|
},
|
|
|
},
|
|
@@ -74,40 +74,23 @@ class DetailedList extends Component {
|
|
|
width: 80,
|
|
|
render: (text) => {
|
|
|
return (
|
|
|
- // <Tooltip title={text}>
|
|
|
- <div
|
|
|
- // style={{
|
|
|
- // width: 100,
|
|
|
- // overflow: "hidden",
|
|
|
- // textOverflow: "ellipsis",
|
|
|
- // whiteSpace: "nowrap",
|
|
|
- // }}
|
|
|
- >
|
|
|
- {text}
|
|
|
- </div>
|
|
|
- // </Tooltip>
|
|
|
+ <div>{text}</div>
|
|
|
);
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
- title: "公出申请人",
|
|
|
+ title: "公出打卡人",
|
|
|
dataIndex: "aname",
|
|
|
key: "aname",
|
|
|
- width: 80,
|
|
|
- render: (text) => {
|
|
|
+ width: 130,
|
|
|
+ render: (text, record) => {
|
|
|
return (
|
|
|
- // <Tooltip title={text}>
|
|
|
- <div
|
|
|
- // style={{
|
|
|
- // width: 100,
|
|
|
- // overflow: "hidden",
|
|
|
- // textOverflow: "ellipsis",
|
|
|
- // whiteSpace: "nowrap",
|
|
|
- // }}
|
|
|
- >
|
|
|
- {text}
|
|
|
- </div>
|
|
|
- // </Tooltip>
|
|
|
+ <Tooltip title={text}>
|
|
|
+ <div>
|
|
|
+ {text}
|
|
|
+ {record.assist !== 0 && <span>(协单人:{record.assistAidName})</span>}
|
|
|
+ </div>
|
|
|
+ </Tooltip>
|
|
|
);
|
|
|
},
|
|
|
},
|
|
@@ -131,104 +114,56 @@ class DetailedList extends Component {
|
|
|
),
|
|
|
},
|
|
|
{
|
|
|
- title: "公出地点",
|
|
|
- dataIndex: "userName",
|
|
|
- key: "userName",
|
|
|
- width: 120,
|
|
|
- render: (text) => {
|
|
|
- return (
|
|
|
- // <Tooltip title={text}>
|
|
|
- <div
|
|
|
- // style={{
|
|
|
- // width: 120,
|
|
|
- // overflow: "hidden",
|
|
|
- // textOverflow: "ellipsis",
|
|
|
- // whiteSpace: "nowrap",
|
|
|
- // }}
|
|
|
- >
|
|
|
- {text}
|
|
|
- </div>
|
|
|
- // </Tooltip>
|
|
|
- );
|
|
|
- },
|
|
|
- },
|
|
|
- {
|
|
|
title: "公出时长(时)",
|
|
|
dataIndex: "duration",
|
|
|
key: "duration",
|
|
|
- width: 85,
|
|
|
+ width: 50,
|
|
|
},
|
|
|
{
|
|
|
title: "打卡时间",
|
|
|
dataIndex: "clockInTimes",
|
|
|
key: "clockInTimes",
|
|
|
width: 80,
|
|
|
+ render: (text, record) => (
|
|
|
+ <div>
|
|
|
+ {text}
|
|
|
+ <Tag color={["#F21212", "#34DE38", "#ffd400"][record.clockIn]}>{["未打卡", "已打卡", "异常打卡"][record.clockIn]}</Tag>
|
|
|
+ </div>
|
|
|
+ )
|
|
|
},
|
|
|
{
|
|
|
- title: "审核状态",
|
|
|
+ title: "标签",
|
|
|
dataIndex: "status",
|
|
|
key: "status",
|
|
|
- width: 105,
|
|
|
+ width: 200,
|
|
|
render: (text, record) => (
|
|
|
<div style={{ display: "flex", flexDirection: "row" }}>
|
|
|
+ <Tag
|
|
|
+ color={["#45b97c", "#69541b", "#f47920", "#8552a1"][record.type]}
|
|
|
+ >
|
|
|
+ {
|
|
|
+ record.type === 0
|
|
|
+ ? "业务公出" : record.type === 1
|
|
|
+ ? "技术公出" : record.type === 2
|
|
|
+ ? "行政公出" : record.type === 3
|
|
|
+ ? "技术协单" : ""
|
|
|
+ }
|
|
|
+ </Tag>
|
|
|
<Tag color={getClockState(text).color}>
|
|
|
{getClockState(text).title}
|
|
|
</Tag>
|
|
|
- {record.updateStatus == 1 && (
|
|
|
- <Tag color="#1E90FF">改</Tag>
|
|
|
- )}
|
|
|
+ {record.updateStatus == 1 && <Tag color="#1E90FF">改</Tag>}
|
|
|
</div>
|
|
|
),
|
|
|
},
|
|
|
{
|
|
|
- title: "打卡状态",
|
|
|
- dataIndex: "clockIn",
|
|
|
- key: "clockIn",
|
|
|
- width: 70,
|
|
|
- render: (text) => (
|
|
|
- <span
|
|
|
- style={{ color: ["#F21212", "#34DE38"][text] }}
|
|
|
- >
|
|
|
- {["未打卡", "已打卡"][text]}
|
|
|
- </span>
|
|
|
- )
|
|
|
- },
|
|
|
- {
|
|
|
- title: "公出类型",
|
|
|
- dataIndex: "type",
|
|
|
- key: "type",
|
|
|
- width: 70,
|
|
|
- render: (text) =>
|
|
|
- <span
|
|
|
- style={{ color: ["#1D4FEA", "#1E90FF", "#FF5500", "red"][text] }}
|
|
|
- >
|
|
|
- {
|
|
|
- text === 0
|
|
|
- ? "业务公出" : text === 1
|
|
|
- ? "技术公出" : text === 2
|
|
|
- ? "行政公出" : text === 3
|
|
|
- ? "技术协单" : ""
|
|
|
- }
|
|
|
- </span>
|
|
|
- },
|
|
|
- {
|
|
|
title: "公出目标",
|
|
|
dataIndex: "remarks",
|
|
|
key: "remarks",
|
|
|
- width: 180,
|
|
|
+ width: 200,
|
|
|
render: (text) => {
|
|
|
return (
|
|
|
- <div
|
|
|
- // style={{
|
|
|
- // width: 60,
|
|
|
- // overflow: "hidden",
|
|
|
- // textOverflow: "ellipsis",
|
|
|
- // whiteSpace: "nowrap",
|
|
|
- // }}
|
|
|
- // title={text}
|
|
|
- >
|
|
|
- {text}
|
|
|
- </div>
|
|
|
+ <div>{text}</div>
|
|
|
);
|
|
|
},
|
|
|
},
|
|
@@ -239,17 +174,7 @@ class DetailedList extends Component {
|
|
|
width: 200,
|
|
|
render: (text) => {
|
|
|
return (
|
|
|
- <div
|
|
|
- // style={{
|
|
|
- // width: 60,
|
|
|
- // overflow: "hidden",
|
|
|
- // textOverflow: "ellipsis",
|
|
|
- // whiteSpace: "nowrap",
|
|
|
- // }}
|
|
|
- // title={text}
|
|
|
- >
|
|
|
- {text}
|
|
|
- </div>
|
|
|
+ <div>{text}</div>
|
|
|
);
|
|
|
},
|
|
|
},
|
|
@@ -260,17 +185,7 @@ class DetailedList extends Component {
|
|
|
width: 200,
|
|
|
render: (text) => {
|
|
|
return (
|
|
|
- <div
|
|
|
- // style={{
|
|
|
- // width: 60,
|
|
|
- // overflow: "hidden",
|
|
|
- // textOverflow: "ellipsis",
|
|
|
- // whiteSpace: "nowrap",
|
|
|
- // }}
|
|
|
- // title={text}
|
|
|
- >
|
|
|
- {text}
|
|
|
- </div>
|
|
|
+ <div>{text}</div>
|
|
|
);
|
|
|
},
|
|
|
},
|
|
@@ -281,17 +196,7 @@ class DetailedList extends Component {
|
|
|
width: 200,
|
|
|
render: (text) => {
|
|
|
return (
|
|
|
- <div
|
|
|
- // style={{
|
|
|
- // width: 60,
|
|
|
- // overflow: "hidden",
|
|
|
- // textOverflow: "ellipsis",
|
|
|
- // whiteSpace: "nowrap",
|
|
|
- // }}
|
|
|
- // title={text}
|
|
|
- >
|
|
|
- {text}
|
|
|
- </div>
|
|
|
+ <div>{text}</div>
|
|
|
);
|
|
|
},
|
|
|
},
|
|
@@ -299,20 +204,10 @@ class DetailedList extends Component {
|
|
|
title: "下一次公出计划",
|
|
|
dataIndex: "nextPlan",
|
|
|
key: "nextPlan",
|
|
|
- width: 180,
|
|
|
+ width: 200,
|
|
|
render: (text) => {
|
|
|
return (
|
|
|
- <div
|
|
|
- // style={{
|
|
|
- // width: 80,
|
|
|
- // overflow: "hidden",
|
|
|
- // textOverflow: "ellipsis",
|
|
|
- // whiteSpace: "nowrap",
|
|
|
- // }}
|
|
|
- // title={text}
|
|
|
- >
|
|
|
- {text}
|
|
|
- </div>
|
|
|
+ <div>{text}</div>
|
|
|
);
|
|
|
},
|
|
|
},
|
|
@@ -341,18 +236,7 @@ class DetailedList extends Component {
|
|
|
width: 200,
|
|
|
render: (text) => {
|
|
|
return (
|
|
|
- // <Tooltip title={text}>
|
|
|
- <div
|
|
|
- // style={{
|
|
|
- // width: 80,
|
|
|
- // overflow: "hidden",
|
|
|
- // textOverflow: "ellipsis",
|
|
|
- // whiteSpace: "nowrap",
|
|
|
- // }}
|
|
|
- >
|
|
|
- {text}
|
|
|
- </div>
|
|
|
- // </Tooltip>
|
|
|
+ <div>{text}</div>
|
|
|
);
|
|
|
},
|
|
|
},
|
|
@@ -891,8 +775,9 @@ class DetailedList extends Component {
|
|
|
this.setState({ clockIn: e });
|
|
|
}}
|
|
|
>
|
|
|
- <Select.Option value={1}>已打卡</Select.Option>
|
|
|
<Select.Option value={0}>未打卡</Select.Option>
|
|
|
+ <Select.Option value={1}>已打卡</Select.Option>
|
|
|
+ <Select.Option value={3}>异常打卡</Select.Option>
|
|
|
</Select>
|
|
|
</span>
|
|
|
<span style={{ marginRight: "10px" }}>
|