|
@@ -4,6 +4,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
|
|
|
import $ from 'jquery/src/ajax';
|
|
|
import '../../userMangagement.less';
|
|
|
import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionChannel ,getTransactionProject } from '../../../../tools.js';
|
|
|
+import OrderItemStatus from "../../../../common/orderItemStatus";
|
|
|
|
|
|
//图片组件
|
|
|
const PicturesWall = React.createClass({
|
|
@@ -29,7 +30,7 @@ const PicturesWall = React.createClass({
|
|
|
this.props.fileList(fileList);
|
|
|
},
|
|
|
componentWillReceiveProps(nextProps) {
|
|
|
- this.state.fileList = nextProps.pictureUrl;
|
|
|
+ this.state.fileList = nextProps.pictureUrl;
|
|
|
},
|
|
|
render() {
|
|
|
const { previewVisible, previewImage, fileList } = this.state;
|
|
@@ -219,7 +220,7 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
|
|
|
orderNo: record.orderNo
|
|
|
},
|
|
|
success: function (data) {
|
|
|
- let thisData = data.data;
|
|
|
+ let thisData = data.data;
|
|
|
if (!thisData) {
|
|
|
if (data.error && data.error.length) {
|
|
|
message.warning(data.error[0].message);
|
|
@@ -242,10 +243,10 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
|
|
|
});
|
|
|
}.bind(this),
|
|
|
}).always(function () {
|
|
|
- this.setState({
|
|
|
+ this.setState({
|
|
|
loading: false
|
|
|
});
|
|
|
- }.bind(this));
|
|
|
+ }.bind(this));
|
|
|
}
|
|
|
},
|
|
|
handleOk(e) {
|
|
@@ -265,6 +266,34 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
|
|
|
addnextVisible: false
|
|
|
})
|
|
|
},
|
|
|
+ //订单详情
|
|
|
+ xiangqings(record) {
|
|
|
+ $.ajax({
|
|
|
+ method: "get",
|
|
|
+ dataType: "json",
|
|
|
+ crossDomain: false,
|
|
|
+ url: globalConfig.context + "/api/admin/newOrder/getOrderNewDetail",
|
|
|
+ data: {
|
|
|
+ orderNo: record?record.orderNo:this.props.datauser.orderNo,
|
|
|
+ },
|
|
|
+ success: function (data) {
|
|
|
+ let thisdata = data.data;
|
|
|
+ if (data.error.length || data.data.list == "") {
|
|
|
+ if (data.error && data.error.length) {
|
|
|
+ message.warning(data.error[0].message);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ this.setState({
|
|
|
+ deleteSign:thisdata.deleteSign,
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }.bind(this),
|
|
|
+ }).always(
|
|
|
+ function () {
|
|
|
+
|
|
|
+ }.bind(this)
|
|
|
+ );
|
|
|
+ },
|
|
|
lookflow(){
|
|
|
this.setState({
|
|
|
loading: true,
|
|
@@ -292,7 +321,7 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
|
|
|
key: i,
|
|
|
billNo: thisdata.billNo,
|
|
|
transactionAmount:thisdata.transactionAmount,
|
|
|
- createTime:thisdata.createTime,
|
|
|
+ createTime:thisdata.createTime,
|
|
|
transactionAmount:thisdata.transactionAmount,
|
|
|
payerName:thisdata.payerName,
|
|
|
payeeName:thisdata.payeeName,
|
|
@@ -332,13 +361,14 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
|
|
|
});
|
|
|
},
|
|
|
componentWillMount() {
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
componentWillReceiveProps(nextProps) { //props改变时触发
|
|
|
this.state.visible = nextProps.showDesc;
|
|
|
if(nextProps.userDetaile && nextProps.showDesc ) {
|
|
|
this.loaduser(nextProps.datauser);
|
|
|
this.loadData(nextProps.datauser);
|
|
|
+ this.xiangqings(nextProps.datauser)
|
|
|
}
|
|
|
},
|
|
|
render() {
|
|
@@ -354,13 +384,16 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
|
|
|
<Modal maskClosable={false} visible={this.state.visible}
|
|
|
onOk={this.handleOk} onCancel={this.handleCancel}
|
|
|
width='1000px'
|
|
|
- title='订单详情'
|
|
|
+ title='订单详情'
|
|
|
footer=''
|
|
|
className="admin-desc-content">
|
|
|
<Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} >
|
|
|
<Spin spinning={this.state.loading}>
|
|
|
<div className="clearfix">
|
|
|
<div className="clearfix">
|
|
|
+ <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
|
|
|
+ <OrderItemStatus deleteSign={this.state.deleteSign}/>
|
|
|
+ </div>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
label="订单编号" >
|
|
@@ -368,68 +401,68 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="下单时间" >
|
|
|
+ label="下单时间" >
|
|
|
<span>{orderDetaiel.createTime}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="客户名称" >
|
|
|
+ label="客户名称" >
|
|
|
<span>{orderDetaiel.buyerName}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="订单类型" >
|
|
|
+ label="订单类型" >
|
|
|
<span>{getOrderType(orderDetaiel.orderType)}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="订单渠道" >
|
|
|
+ label="订单渠道" >
|
|
|
<span>{getOrderChannel(orderDetaiel.orderChannel)}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="订单状态" >
|
|
|
+ label="订单状态" >
|
|
|
<span>{getOrderState(orderDetaiel.orderStatus)}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="已收款项" >
|
|
|
+ label="已收款项" >
|
|
|
<span>{orderDetaiel.actuallyTotalAmount+'万元'}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="结算状态" >
|
|
|
+ label="结算状态" >
|
|
|
<span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="市价订单金额" >
|
|
|
+ label="市价订单金额" >
|
|
|
<span>{orderDetaiel.orderAmount+'万元'}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="市价首款金额" >
|
|
|
+ label="市价首款金额" >
|
|
|
<span>{orderDetaiel.firstPayment+'万元'}</span>
|
|
|
</FormItem>
|
|
|
<div className='clearfix'>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="实签订单金额" >
|
|
|
+ label="实签订单金额" >
|
|
|
<span>{orderDetaiel.signTotalAmount+'万元'}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="实签首款金额" >
|
|
|
+ label="实签首款金额" >
|
|
|
<span>{orderDetaiel.signFirstPayment+'万元'}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="特批立项" >
|
|
|
+ label="特批立项" >
|
|
|
<span>{getApprovedState(orderDetaiel.approval)}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="合同编号" >
|
|
|
+ label="合同编号" >
|
|
|
<span>{orderDetaiel.contractNo}</span>
|
|
|
</FormItem>
|
|
|
<div className='clearfix'>
|
|
@@ -445,45 +478,45 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
|
|
|
<div className='clearfix'>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="订单负责人" >
|
|
|
+ label="订单负责人" >
|
|
|
<span>{orderDetaiel.salesmanName}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="业务品类" >
|
|
|
+ label="业务品类" >
|
|
|
<span>{orderDetaiel.projectType}</span>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
<div className='clearfix'>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="意向时间" >
|
|
|
+ label="意向时间" >
|
|
|
<span>{orderDetaiel.createTime}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="签单时间" >
|
|
|
+ label="签单时间" >
|
|
|
<span>{orderDetaiel.signTime}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="财务负责人" >
|
|
|
+ label="财务负责人" >
|
|
|
<span>{orderDetaiel.financeName}</span>
|
|
|
<Button onClick={this.lookflow} style={{float:'right'}}>查看流水</Button>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="项目负责人" >
|
|
|
+ label="项目负责人" >
|
|
|
<span>{orderDetaiel.technicianName}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="立项时间" >
|
|
|
+ label="立项时间" >
|
|
|
<span>{orderDetaiel.setUpTime}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="项目状态" >
|
|
|
+ label="项目状态" >
|
|
|
<span>{getProjectState(orderDetaiel.projectStage)}</span>
|
|
|
</FormItem>
|
|
|
</div>
|
|
@@ -495,18 +528,18 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
|
|
|
<Table size="middle" columns={this.state.columns}
|
|
|
dataSource={this.state.dataSource}
|
|
|
pagination={false}
|
|
|
- onRowClick={this.tableRowClick}
|
|
|
+ onRowClick={this.tableRowClick}
|
|
|
/>
|
|
|
</Spin>
|
|
|
</div>
|
|
|
</div>
|
|
|
</Spin>
|
|
|
</Form >
|
|
|
- </Modal>
|
|
|
+ </Modal>
|
|
|
<Modal maskClosable={false} visible={this.state.addnextVisible}
|
|
|
onOk={this.nextCancel} onCancel={this.nextCancel}
|
|
|
width='550px'
|
|
|
- title='查看项目详细'
|
|
|
+ title='查看项目详细'
|
|
|
footer=''
|
|
|
className="admin-desc-content">
|
|
|
<Form layout="horizontal" id="demand-form">
|
|
@@ -534,16 +567,16 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="市场首付金额" >
|
|
|
- <span>{editFws.commodityFirstPayment+'万元'}</span>
|
|
|
+ label="市场首付金额" >
|
|
|
+ <span>{editFws.commodityFirstPayment+'万元'}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
- label="签单首付金额" >
|
|
|
- <span>{editFws.discountFirstPayment+'万元'}</span>
|
|
|
+ label="签单首付金额" >
|
|
|
+ <span>{editFws.discountFirstPayment+'万元'}</span>
|
|
|
</FormItem>
|
|
|
<div className='clearfix'>
|
|
|
- <FormItem
|
|
|
+ <FormItem
|
|
|
labelCol={{ span: 4 }}
|
|
|
wrapperCol={{ span: 16 }}
|
|
|
label="项目说明" >
|
|
@@ -557,7 +590,7 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
|
|
|
<Modal maskClosable={false} visible={this.state.lookVisible}
|
|
|
onOk={this.lookCancel} onCancel={this.lookCancel}
|
|
|
width='1300px'
|
|
|
- title= '查看流水'
|
|
|
+ title= '查看流水'
|
|
|
footer=''
|
|
|
className="admin-desc-content">
|
|
|
<Form layout="horizontal" id="demand-form">
|
|
@@ -576,4 +609,4 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
|
|
|
}
|
|
|
}));
|
|
|
|
|
|
-export default ApproveOrderDetaile;
|
|
|
+export default ApproveOrderDetaile;
|