|
@@ -329,6 +329,7 @@ const contractChange = Form.create()(
|
|
|
this.xiangqing(record.orderNo);
|
|
|
this.xiangmu(record.orderNo);
|
|
|
this.jiedian(record.orderNo);
|
|
|
+ this.jiedianNew(record.orderNo);
|
|
|
}
|
|
|
);
|
|
|
},
|
|
@@ -360,7 +361,9 @@ const contractChange = Form.create()(
|
|
|
method: "get",
|
|
|
dataType: "json",
|
|
|
crossDomain: false,
|
|
|
- url: globalConfig.context + "/api/admin/orderChange/orderChangeDetailsById",
|
|
|
+ url:
|
|
|
+ globalConfig.context +
|
|
|
+ "/api/admin/orderChange/orderChangeDetailsById",
|
|
|
data: {
|
|
|
id: this.state.id
|
|
|
},
|
|
@@ -387,55 +390,54 @@ const contractChange = Form.create()(
|
|
|
}.bind(this)
|
|
|
});
|
|
|
|
|
|
- $.ajax({
|
|
|
- method: "get",
|
|
|
- dataType: "json",
|
|
|
- crossDomain: false,
|
|
|
- url:
|
|
|
- globalConfig.context +
|
|
|
- "/api/admin/orderChange/listOrderInvoiceAndBill",
|
|
|
- data: {
|
|
|
- orderNo: this.state.orderNo
|
|
|
- },
|
|
|
- success: function(data) {
|
|
|
- if (!data.data) return;
|
|
|
- let proTotal = 0;
|
|
|
- let invTotal = 0;
|
|
|
- data.data.bill.forEach(item => {
|
|
|
- proTotal += item.transactionAmount;
|
|
|
- });
|
|
|
- data.data.invoice.forEach(item => {
|
|
|
- invTotal += item.amount;
|
|
|
- });
|
|
|
- this.setState({
|
|
|
- proceedsData: data.data,
|
|
|
- proTotal,
|
|
|
- invTotal
|
|
|
- });
|
|
|
- }.bind(this)
|
|
|
- });
|
|
|
-
|
|
|
- $.ajax({
|
|
|
- method: "get",
|
|
|
- dataType: "json",
|
|
|
- crossDomain: false,
|
|
|
- url:
|
|
|
- globalConfig.context +
|
|
|
- "/api/admin/orderChange/listOrderRefundInvoice",
|
|
|
- data: {
|
|
|
- orderNo: this.state.orderNo
|
|
|
- },
|
|
|
- success: data => {
|
|
|
- if (!data) return;
|
|
|
- data.data.forEach(item => {
|
|
|
- item.load = true;
|
|
|
- });
|
|
|
- this.setState({
|
|
|
- refundInvoice: data.data
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
+ $.ajax({
|
|
|
+ method: "get",
|
|
|
+ dataType: "json",
|
|
|
+ crossDomain: false,
|
|
|
+ url:
|
|
|
+ globalConfig.context +
|
|
|
+ "/api/admin/orderChange/listOrderInvoiceAndBill",
|
|
|
+ data: {
|
|
|
+ orderNo: this.state.orderNo
|
|
|
+ },
|
|
|
+ success: function(data) {
|
|
|
+ if (!data.data) return;
|
|
|
+ let proTotal = 0;
|
|
|
+ let invTotal = 0;
|
|
|
+ data.data.bill.forEach(item => {
|
|
|
+ proTotal += item.transactionAmount;
|
|
|
+ });
|
|
|
+ data.data.invoice.forEach(item => {
|
|
|
+ invTotal += item.amount;
|
|
|
+ });
|
|
|
+ this.setState({
|
|
|
+ proceedsData: data.data,
|
|
|
+ proTotal,
|
|
|
+ invTotal
|
|
|
+ });
|
|
|
+ }.bind(this)
|
|
|
+ });
|
|
|
|
|
|
+ $.ajax({
|
|
|
+ method: "get",
|
|
|
+ dataType: "json",
|
|
|
+ crossDomain: false,
|
|
|
+ url:
|
|
|
+ globalConfig.context +
|
|
|
+ "/api/admin/orderChange/listOrderRefundInvoice",
|
|
|
+ data: {
|
|
|
+ orderNo: this.state.orderNo
|
|
|
+ },
|
|
|
+ success: data => {
|
|
|
+ if (!data) return;
|
|
|
+ data.data.forEach(item => {
|
|
|
+ item.load = true;
|
|
|
+ });
|
|
|
+ this.setState({
|
|
|
+ refundInvoice: data.data
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
},
|
|
|
|
|
|
//订单详情
|
|
@@ -656,6 +658,64 @@ const contractChange = Form.create()(
|
|
|
}.bind(this)
|
|
|
});
|
|
|
},
|
|
|
+ jiedianNew(orderNos) {
|
|
|
+ $.ajax({
|
|
|
+ method: "get",
|
|
|
+ dataType: "json",
|
|
|
+ crossDomain: false,
|
|
|
+ url:
|
|
|
+ globalConfig.context + "/api/admin/newOrderDun/selectListNewOrderDun",
|
|
|
+ data: {
|
|
|
+ orderNo: orderNos
|
|
|
+ },
|
|
|
+ success: function(data) {
|
|
|
+ if (data.error && data.error.length) {
|
|
|
+ message.warning(data.error[0].message);
|
|
|
+ } else {
|
|
|
+ let theArr = [];
|
|
|
+ let thisData = [];
|
|
|
+ let arr = data.data || [];
|
|
|
+ let totalCui = 0;
|
|
|
+ for (let i = 0; i < arr.length; i++) {
|
|
|
+ thisData = arr[i];
|
|
|
+ totalCui += +thisData.money;
|
|
|
+ theArr.push({
|
|
|
+ key: i,
|
|
|
+ dunSubject: thisData.dunSubject
|
|
|
+ ? thisData.dunSubject.toString()
|
|
|
+ : "", //催款科目
|
|
|
+ id: thisData.id, //节点Id
|
|
|
+ money: thisData.money, //催款金额
|
|
|
+ // orderNo: record ? record.orderNo : this.props.datauser.orderNo,
|
|
|
+ commodityName: thisData.commodityName,
|
|
|
+ projectType: thisData.projectType,
|
|
|
+ dunTypeName: thisData.dunTypeName,
|
|
|
+ status: thisData.status,
|
|
|
+ waitDay: thisData.waitDay,
|
|
|
+ effectiveCount: thisData.effectiveCount,
|
|
|
+ startDate: thisData.startDate,
|
|
|
+ dunType: thisData.dunType,
|
|
|
+ appropriationRatio: thisData.appropriationRatio
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if (!totalCui) {
|
|
|
+ totalCui = 0;
|
|
|
+ }
|
|
|
+ totalCui = (Math.round(totalCui * 10000) / 10000).toFixed(4);
|
|
|
+ this.setState({
|
|
|
+ contactListNew: theArr,
|
|
|
+ totalCui
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }.bind(this)
|
|
|
+ }).always(
|
|
|
+ function() {
|
|
|
+ this.setState({
|
|
|
+ loading: false
|
|
|
+ });
|
|
|
+ }.bind(this)
|
|
|
+ );
|
|
|
+ },
|
|
|
//审核通过
|
|
|
examOk() {
|
|
|
$.ajax({
|
|
@@ -773,7 +833,7 @@ const contractChange = Form.create()(
|
|
|
// componentDidMount(){
|
|
|
// window.setTimeout(() => {
|
|
|
// console.log(this.state.dataProps);
|
|
|
-
|
|
|
+
|
|
|
// },100)
|
|
|
// },
|
|
|
|
|
@@ -796,7 +856,7 @@ const contractChange = Form.create()(
|
|
|
// console.log("拿到历史", data.data);
|
|
|
|
|
|
this.setState({
|
|
|
- dataProps: data.data,
|
|
|
+ dataProps: data.data
|
|
|
});
|
|
|
}
|
|
|
}.bind(this)
|
|
@@ -810,6 +870,7 @@ const contractChange = Form.create()(
|
|
|
if (key === "1") {
|
|
|
this.xiangmu(this.state.orderNo);
|
|
|
this.jiedian(this.state.orderNo);
|
|
|
+ this.jiedianNew(this.state.orderNo);
|
|
|
}
|
|
|
if (key === "2") {
|
|
|
this.ChangeDetail(this.state.orderNo);
|
|
@@ -819,11 +880,13 @@ const contractChange = Form.create()(
|
|
|
this.primaryOrder(this.state.primaryOrderNo);
|
|
|
this.xiangmu(this.state.primaryOrderNo);
|
|
|
this.jiedian(this.state.primaryOrderNo);
|
|
|
+ this.jiedianNew(this.state.primaryOrderNo);
|
|
|
}
|
|
|
if (key === "4") {
|
|
|
this.additionalOrder(this.state.additionalOrder);
|
|
|
this.xiangmu(this.state.additionalOrder);
|
|
|
this.jiedian(this.state.additionalOrder);
|
|
|
+ this.jiedianNew(this.state.additionalOrder);
|
|
|
this.setState({
|
|
|
buttonStatusA: false
|
|
|
});
|
|
@@ -1043,8 +1106,10 @@ const contractChange = Form.create()(
|
|
|
<OrderDetail
|
|
|
orderData={this.state.orderData}
|
|
|
getOrderLog={this.getOrderLog}
|
|
|
+ totalCui={this.state.totalCui}
|
|
|
dataSourceX={this.state.dataSourceX}
|
|
|
contactList={this.state.contactList}
|
|
|
+ contactListNew={this.state.contactListNew}
|
|
|
orderNo={this.state.orderNo}
|
|
|
/>
|
|
|
</Spin>
|
|
@@ -1077,6 +1142,8 @@ const contractChange = Form.create()(
|
|
|
getOrderLog={this.getOrderLog}
|
|
|
dataSourceX={this.state.dataSourceX}
|
|
|
contactList={this.state.contactList}
|
|
|
+ totalCui={this.state.totalCui}
|
|
|
+ contactListNew={this.state.contactListNew}
|
|
|
orderNo={this.state.primaryOrderNo}
|
|
|
/>
|
|
|
</Spin>
|
|
@@ -1092,6 +1159,8 @@ const contractChange = Form.create()(
|
|
|
orderData={this.state.additionalOrderData}
|
|
|
getOrderLog={this.getOrderLog}
|
|
|
dataSourceX={this.state.dataSourceX}
|
|
|
+ totalCui={this.state.totalCui}
|
|
|
+ contactListNew={this.state.contactListNew}
|
|
|
contactList={this.state.contactList}
|
|
|
orderNo={this.state.additionalOrder}
|
|
|
/>
|