|
@@ -1162,7 +1162,7 @@ const contractChange = Form.create()(
|
|
|
/>
|
|
|
</Spin>
|
|
|
</div>
|
|
|
- <Modal
|
|
|
+ {this.state.visible ? <Modal
|
|
|
className="customeDetails"
|
|
|
footer=""
|
|
|
maskClosable={false}
|
|
@@ -1176,41 +1176,41 @@ const contractChange = Form.create()(
|
|
|
onChange={this.callback}
|
|
|
type="card"
|
|
|
>
|
|
|
- {this.state.orderData.deleteSign === 3 ? (
|
|
|
- <TabPane tab="订单详情" key="a">
|
|
|
- <AddOrders
|
|
|
- processStatus={0}
|
|
|
- data={this.state.orderData.orderNo}
|
|
|
- mark={this.state.buttonStatus}
|
|
|
- getPrimaryOrder={this.getPrimaryOrder}
|
|
|
- totalCui={this.state.totalCui}
|
|
|
- closeDesc={this.closeDesc}
|
|
|
- getAdditionalOrder={this.getAdditionalOrder}
|
|
|
- deleteSign={this.state.orderData.deleteSign}
|
|
|
- />
|
|
|
- </TabPane>
|
|
|
- ) : (
|
|
|
- <TabPane tab="订单详情" key="a">
|
|
|
- <Form
|
|
|
- layout="horizontal"
|
|
|
- onSubmit={this.handleSubmit}
|
|
|
- id="demand-form"
|
|
|
- style={{ paddingBottom: "40px" }}
|
|
|
- >
|
|
|
- <Spin spinning={this.state.loading}>
|
|
|
- <OrderDetail
|
|
|
- orderData={this.state.orderData}
|
|
|
- getOrderLog={this.getOrderLog}
|
|
|
+ <TabPane tab="订单详情" key="a">
|
|
|
+ {this.state.activeKey === 'a' ? <div>
|
|
|
+ {this.state.orderData.deleteSign === 3 ? (
|
|
|
+ <AddOrders
|
|
|
+ processStatus={0}
|
|
|
+ data={this.state.orderData.orderNo}
|
|
|
+ mark={this.state.buttonStatus}
|
|
|
+ getPrimaryOrder={this.getPrimaryOrder}
|
|
|
totalCui={this.state.totalCui}
|
|
|
- dataSourceX={this.state.dataSourceX}
|
|
|
- contactList={this.state.contactList}
|
|
|
- contactListNew={this.state.contactListNew}
|
|
|
- orderNo={this.state.orderNo}
|
|
|
- />
|
|
|
- </Spin>
|
|
|
- </Form>
|
|
|
- </TabPane>
|
|
|
- )}
|
|
|
+ closeDesc={this.closeDesc}
|
|
|
+ getAdditionalOrder={this.getAdditionalOrder}
|
|
|
+ deleteSign={this.state.orderData.deleteSign}
|
|
|
+ />
|
|
|
+ ):(
|
|
|
+ <Form
|
|
|
+ layout="horizontal"
|
|
|
+ onSubmit={this.handleSubmit}
|
|
|
+ id="demand-form"
|
|
|
+ style={{ paddingBottom: "40px" }}
|
|
|
+ >
|
|
|
+ <Spin spinning={this.state.loading}>
|
|
|
+ <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>
|
|
|
+ </Form>
|
|
|
+ ) }
|
|
|
+ </div>:<div/>}
|
|
|
+ </TabPane>
|
|
|
{/* <TabPane tab="合同变更记录" key="2">
|
|
|
{this.state.contractData.processState === 0 ? (
|
|
|
<ChangeApply
|
|
@@ -1235,32 +1235,37 @@ const contractChange = Form.create()(
|
|
|
{tabList.map((item, index, arr) => {
|
|
|
return (
|
|
|
<TabPane tab={"合同变更记录" + (index + 1)} key={item.id}>
|
|
|
- {this.state.contractData.processState === 0 &&
|
|
|
- this.state.contractData.status != 5 ? (
|
|
|
- <ChangeApply
|
|
|
- id={Math.random()}
|
|
|
- orderData={this.state.contractData}
|
|
|
- voucherUrl={this.state.voucherUrl}
|
|
|
- onCancel={this.visitCancel}
|
|
|
- />
|
|
|
- ) : (
|
|
|
- <ChangeDetail
|
|
|
- id={item.id}
|
|
|
- money={
|
|
|
- index == arr.length - 1
|
|
|
- ? this.state.orderData.totalAmount + ""
|
|
|
- : undefined
|
|
|
- }
|
|
|
- data={this.state.contractData}
|
|
|
- pictureUrl={this.state.voucherUrl}
|
|
|
- processState={this.props.processState}
|
|
|
- dataSource={this.state.dataProps}
|
|
|
- proceedsData={this.state.proceedsData}
|
|
|
- proceedsTotal={this.state.proTotal}
|
|
|
- invoiceTotal={this.state.invTotal}
|
|
|
- contactList={this.state.refundInvoice}
|
|
|
- />
|
|
|
- )}
|
|
|
+ {
|
|
|
+ this.state.activeKey === String(item.id) ?
|
|
|
+ (
|
|
|
+ this.state.contractData.processState === 0 &&
|
|
|
+ this.state.contractData.status != 5 ? (
|
|
|
+ <ChangeApply
|
|
|
+ id={Math.random()}
|
|
|
+ orderData={this.state.contractData}
|
|
|
+ voucherUrl={this.state.voucherUrl}
|
|
|
+ onCancel={this.visitCancel}
|
|
|
+ />
|
|
|
+ ) : (
|
|
|
+ <ChangeDetail
|
|
|
+ id={item.id}
|
|
|
+ money={
|
|
|
+ index == arr.length - 1
|
|
|
+ ? this.state.orderData.totalAmount + ""
|
|
|
+ : undefined
|
|
|
+ }
|
|
|
+ data={this.state.contractData}
|
|
|
+ pictureUrl={this.state.voucherUrl}
|
|
|
+ processState={this.props.processState}
|
|
|
+ dataSource={this.state.dataProps}
|
|
|
+ proceedsData={this.state.proceedsData}
|
|
|
+ proceedsTotal={this.state.proTotal}
|
|
|
+ invoiceTotal={this.state.invTotal}
|
|
|
+ contactList={this.state.refundInvoice}
|
|
|
+ />
|
|
|
+ )
|
|
|
+ ) : <div/>
|
|
|
+ }
|
|
|
</TabPane>
|
|
|
);
|
|
|
})}
|
|
@@ -1271,24 +1276,27 @@ const contractChange = Form.create()(
|
|
|
tab={"原订单" + (index + 1)}
|
|
|
key={item.usedOrder}
|
|
|
>
|
|
|
- <Form
|
|
|
- layout="horizontal"
|
|
|
- onSubmit={this.handleSubmit}
|
|
|
- id="demand-form"
|
|
|
- style={{ paddingBottom: "40px" }}
|
|
|
- >
|
|
|
- <Spin spinning={this.state.loading}>
|
|
|
- <OrderDetail
|
|
|
- orderData={this.state.primaryOrderData}
|
|
|
- getOrderLog={this.getOrderLog}
|
|
|
- dataSourceX={this.state.dataSourceX}
|
|
|
- contactList={this.state.contactList}
|
|
|
- orderNo={this.state.primaryOrderNo}
|
|
|
- totalCui={this.state.totalCui}
|
|
|
- contactListNew={this.state.contactListNew}
|
|
|
- />
|
|
|
- </Spin>
|
|
|
- </Form>
|
|
|
+ {
|
|
|
+ this.state.activeKey === String(item.usedOrder) ?
|
|
|
+ <Form
|
|
|
+ layout="horizontal"
|
|
|
+ onSubmit={this.handleSubmit}
|
|
|
+ id="demand-form"
|
|
|
+ style={{ paddingBottom: "40px" }}
|
|
|
+ >
|
|
|
+ <Spin spinning={this.state.loading}>
|
|
|
+ <OrderDetail
|
|
|
+ orderData={this.state.primaryOrderData}
|
|
|
+ getOrderLog={this.getOrderLog}
|
|
|
+ dataSourceX={this.state.dataSourceX}
|
|
|
+ contactList={this.state.contactList}
|
|
|
+ orderNo={this.state.primaryOrderNo}
|
|
|
+ totalCui={this.state.totalCui}
|
|
|
+ contactListNew={this.state.contactListNew}
|
|
|
+ />
|
|
|
+ </Spin>
|
|
|
+ </Form> : <div/>
|
|
|
+ }
|
|
|
</TabPane>
|
|
|
);
|
|
|
} else {
|
|
@@ -1322,15 +1330,18 @@ const contractChange = Form.create()(
|
|
|
{this.state.status === 4 && this.state.isAddition ? (
|
|
|
this.state.type === 4 || this.state.type === 5 ? (
|
|
|
<TabPane tab="附加订单" key="c">
|
|
|
- <AddOrders
|
|
|
- processStatus={0}
|
|
|
- data={this.state.orderData.additionalOrder}
|
|
|
- mark={this.state.buttonStatusA}
|
|
|
- getPrimaryOrder={this.getPrimaryOrder}
|
|
|
- closeDesc={this.closeDesc}
|
|
|
- getAdditionalOrder={this.getAdditionalOrder}
|
|
|
- activeKey={this.state.activeKey}
|
|
|
- />
|
|
|
+ {
|
|
|
+ this.state.activeKey === "c" ?
|
|
|
+ <AddOrders
|
|
|
+ processStatus={0}
|
|
|
+ data={this.state.orderData.additionalOrder}
|
|
|
+ mark={this.state.buttonStatusA}
|
|
|
+ getPrimaryOrder={this.getPrimaryOrder}
|
|
|
+ closeDesc={this.closeDesc}
|
|
|
+ getAdditionalOrder={this.getAdditionalOrder}
|
|
|
+ activeKey={this.state.activeKey}
|
|
|
+ /> : <div/>
|
|
|
+ }
|
|
|
</TabPane>
|
|
|
) : (
|
|
|
""
|
|
@@ -1339,7 +1350,7 @@ const contractChange = Form.create()(
|
|
|
""
|
|
|
)}
|
|
|
</Tabs>
|
|
|
- </Modal>
|
|
|
+ </Modal> : <div/>}
|
|
|
<Modal
|
|
|
maskClosable={false}
|
|
|
visible={this.state.addnextVisible}
|