|
@@ -30,7 +30,8 @@ import {
|
|
|
getApproval,
|
|
|
getTaskStatus,
|
|
|
getProjectStatus,
|
|
|
- getNewOrderStatus
|
|
|
+ getNewOrderStatus,
|
|
|
+ getInvoiceStatus
|
|
|
} from "@/tools.js";
|
|
|
import './customer.less';
|
|
|
import { ChooseList } from "../orderNew/chooseList";
|
|
@@ -126,7 +127,7 @@ const IntentionCustomer = Form.create()(
|
|
|
starTime: this.state.releaseDate[0], //开始时间
|
|
|
endTime: this.state.releaseDate[1], //结束时间
|
|
|
approval: this.state.approvalSearch ? this.state.approvalSearch : 0, //审批状态
|
|
|
- liquidationStatus: this.state.liquidationStatus //结算状态
|
|
|
+ liquidationStatus: this.state.liquidationStatusSearch //结算状态
|
|
|
},
|
|
|
success: function(data) {
|
|
|
ShowModal(this);
|
|
@@ -1263,7 +1264,7 @@ const IntentionCustomer = Form.create()(
|
|
|
this.state.orderNoSearch = undefined;
|
|
|
this.state.contractNoSearch = undefined;
|
|
|
this.state.nameSearch = undefined;
|
|
|
- this.state.liquidationStatus = [];
|
|
|
+ this.state.liquidationStatusSearch = [];
|
|
|
this.state.departmenttList = undefined;
|
|
|
this.state.releaseDate[0] = undefined;
|
|
|
this.state.releaseDate[1] = undefined;
|
|
@@ -1828,10 +1829,10 @@ const IntentionCustomer = Form.create()(
|
|
|
<Select
|
|
|
placeholder="结算状态"
|
|
|
onChange={e => {
|
|
|
- this.setState({ liquidationStatus: e });
|
|
|
+ this.setState({ liquidationStatusSearch: e });
|
|
|
}}
|
|
|
style={{ width: 160, marginRight: 5 }}
|
|
|
- value={this.state.liquidationStatus}
|
|
|
+ value={this.state.liquidationStatusSearch}
|
|
|
>
|
|
|
<Option value="0">首付待付清</Option>
|
|
|
<Option value="1">尾款待付清</Option>
|
|
@@ -2566,7 +2567,7 @@ const IntentionCustomer = Form.create()(
|
|
|
className="admin-desc-content"
|
|
|
width="1400px"
|
|
|
onCancel={() => {
|
|
|
- this.loadData();
|
|
|
+ // this.loadData();
|
|
|
this.setState({
|
|
|
dvisible: false
|
|
|
});
|
|
@@ -2634,6 +2635,7 @@ const IntentionCustomer = Form.create()(
|
|
|
dataSource={this.state.recordData}
|
|
|
pagination={false}
|
|
|
bordered
|
|
|
+ size="small"
|
|
|
/>
|
|
|
<div className="clearfix" style={{ marginTop: "20px" }}>
|
|
|
<FormItem
|
|
@@ -2684,6 +2686,7 @@ const IntentionCustomer = Form.create()(
|
|
|
dataSource={this.state.waterData}
|
|
|
pagination={false}
|
|
|
bordered
|
|
|
+ size="small"
|
|
|
/>
|
|
|
<div className="clearfix" style={{ marginTop: "20px" }}>
|
|
|
<FormItem
|
|
@@ -2871,7 +2874,7 @@ const IntentionCustomer = Form.create()(
|
|
|
<Table
|
|
|
columns={this.state.proColumns}
|
|
|
dataSource={this.state.proDataList}
|
|
|
- onRowClick={this.tableRowClickPro}
|
|
|
+ // onRowClick={this.tableRowClickPro}
|
|
|
pagination={false}
|
|
|
bordered
|
|
|
size="small"
|