From d7ecbda831842fda54834cd200b5ba27dd5b0492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Tue, 6 Dec 2022 16:17:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E5=9B=9E=E5=A4=8D=E7=8E=87?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BC=A0=E6=A0=87=E7=A7=BB=E5=8A=A8=E4=B8=8A?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=85=B7=E4=BD=93=E6=95=B0=E5=AD=97=20?=
 =?UTF-8?q?=E7=BD=91=E9=A1=B5=E8=B7=AF=E5=BE=84=E6=B7=BB=E5=8A=A0=E5=B7=B2?=
 =?UTF-8?q?=E6=88=90=E8=A1=8C=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/OrdersStore.js |  3 +++
 src/stores/SaleStore.js   | 28 ++++++++++++++--------------
 src/views/Orders_sub.js   | 20 ++++++++++++++++++++
 3 files changed, 37 insertions(+), 14 deletions(-)

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) => <span title={record.firstReplay + "回复数/" + record.OrderCount + "总订单"}>{text}</span> }],
 								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) => <span title={record.FirstQuotation + "一次报价数/" + record.OrderCount + "总订单"}>{text}</span> }],
+								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) => <span title={record.FirstQuotationReplay + "一次报价回复数/" + record.FirstQuotation + "一次报价数"}>{text}</span> }],
+								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) => <span title={record.SecondQuotation + "二次报价数/" + record.FirstQuotationReplay + "一次报价回复数"}>{text}</span> }],
+								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) => <span title={record.SecondQuotation + "二次报价数/" + record.SecondQuotationReplay + "二次报价回复"}>{text}</span> }],
+								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 = () => {
 									<Table dataSource={table_data_p.dataSource} rowKey={record => record.key} columns={table_data_p.columns} size="small" />
 								</Col>
 
+								<Col span={24}>
+									{date_picker_store.start_date_cp ? date_picker_store.start_date_cp.format(config.DATE_FORMAT) + "~" + date_picker_store.end_date_cp.format(config.DATE_FORMAT) : ""}
+									<Table dataSource={table_data2_p.dataSource} rowKey={record => record.key} columns={table_data2_p.columns} size="small" />
+								</Col>
+							</Row>
+						</Tabs.TabPane>
+						<Tabs.TabPane
+							tab={
+								<span>
+									<ContainerOutlined />
+									访问路径（成行）
+								</span>
+							}
+							key="page_cxstate1">
+							<Row>
+								<Col span={24}>
+									{date_picker_store.start_date.format(config.DATE_FORMAT)}~{date_picker_store.end_date.format(config.DATE_FORMAT)}
+									<Table dataSource={table_data_p.dataSource} rowKey={record => record.key} columns={table_data_p.columns} size="small" />
+								</Col>
+
 								<Col span={24}>
 									{date_picker_store.start_date_cp ? date_picker_store.start_date_cp.format(config.DATE_FORMAT) + "~" + date_picker_store.end_date_cp.format(config.DATE_FORMAT) : ""}
 									<Table dataSource={table_data2_p.dataSource} rowKey={record => record.key} columns={table_data2_p.columns} size="small" />