|
@@ -258,7 +258,9 @@ const OrderDetail = Form.create()(
|
|
|
render: (text, record) => {
|
|
render: (text, record) => {
|
|
|
if (record.dunTypeName) {
|
|
if (record.dunTypeName) {
|
|
|
if (record.appropriationRatio) {
|
|
if (record.appropriationRatio) {
|
|
|
- return <span>{record.appropriationRatio}(拨款比例)</span>;
|
|
|
|
|
|
|
+ let percent = Number(record.appropriationRatio * 100);
|
|
|
|
|
+ percent += "%";
|
|
|
|
|
+ return <span>{percent}(拨款比例)</span>;
|
|
|
} else {
|
|
} else {
|
|
|
return <span>{text}</span>;
|
|
return <span>{text}</span>;
|
|
|
}
|
|
}
|
|
@@ -420,36 +422,6 @@ const OrderDetail = Form.create()(
|
|
|
}.bind(this)
|
|
}.bind(this)
|
|
|
);
|
|
);
|
|
|
},
|
|
},
|
|
|
- jdDate(record) {
|
|
|
|
|
- $.ajax({
|
|
|
|
|
- method: "get",
|
|
|
|
|
- dataType: "json",
|
|
|
|
|
- crossDomain: false,
|
|
|
|
|
- url: globalConfig.context + "/api/admin/newOrder/selectOrderDun",
|
|
|
|
|
- data: {
|
|
|
|
|
- orderNo: record ? record.orderNo : this.props.data.orderNo,
|
|
|
|
|
- },
|
|
|
|
|
- success: function (data) {
|
|
|
|
|
- let thisData = data.data;
|
|
|
|
|
- if (!thisData.length) {
|
|
|
|
|
- if (data.error && data.error.length) {
|
|
|
|
|
- message.warning(data.error[0].message);
|
|
|
|
|
- }
|
|
|
|
|
- thisData = {};
|
|
|
|
|
- } else {
|
|
|
|
|
- this.setState({
|
|
|
|
|
- jsDate: thisData,
|
|
|
|
|
- });
|
|
|
|
|
- }
|
|
|
|
|
- }.bind(this),
|
|
|
|
|
- }).always(
|
|
|
|
|
- function () {
|
|
|
|
|
- this.setState({
|
|
|
|
|
- loading: false,
|
|
|
|
|
- });
|
|
|
|
|
- }.bind(this)
|
|
|
|
|
- );
|
|
|
|
|
- },
|
|
|
|
|
|
|
|
|
|
rizhi() {
|
|
rizhi() {
|
|
|
this.setState({
|
|
this.setState({
|
|
@@ -517,7 +489,6 @@ const OrderDetail = Form.create()(
|
|
|
})
|
|
})
|
|
|
this.loadData();
|
|
this.loadData();
|
|
|
this.loadXmu();
|
|
this.loadXmu();
|
|
|
- this.jdDate();
|
|
|
|
|
this.jiedian(this.props.data.orderNo);
|
|
this.jiedian(this.props.data.orderNo);
|
|
|
this.jiedianNew(this.props.data.orderNo);
|
|
this.jiedianNew(this.props.data.orderNo);
|
|
|
} else {
|
|
} else {
|
|
@@ -534,7 +505,6 @@ const OrderDetail = Form.create()(
|
|
|
})
|
|
})
|
|
|
this.loadData(nextProps.data);
|
|
this.loadData(nextProps.data);
|
|
|
this.loadXmu(nextProps.data);
|
|
this.loadXmu(nextProps.data);
|
|
|
- this.jdDate(nextProps.data);
|
|
|
|
|
this.jiedian(nextProps.data.orderNo);
|
|
this.jiedian(nextProps.data.orderNo);
|
|
|
this.jiedianNew(nextProps.data.orderNo);
|
|
this.jiedianNew(nextProps.data.orderNo);
|
|
|
} else {
|
|
} else {
|
|
@@ -734,7 +704,6 @@ const OrderDetail = Form.create()(
|
|
|
labelCol: { span: 10 },
|
|
labelCol: { span: 10 },
|
|
|
wrapperCol: { span: 12 },
|
|
wrapperCol: { span: 12 },
|
|
|
};
|
|
};
|
|
|
- const jsDate = this.state.jsDate || [];
|
|
|
|
|
const cuiDataList = this.state.contactList || [];
|
|
const cuiDataList = this.state.contactList || [];
|
|
|
return (
|
|
return (
|
|
|
<div className="login">
|
|
<div className="login">
|
|
@@ -762,9 +731,9 @@ const OrderDetail = Form.create()(
|
|
|
<FormItem
|
|
<FormItem
|
|
|
className="half-item"
|
|
className="half-item"
|
|
|
{...formItemLayout}
|
|
{...formItemLayout}
|
|
|
- label="签单时间"
|
|
|
|
|
|
|
+ label="合同编号"
|
|
|
>
|
|
>
|
|
|
- <span>{theData.signDate}</span>
|
|
|
|
|
|
|
+ <span>{theData.contractNo}</span>
|
|
|
</FormItem>
|
|
</FormItem>
|
|
|
<FormItem
|
|
<FormItem
|
|
|
className="half-item"
|
|
className="half-item"
|
|
@@ -799,6 +768,13 @@ const OrderDetail = Form.create()(
|
|
|
<FormItem
|
|
<FormItem
|
|
|
className="half-item"
|
|
className="half-item"
|
|
|
{...formItemLayout}
|
|
{...formItemLayout}
|
|
|
|
|
+ label="签单时间"
|
|
|
|
|
+ >
|
|
|
|
|
+ <span>{theData.signDate}</span>
|
|
|
|
|
+ </FormItem>
|
|
|
|
|
+ <FormItem
|
|
|
|
|
+ className="half-item"
|
|
|
|
|
+ {...formItemLayout}
|
|
|
label="流程状态"
|
|
label="流程状态"
|
|
|
>
|
|
>
|
|
|
<span>{getProcessStatus(theData.processStatus)}</span>
|
|
<span>{getProcessStatus(theData.processStatus)}</span>
|
|
@@ -861,6 +837,24 @@ const OrderDetail = Form.create()(
|
|
|
<span>{this.props.data.refundAmount}</span>
|
|
<span>{this.props.data.refundAmount}</span>
|
|
|
</FormItem>
|
|
</FormItem>
|
|
|
)}
|
|
)}
|
|
|
|
|
+ <FormItem
|
|
|
|
|
+ className="half-item"
|
|
|
|
|
+ {...formItemLayout}
|
|
|
|
|
+ label="订单部门"
|
|
|
|
|
+ >
|
|
|
|
|
+ <span>{theData.depName}</span>
|
|
|
|
|
+ </FormItem>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div className="clearfix">
|
|
|
|
|
+ <FormItem
|
|
|
|
|
+ labelCol={{ span: 5 }}
|
|
|
|
|
+ wrapperCol={{ span: 18 }}
|
|
|
|
|
+ label="订单留言"
|
|
|
|
|
+ >
|
|
|
|
|
+ <p style={{ maxWidth: 500, wordWrap: "break-word" }}>
|
|
|
|
|
+ {this.state.orderRemarks}
|
|
|
|
|
+ </p>
|
|
|
|
|
+ </FormItem>
|
|
|
</div>
|
|
</div>
|
|
|
<div className="clearfix">
|
|
<div className="clearfix">
|
|
|
<FormItem
|
|
<FormItem
|
|
@@ -868,17 +862,6 @@ const OrderDetail = Form.create()(
|
|
|
wrapperCol={{ span: 18 }}
|
|
wrapperCol={{ span: 18 }}
|
|
|
label="合同扫描件"
|
|
label="合同扫描件"
|
|
|
>
|
|
>
|
|
|
- {/*<Upload*/}
|
|
|
|
|
- {/* className="demandDetailShow-upload"*/}
|
|
|
|
|
- {/* listType="picture-card"*/}
|
|
|
|
|
- {/* fileList={this.state.orgCodeUrl}*/}
|
|
|
|
|
- {/* onPreview={(file) => {*/}
|
|
|
|
|
- {/* this.setState({*/}
|
|
|
|
|
- {/* previewImage: file.url || file.thumbUrl,*/}
|
|
|
|
|
- {/* previewVisible: true,*/}
|
|
|
|
|
- {/* });*/}
|
|
|
|
|
- {/* }}*/}
|
|
|
|
|
- {/*/>*/}
|
|
|
|
|
<div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
|
|
<div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
|
|
|
{this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'} /> : <div />}
|
|
{this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'} /> : <div />}
|
|
|
</div>
|
|
</div>
|
|
@@ -891,90 +874,6 @@ const OrderDetail = Form.create()(
|
|
|
this.setState({ previewVisible: false, rotateDeg: 0 });
|
|
this.setState({ previewVisible: false, rotateDeg: 0 });
|
|
|
}}
|
|
}}
|
|
|
>
|
|
>
|
|
|
- {/* <div
|
|
|
|
|
- onClick={this.upImg}
|
|
|
|
|
- className="up-btn"
|
|
|
|
|
- style={{
|
|
|
|
|
- cursor: "pointer",
|
|
|
|
|
- transition: "all .5s",
|
|
|
|
|
- opacity: ".2",
|
|
|
|
|
- width: "41px",
|
|
|
|
|
- height: "69px",
|
|
|
|
|
- backgroundColor: "rgba(0,0,0,.5)",
|
|
|
|
|
- position: "absolute",
|
|
|
|
|
- top: "50%",
|
|
|
|
|
- left: 16,
|
|
|
|
|
- transform: "translateY(-50%)",
|
|
|
|
|
- zIndex: 1
|
|
|
|
|
- }}
|
|
|
|
|
- >
|
|
|
|
|
- <span
|
|
|
|
|
- style={{
|
|
|
|
|
- position: "absolute",
|
|
|
|
|
- border: "1px solid #fff",
|
|
|
|
|
- width: "20px",
|
|
|
|
|
- height: "20px",
|
|
|
|
|
- left: "60%",
|
|
|
|
|
- top: "50%",
|
|
|
|
|
- transform: "translate(-50%, -50%) rotate(45deg)",
|
|
|
|
|
- borderTop: "none",
|
|
|
|
|
- borderRight: "none"
|
|
|
|
|
- }}
|
|
|
|
|
- ></span>
|
|
|
|
|
- </div>
|
|
|
|
|
- <div
|
|
|
|
|
- onClick={this.rotate}
|
|
|
|
|
- style={{
|
|
|
|
|
- textAlign: "center",
|
|
|
|
|
- lineHeight: "30px",
|
|
|
|
|
- color: "#000",
|
|
|
|
|
- cursor: "pointer",
|
|
|
|
|
- transition: "all .5s",
|
|
|
|
|
- width: "50px",
|
|
|
|
|
- height: "30px",
|
|
|
|
|
- backgroundColor: "white",
|
|
|
|
|
- position: "absolute",
|
|
|
|
|
- bottom: "-30",
|
|
|
|
|
- left: "50%",
|
|
|
|
|
- transform: "translateX(-50%)",
|
|
|
|
|
- zIndex: 1,
|
|
|
|
|
- borderRadius: "5px",
|
|
|
|
|
- border: "1px solid #ccc"
|
|
|
|
|
- }}
|
|
|
|
|
- >
|
|
|
|
|
- 旋转
|
|
|
|
|
- </div>
|
|
|
|
|
- <div
|
|
|
|
|
- onClick={this.downImg}
|
|
|
|
|
- className="up-btn"
|
|
|
|
|
- style={{
|
|
|
|
|
- cursor: "pointer",
|
|
|
|
|
- transition: "all .5s",
|
|
|
|
|
- opacity: ".2",
|
|
|
|
|
- width: "41px",
|
|
|
|
|
- height: "69px",
|
|
|
|
|
- backgroundColor: "rgba(0,0,0,.5)",
|
|
|
|
|
- position: "absolute",
|
|
|
|
|
- top: "50%",
|
|
|
|
|
- right: 16,
|
|
|
|
|
- transform: "translateY(-50%)",
|
|
|
|
|
- zIndex: 1
|
|
|
|
|
- }}
|
|
|
|
|
- >
|
|
|
|
|
- <span
|
|
|
|
|
- style={{
|
|
|
|
|
- position: "absolute",
|
|
|
|
|
- border: "1px solid #fff",
|
|
|
|
|
- width: "20px",
|
|
|
|
|
- height: "20px",
|
|
|
|
|
- left: "40%",
|
|
|
|
|
- top: "50%",
|
|
|
|
|
- transform: "translate(-50%, -50%) rotate(225deg)",
|
|
|
|
|
- borderTop: "none",
|
|
|
|
|
- borderRight: "none"
|
|
|
|
|
- }}
|
|
|
|
|
- ></span>
|
|
|
|
|
- </div> */}
|
|
|
|
|
<img
|
|
<img
|
|
|
alt=""
|
|
alt=""
|
|
|
style={{
|
|
style={{
|
|
@@ -1032,17 +931,6 @@ const OrderDetail = Form.create()(
|
|
|
wrapperCol={{ span: 18 }}
|
|
wrapperCol={{ span: 18 }}
|
|
|
label="补充协议"
|
|
label="补充协议"
|
|
|
>
|
|
>
|
|
|
- {/*<Upload*/}
|
|
|
|
|
- {/* className="demandDetailShow-upload"*/}
|
|
|
|
|
- {/* listType="picture-card"*/}
|
|
|
|
|
- {/* fileList={this.state.replenishUrl}*/}
|
|
|
|
|
- {/* onPreview={(file) => {*/}
|
|
|
|
|
- {/* this.setState({*/}
|
|
|
|
|
- {/* previewImage: file.url || file.thumbUrl,*/}
|
|
|
|
|
- {/* previewVisibles: true,*/}
|
|
|
|
|
- {/* });*/}
|
|
|
|
|
- {/* }}*/}
|
|
|
|
|
- {/*/>*/}
|
|
|
|
|
<div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
|
|
<div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
|
|
|
{this.state.replenishUrl ? <ImgList domId={'orderDetail1'} fileList={this.state.replenishUrl} /> : <div />}
|
|
{this.state.replenishUrl ? <ImgList domId={'orderDetail1'} fileList={this.state.replenishUrl} /> : <div />}
|
|
|
</div>
|
|
</div>
|
|
@@ -1055,90 +943,6 @@ const OrderDetail = Form.create()(
|
|
|
this.setState({ previewVisibles: false, rotateDeg: 0 });
|
|
this.setState({ previewVisibles: false, rotateDeg: 0 });
|
|
|
}}
|
|
}}
|
|
|
>
|
|
>
|
|
|
- {/* <div
|
|
|
|
|
- onClick={this.upImg}
|
|
|
|
|
- className="up-btn"
|
|
|
|
|
- style={{
|
|
|
|
|
- cursor: "pointer",
|
|
|
|
|
- transition: "all .5s",
|
|
|
|
|
- opacity: ".2",
|
|
|
|
|
- width: "41px",
|
|
|
|
|
- height: "69px",
|
|
|
|
|
- backgroundColor: "rgba(0,0,0,.5)",
|
|
|
|
|
- position: "absolute",
|
|
|
|
|
- top: "50%",
|
|
|
|
|
- left: 16,
|
|
|
|
|
- transform: "translateY(-50%)",
|
|
|
|
|
- zIndex: 1
|
|
|
|
|
- }}
|
|
|
|
|
- >
|
|
|
|
|
- <span
|
|
|
|
|
- style={{
|
|
|
|
|
- position: "absolute",
|
|
|
|
|
- border: "1px solid #fff",
|
|
|
|
|
- width: "20px",
|
|
|
|
|
- height: "20px",
|
|
|
|
|
- left: "60%",
|
|
|
|
|
- top: "50%",
|
|
|
|
|
- transform: "translate(-50%, -50%) rotate(45deg)",
|
|
|
|
|
- borderTop: "none",
|
|
|
|
|
- borderRight: "none"
|
|
|
|
|
- }}
|
|
|
|
|
- ></span>
|
|
|
|
|
- </div>
|
|
|
|
|
- <div
|
|
|
|
|
- onClick={this.rotate}
|
|
|
|
|
- style={{
|
|
|
|
|
- textAlign: "center",
|
|
|
|
|
- lineHeight: "30px",
|
|
|
|
|
- color: "#000",
|
|
|
|
|
- cursor: "pointer",
|
|
|
|
|
- transition: "all .5s",
|
|
|
|
|
- width: "50px",
|
|
|
|
|
- height: "30px",
|
|
|
|
|
- backgroundColor: "white",
|
|
|
|
|
- position: "absolute",
|
|
|
|
|
- bottom: "-30",
|
|
|
|
|
- left: "50%",
|
|
|
|
|
- transform: "translateX(-50%)",
|
|
|
|
|
- zIndex: 1,
|
|
|
|
|
- borderRadius: "5px",
|
|
|
|
|
- border: "1px solid #ccc"
|
|
|
|
|
- }}
|
|
|
|
|
- >
|
|
|
|
|
- 旋转
|
|
|
|
|
- </div>
|
|
|
|
|
- <div
|
|
|
|
|
- onClick={this.downImg}
|
|
|
|
|
- className="up-btn"
|
|
|
|
|
- style={{
|
|
|
|
|
- cursor: "pointer",
|
|
|
|
|
- transition: "all .5s",
|
|
|
|
|
- opacity: ".2",
|
|
|
|
|
- width: "41px",
|
|
|
|
|
- height: "69px",
|
|
|
|
|
- backgroundColor: "rgba(0,0,0,.5)",
|
|
|
|
|
- position: "absolute",
|
|
|
|
|
- top: "50%",
|
|
|
|
|
- right: 16,
|
|
|
|
|
- transform: "translateY(-50%)",
|
|
|
|
|
- zIndex: 1
|
|
|
|
|
- }}
|
|
|
|
|
- >
|
|
|
|
|
- <span
|
|
|
|
|
- style={{
|
|
|
|
|
- position: "absolute",
|
|
|
|
|
- border: "1px solid #fff",
|
|
|
|
|
- width: "20px",
|
|
|
|
|
- height: "20px",
|
|
|
|
|
- left: "40%",
|
|
|
|
|
- top: "50%",
|
|
|
|
|
- transform: "translate(-50%, -50%) rotate(225deg)",
|
|
|
|
|
- borderTop: "none",
|
|
|
|
|
- borderRight: "none"
|
|
|
|
|
- }}
|
|
|
|
|
- ></span>
|
|
|
|
|
- </div> */}
|
|
|
|
|
<img
|
|
<img
|
|
|
alt=""
|
|
alt=""
|
|
|
style={{
|
|
style={{
|
|
@@ -1194,48 +998,6 @@ const OrderDetail = Form.create()(
|
|
|
<FormItem
|
|
<FormItem
|
|
|
className="half-item"
|
|
className="half-item"
|
|
|
{...formItemLayout}
|
|
{...formItemLayout}
|
|
|
- label="合同编号"
|
|
|
|
|
- >
|
|
|
|
|
- <span>{theData.contractNo}</span>
|
|
|
|
|
- </FormItem>
|
|
|
|
|
- <FormItem
|
|
|
|
|
- className="half-item"
|
|
|
|
|
- {...formItemLayout}
|
|
|
|
|
- label="订单部门"
|
|
|
|
|
- >
|
|
|
|
|
- <span>{theData.depName}</span>
|
|
|
|
|
- </FormItem>
|
|
|
|
|
- </div>
|
|
|
|
|
- <div className="clearfix">
|
|
|
|
|
- <FormItem
|
|
|
|
|
- labelCol={{ span: 5 }}
|
|
|
|
|
- wrapperCol={{ span: 18 }}
|
|
|
|
|
- label="订单留言"
|
|
|
|
|
- >
|
|
|
|
|
- <p style={{ maxWidth: 500, wordWrap: "break-word" }}>
|
|
|
|
|
- {this.state.orderRemarks}
|
|
|
|
|
- </p>
|
|
|
|
|
- </FormItem>
|
|
|
|
|
- </div>
|
|
|
|
|
- {/* <div className="clearfix">
|
|
|
|
|
- <FormItem
|
|
|
|
|
- labelCol={{ span: 5 }}
|
|
|
|
|
- wrapperCol={{ span: 18 }}
|
|
|
|
|
- label="收款节点"
|
|
|
|
|
- >
|
|
|
|
|
- {jsDate.map(item => {
|
|
|
|
|
- return (
|
|
|
|
|
- <p>
|
|
|
|
|
- {getjiedian(item.dunSubject)} -- {item.money} 万元
|
|
|
|
|
- </p>
|
|
|
|
|
- );
|
|
|
|
|
- })}
|
|
|
|
|
- </FormItem>
|
|
|
|
|
- </div> */}
|
|
|
|
|
- <div className="clearfix">
|
|
|
|
|
- <FormItem
|
|
|
|
|
- className="half-item"
|
|
|
|
|
- {...formItemLayout}
|
|
|
|
|
label="订单负责人"
|
|
label="订单负责人"
|
|
|
>
|
|
>
|
|
|
<span>{theData.salesmanName}</span>
|
|
<span>{theData.salesmanName}</span>
|
|
@@ -1294,25 +1056,6 @@ const OrderDetail = Form.create()(
|
|
|
<span>{theData.financeMobile}</span>
|
|
<span>{theData.financeMobile}</span>
|
|
|
</FormItem>
|
|
</FormItem>
|
|
|
</div>
|
|
</div>
|
|
|
- {/* <Modal
|
|
|
|
|
- visible={this.state.avisible}
|
|
|
|
|
- className="admin-desc-content"
|
|
|
|
|
- width="800px"
|
|
|
|
|
- maskClosable={false}
|
|
|
|
|
- title="订单日志"
|
|
|
|
|
- footer={null}
|
|
|
|
|
- onCancel={this.closeOrderLog}
|
|
|
|
|
- >
|
|
|
|
|
- <div className="patent-table">
|
|
|
|
|
- <Spin spinning={this.state.loading}>
|
|
|
|
|
- <Table
|
|
|
|
|
- columns={this.state.columnsX}
|
|
|
|
|
- dataSource={this.state.dataSourceX}
|
|
|
|
|
- pagination={false}
|
|
|
|
|
- />
|
|
|
|
|
- </Spin>
|
|
|
|
|
- </div>
|
|
|
|
|
- </Modal> */}
|
|
|
|
|
<OrderRiZi
|
|
<OrderRiZi
|
|
|
dataSourcerizhi={this.state.dataSourceX}
|
|
dataSourcerizhi={this.state.dataSourceX}
|
|
|
closeOrderLog={this.closeOrderLog}
|
|
closeOrderLog={this.closeOrderLog}
|