|
@@ -47,8 +47,8 @@ class DetailedList extends Component {
|
|
|
},
|
|
|
{
|
|
|
title: "客户名称",
|
|
|
- dataIndex: "nickname",
|
|
|
- key: "nickname",
|
|
|
+ dataIndex: "userName",
|
|
|
+ key: "userName",
|
|
|
width: 120,
|
|
|
fixed: "left",
|
|
|
render: (text) => {
|
|
@@ -59,8 +59,8 @@ class DetailedList extends Component {
|
|
|
},
|
|
|
{
|
|
|
title: "公出地点",
|
|
|
- dataIndex: "userName",
|
|
|
- key: "userName",
|
|
|
+ dataIndex: "districtName",
|
|
|
+ key: "districtName",
|
|
|
width: 120,
|
|
|
render: (text) => {
|
|
|
return (
|
|
@@ -139,23 +139,27 @@ class DetailedList extends Component {
|
|
|
key: "status",
|
|
|
width: 200,
|
|
|
render: (text, record) => (
|
|
|
- <div style={{ display: "flex", flexDirection: "row" }}>
|
|
|
- <Tag
|
|
|
- color={["#45b97c", "#69541b", "#f47920", "#8552a1", "#228fbd"][record.type]}
|
|
|
- >
|
|
|
- {
|
|
|
- record.type === 0
|
|
|
- ? "业务公出" : record.type === 1
|
|
|
- ? "技术公出" : record.type === 2
|
|
|
- ? "行政公出" : record.type === 3
|
|
|
- ? "技术协单" : record.type === 4
|
|
|
- ? "协单助手" : ""
|
|
|
- }
|
|
|
- </Tag>
|
|
|
- <Tag color={getClockState(text).color}>
|
|
|
- {getClockState(text).title}
|
|
|
- </Tag>
|
|
|
- {record.updateStatus == 1 && <Tag color="#1E90FF">改</Tag>}
|
|
|
+ <div>
|
|
|
+ <div style={{ display: "flex", flexDirection: "row" }}>
|
|
|
+ <Tag
|
|
|
+ color={["#45b97c", "#69541b", "#f47920", "#8552a1", "#228fbd"][record.type]}
|
|
|
+ >
|
|
|
+ {
|
|
|
+ record.type === 0
|
|
|
+ ? "业务公出" : record.type === 1
|
|
|
+ ? "技术公出" : record.type === 2
|
|
|
+ ? "行政公出" : record.type === 3
|
|
|
+ ? "技术协单" : record.type === 4
|
|
|
+ ? "协单助手" : ""
|
|
|
+ }
|
|
|
+ </Tag>
|
|
|
+ <Tag color={getClockState(text).color}>
|
|
|
+ {getClockState(text).title}
|
|
|
+ </Tag>
|
|
|
+ {record.updateStatus == 1 && <Tag color="#1E90FF">改</Tag>}
|
|
|
+ </div>
|
|
|
+ {record.type === 1 && <div style={{ marginTop: 5 }}>{record.contractNo}</div>}
|
|
|
+ {record.type === 1 && <div>{record.totalAmout + "(万元)"}</div>}
|
|
|
</div>
|
|
|
),
|
|
|
},
|
|
@@ -355,6 +359,7 @@ class DetailedList extends Component {
|
|
|
theTypes: props.aid,
|
|
|
theTypes1: undefined,
|
|
|
theCustomerTypes: undefined,
|
|
|
+ contractNo: undefined,
|
|
|
};
|
|
|
this.loadData = this.loadData.bind(this);
|
|
|
this.resetAll = this.resetAll.bind(this);
|
|
@@ -466,6 +471,7 @@ class DetailedList extends Component {
|
|
|
status: this.state.status,
|
|
|
clockIn: this.state.clockIn,
|
|
|
publicType: this.state.type,
|
|
|
+ contractNo: this.state.contractNo || undefined,
|
|
|
},
|
|
|
success: function (data) {
|
|
|
ShowModal(this);
|
|
@@ -513,9 +519,10 @@ class DetailedList extends Component {
|
|
|
auto: "",
|
|
|
auto1: "",
|
|
|
customer: "",
|
|
|
- theTypes: undefined,
|
|
|
+ theTypes: this.props.aid,
|
|
|
theTypes1: undefined,
|
|
|
type: undefined,
|
|
|
+ contractNo: undefined,
|
|
|
},
|
|
|
() => {
|
|
|
this.loadData();
|
|
@@ -818,7 +825,19 @@ class DetailedList extends Component {
|
|
|
marginRight: "10px",
|
|
|
}}
|
|
|
>
|
|
|
- <span style={{ marginRight: "10px" }}>
|
|
|
+ <span>
|
|
|
+ <Input
|
|
|
+ placeholder="合同编号"
|
|
|
+ style={{ width: 120, marginRight: 10 }}
|
|
|
+ value={this.state.contractNo}
|
|
|
+ onChange={(e) => {
|
|
|
+ this.setState({
|
|
|
+ contractNo: e.target.value,
|
|
|
+ });
|
|
|
+ }}
|
|
|
+ />
|
|
|
+ </span>
|
|
|
+ <span>
|
|
|
<AutoComplete
|
|
|
className="certain-category-search"
|
|
|
dropdownClassName="certain-category-search-dropdown"
|
|
@@ -835,7 +854,7 @@ class DetailedList extends Component {
|
|
|
<Input />
|
|
|
</AutoComplete>
|
|
|
</span>
|
|
|
- <span style={{ marginRight: "10px" }}>
|
|
|
+ <span>
|
|
|
<Select
|
|
|
placeholder="请选择审核状态"
|
|
|
style={{ width: 120, marginLeft: 10 }}
|
|
@@ -851,7 +870,7 @@ class DetailedList extends Component {
|
|
|
))}
|
|
|
</Select>
|
|
|
</span>
|
|
|
- <span style={{ marginRight: "10px" }}>
|
|
|
+ <span>
|
|
|
<Select
|
|
|
placeholder="请选择打卡状态"
|
|
|
style={{ width: 120, marginLeft: 10 }}
|
|
@@ -865,7 +884,7 @@ class DetailedList extends Component {
|
|
|
<Select.Option value={3}>异常打卡</Select.Option>
|
|
|
</Select>
|
|
|
</span>
|
|
|
- <span style={{ marginRight: "10px" }}>
|
|
|
+ <span>
|
|
|
<Select
|
|
|
placeholder="请选择公出类型"
|
|
|
style={{ width: 120, marginLeft: 10 }}
|
|
@@ -898,7 +917,7 @@ class DetailedList extends Component {
|
|
|
<Input />
|
|
|
</AutoComplete>
|
|
|
</span> */}
|
|
|
- <span style={{ marginRight: "10px" }}>
|
|
|
+ <span>
|
|
|
<AutoComplete
|
|
|
className="certain-category-search"
|
|
|
dropdownClassName="certain-category-search-dropdown"
|
|
@@ -920,7 +939,7 @@ class DetailedList extends Component {
|
|
|
创建时间 :
|
|
|
</span>
|
|
|
<RangePicker
|
|
|
- style={{ marginRight: "10px", marginBottom: "10px" }}
|
|
|
+ style={{ width: 200, marginRight: "10px", marginBottom: "10px" }}
|
|
|
value={[
|
|
|
this.state.createReleaseDate[0]
|
|
|
? moment(this.state.createReleaseDate[0])
|
|
@@ -939,7 +958,7 @@ class DetailedList extends Component {
|
|
|
公出时间 :
|
|
|
</span>
|
|
|
<RangePicker
|
|
|
- style={{ marginRight: "10px", marginBottom: "10px" }}
|
|
|
+ style={{ width: 200, marginRight: "10px", marginBottom: "10px" }}
|
|
|
value={[
|
|
|
this.state.releaseDate[0]
|
|
|
? moment(this.state.releaseDate[0])
|