|
@@ -10,7 +10,7 @@ import {
|
|
|
Form,
|
|
|
Table
|
|
|
} from 'antd';
|
|
|
-import {getOrderType,splitUrl,getNewOrderType,getProcessStatus,getApproval,getLiquidationStatus} from '@/tools';
|
|
|
+import {getOrderType,splitUrl,getNewOrderType,getProcessStatus,getApproval,getLiquidationStatus,getProjectStatus} from '@/tools';
|
|
|
|
|
|
const FormItem = Form.Item;
|
|
|
|
|
@@ -24,7 +24,7 @@ const OrderDetail = Form.create()(React.createClass({
|
|
|
method: "get",
|
|
|
dataType: "json",
|
|
|
crossDomain: false,
|
|
|
- url: globalConfig.context + '/api/admin/order/getOrderCommodity',
|
|
|
+ url: globalConfig.context + '/open/api/admin/newOrder/getOrderTask',
|
|
|
data: {
|
|
|
orderNo:record?record.orderNo:this.props.data.orderNo
|
|
|
},
|
|
@@ -42,16 +42,14 @@ const OrderDetail = Form.create()(React.createClass({
|
|
|
id:thisdata.id,
|
|
|
orderNo:thisdata.orderNo,
|
|
|
commodityName:thisdata.commodityName,
|
|
|
- commodityType:thisdata.commodityType,
|
|
|
- commodityMode:thisdata.commodityMode,
|
|
|
- commodityQuantity:thisdata.commodityQuantity,
|
|
|
commodityPrice:thisdata.commodityPrice,
|
|
|
- discountPrice:thisdata.discountPrice,
|
|
|
- commodityFirstPayment:thisdata.commodityFirstPayment,
|
|
|
- createTimes:thisdata.createTimes,
|
|
|
- discountFirstPayment:thisdata.discountFirstPayment,
|
|
|
- remarks:thisdata.remarks,
|
|
|
- commodityId:thisdata.commodityId,
|
|
|
+ commodityQuantity:thisdata.commodityQuantity,
|
|
|
+ taskStatus:thisdata.taskStatus,
|
|
|
+ taskComment:thisdata.taskComment,
|
|
|
+ main:thisdata.main,
|
|
|
+ contacts:thisdata.contacts,
|
|
|
+ contactsMobile:thisdata.contactsMobile,
|
|
|
+ cname:thisdata.cname,
|
|
|
});
|
|
|
};
|
|
|
}
|
|
@@ -70,6 +68,7 @@ const OrderDetail = Form.create()(React.createClass({
|
|
|
return {
|
|
|
visible: false,
|
|
|
loading: false,
|
|
|
+ jsDate:[],
|
|
|
auditStatus: 0,
|
|
|
textFileList: [],
|
|
|
videoFileList: [],
|
|
@@ -79,37 +78,48 @@ const OrderDetail = Form.create()(React.createClass({
|
|
|
{
|
|
|
title: '业务项目名称',
|
|
|
dataIndex: 'commodityName',
|
|
|
- key: 'commodityName'
|
|
|
+ key: 'commodityName',
|
|
|
+ render:text=>{
|
|
|
+ return text&&text.length>6?<span title={text}>{text.substr(0,8)}...</span>:text
|
|
|
+ }
|
|
|
}, {
|
|
|
title: '项目类别',
|
|
|
- dataIndex: 'commodityType',
|
|
|
- key: 'commodityType',
|
|
|
- render:(text)=>{
|
|
|
- return (getOrderType(text))
|
|
|
- }
|
|
|
- },{
|
|
|
- title: '项目数量',
|
|
|
- dataIndex: 'commodityQuantity',
|
|
|
- key: 'commodityQuantity'
|
|
|
+ dataIndex: 'cname',
|
|
|
+ key: 'cname'
|
|
|
}, {
|
|
|
title: '服务市价(万元)',
|
|
|
dataIndex: 'commodityPrice',
|
|
|
key: 'commodityPrice'
|
|
|
}, {
|
|
|
- title: '实签价格(万元)',
|
|
|
- dataIndex: 'discountPrice',
|
|
|
- key: 'discountPrice'
|
|
|
- }, {
|
|
|
- title: '下单时间',
|
|
|
- dataIndex: 'createTimes',
|
|
|
- key: 'createTimes'
|
|
|
+ title: '项目状态',
|
|
|
+ dataIndex: 'taskStatus',
|
|
|
+ key: 'taskStatus',
|
|
|
+ render:text=>{
|
|
|
+ return getProjectStatus(text);
|
|
|
+ }
|
|
|
+ },{
|
|
|
+ title: '项目负责人',
|
|
|
+ dataIndex: 'contacts',
|
|
|
+ key: 'contacts'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '联系方式',
|
|
|
+ dataIndex: 'contactsMobile',
|
|
|
+ key: 'contactsMobile'
|
|
|
}, {
|
|
|
+ title: '是否主要联系人',
|
|
|
+ dataIndex: 'main',
|
|
|
+ key: 'main',
|
|
|
+ render:text=>{
|
|
|
+ return text?'是':'否'
|
|
|
+ }
|
|
|
+ },{
|
|
|
title: '项目说明',
|
|
|
- dataIndex: 'remarks',
|
|
|
- key: 'remarks',
|
|
|
- render:(text)=>{
|
|
|
- return (text&&text.length>8?text.substr(0,8)+'…':text)
|
|
|
- }
|
|
|
+ dataIndex: 'taskComment',
|
|
|
+ key: 'taskComment',
|
|
|
+ render:text=>{
|
|
|
+ return text&&text.length>8?<span title={text}>{text.substr(0,8)}...</span>:text
|
|
|
+ }
|
|
|
}
|
|
|
],
|
|
|
};
|
|
@@ -120,7 +130,7 @@ const OrderDetail = Form.create()(React.createClass({
|
|
|
method: "get",
|
|
|
dataType: "json",
|
|
|
crossDomain: false,
|
|
|
- url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
|
|
|
+ url: globalConfig.context + '/open/api/admin/newOrder/getOrderNewDetail',
|
|
|
data: {
|
|
|
orderNo:record?record.orderNo:this.props.data.orderNo
|
|
|
},
|
|
@@ -148,66 +158,43 @@ const OrderDetail = Form.create()(React.createClass({
|
|
|
});
|
|
|
}.bind(this));
|
|
|
},
|
|
|
- getPictureUrl(e) {
|
|
|
- this.setState({ pictureUrl: e });
|
|
|
- },
|
|
|
- cancelFun(){
|
|
|
- this.props.closeDesc();
|
|
|
- },
|
|
|
- //审核通过/拒绝
|
|
|
- updateFun(index){
|
|
|
- this.setState({
|
|
|
- loading:true
|
|
|
- })
|
|
|
- $.ajax({
|
|
|
- method: "post",
|
|
|
- dataType: "JSON",
|
|
|
- crossDomain: false,
|
|
|
- url: globalConfig.context + '/api/admin/achievement/audit',
|
|
|
+ jdDate(record){
|
|
|
+ $.ajax({
|
|
|
+ method: "get",
|
|
|
+ dataType: "json",
|
|
|
+ crossDomain: false,
|
|
|
+ url: globalConfig.context + '/open/api/admin/newOrder/selectOrderDun',
|
|
|
data: {
|
|
|
- id: this.state.id,
|
|
|
- auditResult:index,
|
|
|
- auditInfo:this.state.refuseValue
|
|
|
- }
|
|
|
- }).done(function (data) {
|
|
|
- if (!data.error.length) {
|
|
|
- message.success('操作成功!');
|
|
|
- this.setState({
|
|
|
- loading: false,
|
|
|
- });
|
|
|
- this.props.handOk()
|
|
|
- } else {
|
|
|
- message.warning(data.error[0].message);
|
|
|
- };
|
|
|
- }.bind(this));
|
|
|
- },
|
|
|
- //审核拒绝
|
|
|
- refuse(){
|
|
|
- this.setState({
|
|
|
- refuseValue:'',
|
|
|
- refuseVisible:true
|
|
|
- })
|
|
|
- },
|
|
|
- refuseOk(){
|
|
|
- if(!this.state.refuseValue){
|
|
|
- message.warning('请填写拒绝原因。')
|
|
|
- return;
|
|
|
- }
|
|
|
- this.setState({
|
|
|
- refuseVisible:false
|
|
|
- })
|
|
|
- this.updateFun(0)
|
|
|
+ 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));
|
|
|
},
|
|
|
- refuseCancel(){
|
|
|
- this.setState({
|
|
|
- refuseValue:'',
|
|
|
- refuseVisible:false
|
|
|
- })
|
|
|
+ getPictureUrl(e) {
|
|
|
+ this.setState({ pictureUrl: e });
|
|
|
},
|
|
|
componentWillMount() {
|
|
|
if (this.props.data.orderNo) {
|
|
|
- this.loadData(this.props.data.id);
|
|
|
- this.loadXmu(this.props.data.data);
|
|
|
+ this.loadData();
|
|
|
+ this.loadXmu();
|
|
|
+ this.jdDate();
|
|
|
} else {
|
|
|
this.state.data = {};
|
|
|
};
|
|
@@ -217,8 +204,9 @@ const OrderDetail = Form.create()(React.createClass({
|
|
|
this.state.textFileList = [];
|
|
|
this.state.videoFileList = [];
|
|
|
if (nextProps.data.orderNo) {
|
|
|
- this.loadData(nextProps.data.id);
|
|
|
+ this.loadData(nextProps.data);
|
|
|
this.loadXmu(nextProps.data);
|
|
|
+ this.jdDate(nextProps.data);
|
|
|
} else {
|
|
|
this.state.data = {};
|
|
|
this.state.pictureUrl = [];
|
|
@@ -229,12 +217,12 @@ const OrderDetail = Form.create()(React.createClass({
|
|
|
},
|
|
|
render() {
|
|
|
const theData = this.state.orderList || {};
|
|
|
- const { getFieldDecorator } = this.props.form;
|
|
|
const FormItem = Form.Item
|
|
|
const formItemLayout = {
|
|
|
labelCol: { span: 6 },
|
|
|
wrapperCol: { span: 12 },
|
|
|
};
|
|
|
+ const jsDate = this.state.jsDate || [];
|
|
|
return (
|
|
|
<div className='login'>
|
|
|
<Form layout="horizontal" id="demand-form">
|
|
@@ -244,10 +232,10 @@ const OrderDetail = Form.create()(React.createClass({
|
|
|
<span>{theData.orderNo}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item" {...formItemLayout} label="签单时间">
|
|
|
- <span>{theData.releaseDate?(new Date(theData.releaseDate)).toLocaleString():''}</span>
|
|
|
+ <span>{theData.signDate}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item" {...formItemLayout} label="客户名称">
|
|
|
- <span>{theData.name}</span>
|
|
|
+ <span>{theData.userName}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item" {...formItemLayout} label="流转状态">
|
|
|
<span>{getProcessStatus(theData.processStatus)}</span>
|
|
@@ -286,7 +274,7 @@ const OrderDetail = Form.create()(React.createClass({
|
|
|
</div>
|
|
|
<div className="clearfix">
|
|
|
<FormItem className="half-item" {...formItemLayout} label="合同编号">
|
|
|
- <span>{theData.orderNo}</span>
|
|
|
+ <span>{theData.contractNo}</span>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
<div className="clearfix">
|
|
@@ -296,21 +284,25 @@ const OrderDetail = Form.create()(React.createClass({
|
|
|
</div>
|
|
|
<div className="clearfix">
|
|
|
<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="收款节点">
|
|
|
- <span>{theData.introduction}</span>
|
|
|
+ {
|
|
|
+ jsDate.map(item=>{
|
|
|
+ return <p>{item.dunSubject} -- {item.money} 万元</p>
|
|
|
+ })
|
|
|
+ }
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
<div className="clearfix">
|
|
|
<FormItem className="half-item" {...formItemLayout} label="订单负责人">
|
|
|
- <span>{theData.introduction}</span>
|
|
|
+ <span>{theData.salesmanName}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item" {...formItemLayout} label="订单负责人电话">
|
|
|
- <span>{theData.introduction}</span>
|
|
|
+ <span>{theData.salesmanMobile}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item" {...formItemLayout} label="财务负责人">
|
|
|
- <span>{theData.introduction}</span>
|
|
|
+ <span>{theData.financeName}</span>
|
|
|
</FormItem>
|
|
|
<FormItem className="half-item" {...formItemLayout} label="财务负责人电话">
|
|
|
- <span>{theData.introduction}</span>
|
|
|
+ <span>{theData.financeMobile}</span>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
<div className="clearfix">
|