|
@@ -84,7 +84,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
method: "get",
|
|
|
dataType: "json",
|
|
|
crossDomain: false,
|
|
|
- url: globalConfig.context +"/open/api/admin/newOrder/orderNewList",
|
|
|
+ url: globalConfig.context +"/api/admin/newOrder/orderNewList",
|
|
|
data: {
|
|
|
pageNo: pageNo || 1,
|
|
|
pageSize: this.state.pagination.pageSize,
|
|
@@ -163,51 +163,33 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
},
|
|
|
columns: [
|
|
|
{
|
|
|
+ title: '驳回编号',
|
|
|
+ dataIndex: 'backId',
|
|
|
+ key: 'backId'
|
|
|
+ },{
|
|
|
+ title: '驳回日期',
|
|
|
+ dataIndex: 'backDate',
|
|
|
+ key: 'backDate'
|
|
|
+ },
|
|
|
+ {
|
|
|
title: '订单编号',
|
|
|
dataIndex: 'orderNo',
|
|
|
key: 'orderNo'
|
|
|
}, {
|
|
|
- title: '下单时间',
|
|
|
- dataIndex: 'createDate',
|
|
|
- key: 'createTime'
|
|
|
- },{
|
|
|
- title: '合同签订时间',
|
|
|
- dataIndex: 'signDate',
|
|
|
- key: 'signDate'
|
|
|
- },{
|
|
|
title: '客户名称',
|
|
|
dataIndex: 'userName',
|
|
|
key: 'userName',
|
|
|
render:(text)=>{
|
|
|
return (text&&text.length>9?text.substr(0,9)+'...':text)
|
|
|
}
|
|
|
- }, {
|
|
|
- title: '流程状态',
|
|
|
- dataIndex: 'processStatus',
|
|
|
- key: 'processStatus',
|
|
|
- render:text=>{return getProcessStatus(text)}
|
|
|
- }, {
|
|
|
- title: '签单金额(万元)',
|
|
|
- dataIndex: 'totalAmount',
|
|
|
- key: 'totalAmount'
|
|
|
- },{
|
|
|
- title: '结算状态',
|
|
|
- dataIndex: 'liquidationStatus',
|
|
|
- key: 'liquidationStatus',
|
|
|
- render:text=>{return getLiquidationStatus(text)}
|
|
|
- }, {
|
|
|
- title: '是否特批',
|
|
|
- dataIndex: 'approval',
|
|
|
- key: 'approval',
|
|
|
- render:text=>{return getApprovedState(text)}
|
|
|
- },{
|
|
|
- title: '订单负责人',
|
|
|
- dataIndex: 'salesmanName',
|
|
|
- key: 'salesmanName'
|
|
|
+ }, {
|
|
|
+ title: '驳回人',
|
|
|
+ dataIndex: 'initiateName',
|
|
|
+ key: 'initiateName'
|
|
|
},{
|
|
|
- title: '财务负责人',
|
|
|
- dataIndex: 'financeName',
|
|
|
- key: 'financeName'
|
|
|
+ title: '驳回原因',
|
|
|
+ dataIndex: 'reason',
|
|
|
+ key: 'reason'
|
|
|
}
|
|
|
],
|
|
|
data: [],
|
|
@@ -290,7 +272,6 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
},
|
|
|
//点击打卡项目详情
|
|
|
tableRowClickX(record, index) {
|
|
|
- console.log(record);
|
|
|
this.setState({
|
|
|
jid:record.id,//项目ID
|
|
|
kid:record.commodityId,//商品ID
|
|
@@ -315,7 +296,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
method: "get",
|
|
|
dataType: "json",
|
|
|
crossDomain: false,
|
|
|
- url: globalConfig.context +"/open/api/admin/newOrder/getOrderNewDetail",
|
|
|
+ url: globalConfig.context +"/api/admin/newOrder/getOrderNewDetail",
|
|
|
data: {
|
|
|
orderNo:orderNos
|
|
|
},
|
|
@@ -341,7 +322,6 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
legalPersonTel:thisdata.legalPersonTel,//法人电话
|
|
|
firstAmount:thisdata.firstAmount,//签单金额
|
|
|
totalAmount:thisdata.totalAmount,//首付金额
|
|
|
- approval:thisdata.approval,//特批状态
|
|
|
settlementAmount:thisdata.settlementAmount,//已收款项
|
|
|
orderRemarks:thisdata.orderRemarks,//订单留言
|
|
|
orgCodeUrl: thisdata.contractPictureUrl ? splitUrl(thisdata.contractPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],//图片地址
|
|
@@ -349,6 +329,8 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
salesmanMobile:thisdata.salesmanMobile,//营销员电话
|
|
|
financeName:thisdata.financeName,//财务名称
|
|
|
financeMobile:thisdata.financeMobile,//财务电话
|
|
|
+ approval:thisdata.approval.toString(),//特批状态
|
|
|
+ //approval:thisdata.approval==0?thisdata.approval.toString():thisdata.approval,//特批状态
|
|
|
})
|
|
|
};
|
|
|
|
|
@@ -365,7 +347,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
method: "get",
|
|
|
dataType: "json",
|
|
|
crossDomain: false,
|
|
|
- url: globalConfig.context +"/open/api/admin/newOrder/getOrderTask",
|
|
|
+ url: globalConfig.context +"/api/admin/newOrder/getOrderTask",
|
|
|
data: {
|
|
|
orderNo:orderNos
|
|
|
},
|
|
@@ -412,7 +394,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
method: "get",
|
|
|
dataType: "json",
|
|
|
crossDomain: false,
|
|
|
- url: globalConfig.context +"/open/api/admin/newOrder/selectOrderDun",
|
|
|
+ url: globalConfig.context +"/api/admin/newOrder/selectOrderDun",
|
|
|
data: {
|
|
|
orderNo:orderNos
|
|
|
},
|
|
@@ -448,14 +430,50 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
},
|
|
|
//审核通过
|
|
|
examOk(){
|
|
|
+ if(!this.state.contacts){
|
|
|
+ message.warning('企业负责人不能为空');
|
|
|
+ this.refs.signFirstPayment.focus()
|
|
|
+ return false;
|
|
|
+ };
|
|
|
+ if(!this.state.contactMobile){
|
|
|
+ message.warning('企业负责人电话不能为空');
|
|
|
+ this.refs.signFirstPayment.focus()
|
|
|
+ return false;
|
|
|
+ };
|
|
|
+ if(!this.state.totalAmount){
|
|
|
+ message.warning('签单金额不能为空');
|
|
|
+ this.refs.signFirstPayment.focus()
|
|
|
+ return false;
|
|
|
+ };
|
|
|
+ if(!this.state.firstAmount){
|
|
|
+ message.warning('首付金额不能为空');
|
|
|
+ this.refs.signFirstPayment.focus()
|
|
|
+ return false;
|
|
|
+ };
|
|
|
+ if(!theorgCodeUrl){
|
|
|
+ message.warning('企业负责人不能为空');
|
|
|
+ this.refs.signFirstPayment.focus()
|
|
|
+ return false;
|
|
|
+ };
|
|
|
$.ajax({
|
|
|
method: "post",
|
|
|
dataType: "json",
|
|
|
crossDomain: false,
|
|
|
- url: globalConfig.context +"/open/api/admin/newOrder/auditOrderNew",
|
|
|
+ url: globalConfig.context +"/api/admin/newOrder/updateServiceOrderNew",
|
|
|
data: {
|
|
|
- orderNo:this.state.orderNo,
|
|
|
- orderStatus:2,
|
|
|
+ orderNo: this.state.orderNo,//订单编号
|
|
|
+ totalAmount: this.state.totalAmount,//总金额
|
|
|
+ firstAmount: this.state.firstAmount,//首付
|
|
|
+ isSubmit: this.state.isSubmit,//保存草稿还是提交
|
|
|
+ signDate: this.state.signDate,//签单日期
|
|
|
+ contacts: this.state.contacts,//企业负责人
|
|
|
+ contactMobile: this.state.contactMobile,//负责人联系方式
|
|
|
+ legalPerson: this.state.legalPerson,//企业法人
|
|
|
+ legalPersonTel: this.state.legalPersonTel,//企业法人联系电话
|
|
|
+ approval: this.state.approval,//特批状态
|
|
|
+ contractNo: this.state.contractNo,//合同编号
|
|
|
+ orderRemarks: this.state.orderRemarks,//订单备注
|
|
|
+ contractPictureUrl:theorgCodeUrl.length?theorgCodeUrl:'',
|
|
|
},
|
|
|
success: function(data) {
|
|
|
if(data.error.length || data.data.list == "") {
|
|
@@ -463,7 +481,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
message.warning(data.error[0].message);
|
|
|
};
|
|
|
} else {
|
|
|
- message.success("该订单已通过审核~");
|
|
|
+ message.success("该订单已重新提交~");
|
|
|
this.setState({
|
|
|
visible:false,
|
|
|
});
|
|
@@ -479,36 +497,12 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
},
|
|
|
//审核通过
|
|
|
examOks(){
|
|
|
- if(!this.state.contacts){
|
|
|
- message.warning('企业负责人不能为空');
|
|
|
- this.refs.signFirstPayment.focus()
|
|
|
- return false;
|
|
|
- };
|
|
|
- if(!this.state.contactMobile){
|
|
|
- message.warning('企业负责人电话不能为空');
|
|
|
- this.refs.signFirstPayment.focus()
|
|
|
- return false;
|
|
|
- };
|
|
|
- if(!this.state.totalAmount){
|
|
|
- message.warning('签单金额不能为空');
|
|
|
- this.refs.signFirstPayment.focus()
|
|
|
- return false;
|
|
|
- };
|
|
|
- if(!this.state.firstAmount){
|
|
|
- message.warning('首付金额不能为空');
|
|
|
- this.refs.signFirstPayment.focus()
|
|
|
- return false;
|
|
|
- };
|
|
|
- if(!theorgCodeUrl){
|
|
|
- message.warning('企业负责人不能为空');
|
|
|
- this.refs.signFirstPayment.focus()
|
|
|
- return false;
|
|
|
- };
|
|
|
+
|
|
|
$.ajax({
|
|
|
method: "post",
|
|
|
dataType: "json",
|
|
|
crossDomain: false,
|
|
|
- url: globalConfig.context +"/open/api/admin/newOrder/updateServiceOrderNew",
|
|
|
+ url: globalConfig.context +"/api/admin/newOrder/updateServiceOrderNew",
|
|
|
data: {
|
|
|
orderNo: this.state.orderNo,//订单编号
|
|
|
totalAmount: this.state.totalAmount,//总金额
|
|
@@ -788,7 +782,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
</div>
|
|
|
<div>
|
|
|
<span style={{marginLeft:'50px',fontSize:'20px'}}>催款节点</span>
|
|
|
- {this.state.processStatus==0?<Button type='primary' onClick={this.addcontact} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加催款节点</Button>:""}
|
|
|
+ <Button type='primary' onClick={this.addcontact} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加催款节点</Button>
|
|
|
</div>
|
|
|
<div className="clearfix">
|
|
|
<Spin spinning={this.state.loading}>
|
|
@@ -806,7 +800,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
</div>
|
|
|
<div>
|
|
|
<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>
|
|
|
- {this.state.processStatus==0?<Button type='primary' onClick={this.addDetailed} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加项目明细</Button>:""}
|
|
|
+ <Button type='primary' onClick={this.addDetailed} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加项目明细</Button>
|
|
|
</div>
|
|
|
<div className="patent-table">
|
|
|
<Spin spinning={this.state.loading}>
|