|
@@ -15,21 +15,21 @@ const PaiDan = React.createClass({
|
|
|
page:pageNo,
|
|
|
loading: true
|
|
|
});
|
|
|
- $.ajax({
|
|
|
- method: "get",
|
|
|
- dataType: "json",
|
|
|
- crossDomain: false,
|
|
|
- url: globalConfig.context + "/api/admin/orderProject/orderTaskList",
|
|
|
- data: {
|
|
|
- pageNo: pageNo || 1,
|
|
|
- pageSize: this.state.pagination.pageSize,
|
|
|
- name: this.state.nameSearch,//项目名称
|
|
|
- orderNo:this.state.orderNo,//订单编号
|
|
|
- taskId:this.state.taskId, //任务编号
|
|
|
- taskStatus:this.state.taskStatus, //任务状态
|
|
|
- adminName:this.state.adminName, //任务受理人
|
|
|
- specially:this.state.specially, //个人/经理
|
|
|
- },
|
|
|
+ $.ajax({
|
|
|
+ method: "get",
|
|
|
+ dataType: "json",
|
|
|
+ crossDomain: false,
|
|
|
+ url: globalConfig.context +"/api/admin/newOrder/orderNewList",
|
|
|
+ data: {
|
|
|
+ pageNo: pageNo || 1,
|
|
|
+ pageSize: this.state.pagination.pageSize,
|
|
|
+ specially: 4,//咨询师管理列表
|
|
|
+ distribution:2,//全部列表
|
|
|
+ name: this.state.customerName,//名称
|
|
|
+ orderNo: this.state.orderNo,//订单编号
|
|
|
+ starTime: this.state.releaseDate[0],//开始时间
|
|
|
+ endTime: this.state.releaseDate[1],//结束时间
|
|
|
+ },
|
|
|
success: function (data) {
|
|
|
let theArr = [];
|
|
|
if (!data.data || !data.data.list) {
|
|
@@ -43,14 +43,15 @@ const PaiDan = React.createClass({
|
|
|
key: i,
|
|
|
id:thisdata.id,//任务ID
|
|
|
orderNo: thisdata.orderNo,//订单编号
|
|
|
- taskName:thisdata.taskName,//名称
|
|
|
- cname:thisdata.cname,//项目品类
|
|
|
- receiverName:thisdata.receiverName,//受理人
|
|
|
- projectStatus:thisdata.projectStatus,//项目状态
|
|
|
- taskStatus:thisdata.taskStatus,//任务状态
|
|
|
- taskDate:thisdata.taskDate,//分配时间
|
|
|
- commodityQuantity:thisdata.commodityQuantity,//数量
|
|
|
- userName:thisdata.userName,//用户名
|
|
|
+ totalAmount:thisdata.totalAmount,//签单金额
|
|
|
+ processStatus:thisdata.processStatus,//流程状态
|
|
|
+ liquidationStatus:thisdata.liquidationStatus,//结算状态
|
|
|
+ approval:thisdata.approval,//特批状态
|
|
|
+ signDate:thisdata.signDate,//签单时间
|
|
|
+ userName:thisdata.userName,//客户名称
|
|
|
+ salesmanName:thisdata.salesmanName,//营销员名称
|
|
|
+ financeName:thisdata.financeName,//财务名称
|
|
|
+ createDate:thisdata.createDate,//下单时间
|
|
|
});
|
|
|
};
|
|
|
}
|
|
@@ -97,21 +98,21 @@ const PaiDan = React.createClass({
|
|
|
title: '订单编号',
|
|
|
dataIndex: 'orderNo',
|
|
|
key: 'orderNo',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '签单客户',
|
|
|
+ dataIndex: 'userName',
|
|
|
+ key: 'userName',
|
|
|
}, {
|
|
|
title: '下单时间',
|
|
|
- dataIndex: 'createTime',
|
|
|
- key: 'createTime',
|
|
|
+ dataIndex: 'createDate',
|
|
|
+ key: 'createDate',
|
|
|
}, {
|
|
|
title: '签单时间',
|
|
|
dataIndex: 'signDate',
|
|
|
key: 'signDate',
|
|
|
},
|
|
|
{
|
|
|
- title: '签单客户',
|
|
|
- dataIndex: 'userName',
|
|
|
- key: 'userName',
|
|
|
- },
|
|
|
- {
|
|
|
title: '流程状态',
|
|
|
dataIndex: 'processStatus',
|
|
|
key: 'processStatus',
|
|
@@ -119,8 +120,8 @@ const PaiDan = React.createClass({
|
|
|
},
|
|
|
{
|
|
|
title: '订单总金额(万)',
|
|
|
- dataIndex: 'signTotalAmount',
|
|
|
- key: 'signTotalAmount'
|
|
|
+ dataIndex: 'totalAmount',
|
|
|
+ key: 'totalAmount'
|
|
|
},
|
|
|
{
|
|
|
title: '是否特批',
|
|
@@ -134,6 +135,16 @@ const PaiDan = React.createClass({
|
|
|
key: 'salesmanName'
|
|
|
},
|
|
|
{
|
|
|
+ title: '订单负责人',
|
|
|
+ dataIndex: 'salesmanName',
|
|
|
+ key: 'salesmanName'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '订单负责人',
|
|
|
+ dataIndex: 'salesmanName',
|
|
|
+ key: 'salesmanName'
|
|
|
+ },
|
|
|
+ {
|
|
|
title: '分派状态',
|
|
|
dataIndex: 'sellerName1',
|
|
|
key: 'sellerName1'
|