From 1cb910ff1abf4cc8a93f25e0f67ec876d8359503 Mon Sep 17 00:00:00 2001
From: YCC <ycc@hainatravel.com>
Date: Thu, 11 May 2023 14:13:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=97=A5=E6=9C=9F=EF=BC=8C=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=90=8E=E6=97=A5=E6=9C=9F=E6=B6=88=E5=A4=B1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/Feedback.js       |  9 +++++++++
 src/views/feedback/Index.jsx | 27 ++++++---------------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/stores/Feedback.js b/src/stores/Feedback.js
index 505c4a8..3cbced8 100644
--- a/src/stores/Feedback.js
+++ b/src/stores/Feedback.js
@@ -2,6 +2,7 @@ import { makeAutoObservable, runInAction } from "mobx";
 import * as req from "@/utils/request";
 import { prepareUrl } from "@/utils/commons";
 import * as config from "@/config";
+import dayjs from "dayjs";
 
 class Feedback {
 	constructor(root) {
@@ -10,12 +11,20 @@ class Feedback {
 	}
 
 	loading = false;
+	search_date_start = dayjs().startOf("M");
+	search_date_end = dayjs().endOf("M");
 	feedbackList = []; //反馈列表
 	feedbackImages = []; //图片列表
 	feedbackRate = []; //反馈评分
 	feedbackReview = []; //站外好评
 	feedbackInfo = []; //地接社反馈的信息
 
+	onDateRangeChange = (dates) =>{
+		console.log(dates);
+		this.search_date_start = dates[0];
+        this.search_date_end = dates[1];
+	}
+
 	/* 查询地接社的团列表
       地接社sn
       团名
diff --git a/src/views/feedback/Index.jsx b/src/views/feedback/Index.jsx
index e1c06e3..a15919a 100644
--- a/src/views/feedback/Index.jsx
+++ b/src/views/feedback/Index.jsx
@@ -13,7 +13,7 @@ const feedbackListColumns = [
 	{
 		title: "团名",
 		dataIndex: "EOI_Group_Name",
-		// render: (text, record) => <NavLink to={`/feedback/${record.EOI_SN}`}>{text}</NavLink>,
+		render: (text, record) => <NavLink to={`/feedback/${record.EOI_SN}`}>{text}</NavLink>,
 	},
 	{
 		title: "离团日期",
@@ -29,19 +29,11 @@ const feedbackListColumns = [
 		title: "评分",
 		dataIndex: "Average",
 	},
-	{
-		title: "操作",
-		dataIndex: "EOI_SN",
-		render: (text, record) => <NavLink to={`/feedback/${record.EOI_SN}`}>查看</NavLink>,
-	},
 ];
 
 function Index() {
-
-	
 	const { feedbackStore, authStore } = useStore();
-	const { feedbackList } = feedbackStore;
-	const [selectedDateRange, onDateRangeChange] = useState([config.DATE_PRESETS[0].value]);
+	const { feedbackList,search_date_start,search_date_end } = feedbackStore;
 	const [referenceNo, onNumberChange] = useState("");
 
 	useEffect(() => {
@@ -62,26 +54,19 @@ function Index() {
 					/>
 				</Col>
 				<Col md={24} lg={6} xxl={4}>
-					<DatePicker.RangePicker
-						format={config.DATE_FORMAT}
-						allowClear={false}
-						style={{ width: "100%" }}
-						presets={config.DATE_PRESETS}
-						onChange={(date, dateRange) => {
-							onDateRangeChange(dateRange);
-						}}
-					/>
+					<DatePicker.RangePicker format={config.DATE_FORMAT} allowClear={false} style={{ width: "100%" }} value={[search_date_start,search_date_end]} presets={config.DATE_PRESETS} onChange={feedbackStore.onDateRangeChange} />
 				</Col>
 				<Col md={24} lg={4} xxl={4}>
-					<Button type="primary" loading={feedbackStore.loading} onClick={() => feedbackStore.searchFeedbackList(authStore.login.travelAgencyId, referenceNo, selectedDateRange[0], selectedDateRange[1] + " 23:59")}>
+					<Button type="primary" loading={feedbackStore.loading} onClick={() => feedbackStore.searchFeedbackList(authStore.login.travelAgencyId, referenceNo, search_date_start.format(config.DATE_FORMAT),search_date_end.format(config.DATE_FORMAT) + " 23:59")}>
 						搜索
 					</Button>
 				</Col>
 			</Row>
 			<Row>
-				<Col md={24} lg={24} xxl={24}>
+				<Col md={24} lg={24} xxl={12}>
 					<Table bordered={true} columns={feedbackListColumns} dataSource={toJS(feedbackList)} />
 				</Col>
+				<Col md={24} lg={24} xxl={12}></Col>
 			</Row>
 		</Space>
 	);