diff --git a/src/stores/OrdersStore.js b/src/stores/OrdersStore.js index c197cc2..540de93 100644 --- a/src/stores/OrdersStore.js +++ b/src/stores/OrdersStore.js @@ -158,6 +158,9 @@ class OrdersStore { getOrderCountByType_sub(ordertype, ordertype_sub, sub_type) { const date_picker_store = this.rootStore.date_picker_store; let url = "/service-web/QueryData/GetOrderCountByType_Sub"; + if (sub_type=='page_cxstate1'){ //统计成行订单的路径 + sub_type='page&cxstate=1' + } url += `?WebCode=${this.webcode}&OrderType=${ordertype}&OrderType_val=${ordertype_sub}&SubOrderType=${sub_type}` + "&IncludeTickets=" + this.include_tickets; url += "&COLI_ApplyDate1=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&COLI_ApplyDate2=" + date_picker_store.end_date.format(config.DATE_FORMAT) + "%2023:59:59"; if (date_picker_store.start_date_cp && date_picker_store.end_date_cp) { diff --git a/src/stores/SaleStore.js b/src/stores/SaleStore.js index 4530435..7baf810 100644 --- a/src/stores/SaleStore.js +++ b/src/stores/SaleStore.js @@ -210,47 +210,47 @@ class SaleStore { }, { title: "首次回复率", - children: [{ title: "", dataIndex: "firstReplayRate" }], + children: [{ title: "", dataIndex: "firstReplayRate", render: (text, record) => {text} }], sorter: (a, b) => parseInt(b.firstReplayRate) - parseInt(a.firstReplayRate), }, { title: "一次报价率", - children: [{ title: '', dataIndex: "FirstQuotationRate" }], - sorter: (a, b) => b.FirstQuotationRate - a.FirstQuotationRate, + children: [{ title: "", dataIndex: "FirstQuotationRate", render: (text, record) => {text} }], + sorter: (a, b) => parseInt(b.FirstQuotationRate) - parseInt(a.FirstQuotationRate), }, { title: "一次报价回复率", - children: [{ title: '', dataIndex: "FirstQuotationReplayRate" }], - sorter: (a, b) => b.FirstQuotationReplayRate - a.FirstQuotationReplayRate, + children: [{ title: "", dataIndex: "FirstQuotationReplayRate", render: (text, record) => {text} }], + sorter: (a, b) => parseInt(b.FirstQuotationReplayRate) - parseInt(a.FirstQuotationReplayRate), }, { title: "一次报价回复周期", - children: [{ title: '', dataIndex: "FirstQuotationReplaytimeAVG" }], + children: [{ title: "", dataIndex: "FirstQuotationReplaytimeAVG" }], sorter: (a, b) => b.FirstQuotationReplaytimeAVG - a.FirstQuotationReplaytimeAVG, }, { title: "二次报价率", - children: [{ title: '', dataIndex: "SecondQuotationRate" }], - sorter: (a, b) => b.SecondQuotationRate - a.SecondQuotationRate, + children: [{ title: "", dataIndex: "SecondQuotationRate", render: (text, record) => {text} }], + sorter: (a, b) => parseInt(b.SecondQuotationRate) - parseInt(a.SecondQuotationRate), }, { title: "二次报价回复率", - children: [{ title: '', dataIndex: "SecondQuotationReplayRate" }], - sorter: (a, b) => b.SecondQuotationReplayRate - a.SecondQuotationReplayRate, + children: [{ title: "", dataIndex: "SecondQuotationReplayRate", render: (text, record) => {text} }], + sorter: (a, b) => parseInt(b.SecondQuotationReplayRate) - parseInt(a.SecondQuotationReplayRate), }, { title: "二次报价回复周期", - children: [{ title: '', dataIndex: "SecondQuotationReplaytimeAVG" }], + children: [{ title: "", dataIndex: "SecondQuotationReplaytimeAVG" }], sorter: (a, b) => b.SecondQuotationReplaytimeAVG - a.SecondQuotationReplaytimeAVG, }, { title: "成团率", - children: [{ title: '', dataIndex: "COLI_SuccessRate" }], - sorter: (a, b) => b.COLI_SuccessRate - a.COLI_SuccessRate, + children: [{ title: "", dataIndex: "COLI_SuccessRate" }], + sorter: (a, b) => parseInt(b.COLI_SuccessRate) - parseInt(a.COLI_SuccessRate), }, { title: "成团周期", - children: [{ title: '', dataIndex: "COLI_ConfirmTimeAVG" }], + children: [{ title: "", dataIndex: "COLI_ConfirmTimeAVG" }], sorter: (a, b) => b.COLI_ConfirmTimeAVG - a.COLI_ConfirmTimeAVG, }, ]; diff --git a/src/views/Orders_sub.js b/src/views/Orders_sub.js index 6e2f00c..00ea649 100644 --- a/src/views/Orders_sub.js +++ b/src/views/Orders_sub.js @@ -259,6 +259,26 @@ const Orders_sub = () => {