调整分页显示

README.md

@@ -15,6 +15,7 @@ antd https://ant-design.antgroup.com/components/upload-cn#uploadfile
 反馈表案例 https://www.chinahighlights.com/customerservice/feedback/PostTourSurveyFormToWLGH.asp?LGC=1&COLI_SN=988185&MEI_SN=954295&Email=jennroth18@hotmail.com&ToC=0&ShowType=&page_class=4&dei_sn=28&country=30,490
 国内供应商平台 http://p.mycht.cn/index.aspx
 文档预览 https://github.com/cyntler/react-doc-viewer
+wps的文档预览 https://wwo.wps.cn/docs/front-end/introduction/quick-start
 
 ## 阿里云OSS
 Bucket 名称：global-highlights-hub

src/config.js

@@ -1,5 +1,5 @@
 import React from "react";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 
 export const DATE_FORMAT = "YYYY-MM-DD";
 export const DATE_PRESETS = [
@@ -15,6 +15,18 @@ export const DATE_PRESETS = [
 		label: "本月",
 		value: [dayjs().startOf("M"), dayjs().endOf("M")],
 	},
+	{
+		label: "上个月",
+		value: [dayjs().subtract(1, "M").startOf("M"), dayjs().subtract(1, "M").endOf("M")],
+	},
+	{
+		label: "近三月",
+		value: [dayjs().subtract(2, "M").startOf("M"), dayjs().endOf("M")],
+	},
+	{
+		label: "今年",
+		value: [dayjs().startOf("y"), dayjs().endOf("y")],
+	},
 	// 本月: [dayjs().startOf("month"), moment().endOf("month")],
 	// 上个月: [dayjs().subtract(1, "months").startOf("month"), moment(new Date()).subtract(1, "months").endOf("month")],
 	// 近7天: [dayjs().add(-7, "days"), dayjs()],
@@ -23,4 +35,4 @@ export const DATE_PRESETS = [
 	// 今年: [dayjs().startOf("year"), moment().endOf("year")],
 	// 去年: [dayjs().subtract(1, "year").startOf("year"), moment().subtract(1, "year").endOf("year")],
 ];
-export const HT_HOST = process.env.NODE_ENV == "production" ? "https://p9axztuwd7x8a7.mycht.cn" : "http://202.103.68.100:890";
+export const HT_HOST = process.env.NODE_ENV == "production" ? "https://p9axztuwd7x8a7.mycht.cn" : "https://p9axztuwd7x8a7.mycht.cn";

src/stores/Feedback.js

@@ -33,7 +33,7 @@ class Feedback {
 	searchFeedbackList(veisn, EOI_Group_Name, TimeStart, TimeEnd) {
 		this.loading = true;
 		let url = `/service-Cooperate/Cooperate/SearchFeedbackList`;
-		url += `?PageSize=5&PageIndex=1&PageTotal=0&veisn=${veisn}&GruopNo=${EOI_Group_Name}&TimeStart=${TimeStart}&TimeEnd=${TimeEnd}`;
+		url += `?PageSize=2000&PageIndex=1&PageTotal=0&veisn=${veisn}&GruopNo=${EOI_Group_Name}&TimeStart=${TimeStart}&TimeEnd=${TimeEnd}`;
 		fetch(config.HT_HOST + url)
 			.then(response => response.json())
 			.then(json => {

src/views/feedback/Index.jsx

@@ -13,12 +13,13 @@ 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_GRI_SN}`}>{text}</NavLink>,
 	},
 	{
 		title: "离团日期",
 		dataIndex: "EOI_Date",
 		render: (text, record) => text,
+		sorter: (a, b) => b.EOI_Date - a.EOI_Date,
 	},
 	{
 		title: "城市",
@@ -28,13 +29,29 @@ const feedbackListColumns = [
 	{
 		title: "评分",
 		dataIndex: "Average",
+		sorter: (a, b) => b.Average - a.Average,
+	},
+	{
+		title: "图片数",
+		dataIndex: "PicNum",
+		sorter: (a, b) => b.PicNum - a.PicNum,
+	},
+	{
+		title: "导游",
+		dataIndex: "GriName",
+	},
+	{
+		title: "表状态",
+		dataIndex: "FState",
+		sorter: (a, b) => b.FState - a.FState,
 	},
 ];
 
 function Index() {
 	const { feedbackStore, authStore } = useStore();
-	const { feedbackList,search_date_start,search_date_end } = feedbackStore;
+	const { feedbackList, search_date_start, search_date_end } = feedbackStore;
 	const [referenceNo, onNumberChange] = useState("");
+	const showTotal = (total) => `Total ${feedbackList.length} items`;
 
 	useEffect(() => {
 		console.info("feedback.useEffect");
@@ -54,17 +71,20 @@ function Index() {
 					/>
 				</Col>
 				<Col md={24} lg={6} xxl={4}>
-					<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} />
+					<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, search_date_start.format(config.DATE_FORMAT),search_date_end.format(config.DATE_FORMAT) + " 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={12}>
-					<Table bordered={true} columns={feedbackListColumns} dataSource={toJS(feedbackList)} />
+					<Table bordered={true} columns={feedbackListColumns} dataSource={toJS(feedbackList)} pagination={{ defaultPageSize: 20, showTotal: showTotal }} />
 				</Col>
 				<Col md={24} lg={24} xxl={12}></Col>
 			</Row>