Compare commits
1 Commits
main
...
perf/2025b
| Author | SHA1 | Date |
|---|---|---|
Lei OT
|
fb3b2d7bae | 3 months ago |
Binary file not shown.
|
After Width: | Height: | Size: 34 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 4.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
@ -1,76 +0,0 @@
|
||||
import { useState } from "react";
|
||||
import { Popover, message, FloatButton, Button, Form, Input } from "antd";
|
||||
import { BugOutlined } from "@ant-design/icons";
|
||||
import useAuthStore from "@/stores/Auth";
|
||||
import { uploadPageSpyLog, sendNotify } from "@/pageSpy";
|
||||
|
||||
function LogUploader() {
|
||||
const [open, setOpen] = useState(false);
|
||||
const hide = () => {
|
||||
setOpen(false);
|
||||
};
|
||||
const handleOpenChange = (newOpen) => {
|
||||
setOpen(newOpen);
|
||||
};
|
||||
|
||||
const [currentUser] = useAuthStore((s) => [s.currentUser]);
|
||||
|
||||
const [messageApi, contextHolder] = message.useMessage();
|
||||
const [formBug] = Form.useForm();
|
||||
|
||||
const popoverContent = (
|
||||
<Form
|
||||
layout={"vertical"}
|
||||
form={formBug}
|
||||
initialValues={{ problem: '' }}
|
||||
scrollToFirstError
|
||||
onFinish={async (values) => {
|
||||
const success = await uploadPageSpyLog();
|
||||
messageApi.success("Thanks for the feedback😊");
|
||||
if (success) {
|
||||
sendNotify(currentUser?.realname + "说：" + values.problem);
|
||||
} else {
|
||||
sendNotify(currentUser?.realname + "上传日志失败");
|
||||
}
|
||||
hide();
|
||||
formBug.setFieldsValue({problem: ''});
|
||||
}}
|
||||
>
|
||||
<Form.Item
|
||||
name="problem"
|
||||
label="Need help?"
|
||||
rules={[{ required: true, message: "Specify issue needing support." }]}
|
||||
>
|
||||
<Input.TextArea rows={3} />
|
||||
</Form.Item>
|
||||
<Button
|
||||
type="primary"
|
||||
htmlType="submit"
|
||||
color="cyan"
|
||||
variant="solid"
|
||||
block
|
||||
>
|
||||
Submit
|
||||
</Button>
|
||||
</Form>
|
||||
);
|
||||
|
||||
return (
|
||||
<>
|
||||
{contextHolder}
|
||||
<Popover
|
||||
content={popoverContent}
|
||||
trigger={["click"]}
|
||||
placement="topRight"
|
||||
open={open}
|
||||
onOpenChange={handleOpenChange}
|
||||
fresh
|
||||
destroyOnHidden
|
||||
>
|
||||
<FloatButton icon={<BugOutlined />} />
|
||||
</Popover>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
export default LogUploader;
|
||||
@ -1,77 +0,0 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Spin, Cascader } from 'antd';
|
||||
import { fetchJSON } from '@/utils/request';
|
||||
import { HT_HOST } from '@/config';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { groupBy } from '@/utils/commons';
|
||||
|
||||
// 产品列表
|
||||
export const fetchAgencyProductsList = async (params) => {
|
||||
const map = { title: 'label', id: 'value' };
|
||||
const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/travel_agency_products`, params);
|
||||
const byTypes = errcode !== 0 ? {} : (groupBy(result.products, (row) => row.info.product_type_name));
|
||||
// console.log(byTypes)
|
||||
return Object.keys(byTypes).map((type_name) => ({
|
||||
label: type_name,
|
||||
title: type_name,
|
||||
key: type_name,
|
||||
value: type_name,
|
||||
// disableCheckbox: true,
|
||||
level: 1,
|
||||
options: byTypes[type_name].map((row) => ({ ...row, label: `${row.info.code} : ${row.info.title}`, value: row.info.id })),
|
||||
children: byTypes[type_name].map((row) => ({ ...row, label: `${row.info.code} : ${row.info.title}`, value: row.info.id, key: row.info.id, level:2 })),
|
||||
}));
|
||||
};
|
||||
|
||||
const ProductsSelector = ({ params, value, ...props }) => {
|
||||
const { t } = useTranslation();
|
||||
const [fetching, setFetching] = useState(false);
|
||||
const [options, setOptions] = useState([]);
|
||||
|
||||
const fetchAction = async () => {
|
||||
setOptions([]);
|
||||
setFetching(true);
|
||||
const data = await fetchAgencyProductsList(params);
|
||||
// console.log(data)
|
||||
setOptions(data);
|
||||
setFetching(false);
|
||||
return data;
|
||||
};
|
||||
useEffect(() => {
|
||||
fetchAction();
|
||||
|
||||
return () => {};
|
||||
}, []);
|
||||
|
||||
const filter = (inputValue, path) => path.some((option) => option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1);
|
||||
|
||||
const onCascaderChange = (value, selectedOptions) => {
|
||||
// console.log(value, selectedOptions)
|
||||
const selectedP = selectedOptions.map(([parent, item]) => item);
|
||||
// console.log(selectedP);
|
||||
if (typeof props.onChange === 'function') {
|
||||
props.onChange(selectedP);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return (
|
||||
<>
|
||||
<Cascader
|
||||
placeholder={t('products:ProductName')}
|
||||
allowClear
|
||||
expandTrigger="hover"
|
||||
multiple
|
||||
showCheckedStrategy={Cascader.SHOW_CHILD}
|
||||
maxTagCount={0}
|
||||
classNames={{ popup: { root: 'h-96 overflow-y-auto [&_.ant-cascader-menu]:h-full [&_.ant-cascader-checkbox-disabled]:hidden'}}}
|
||||
{...props}
|
||||
notFoundContent={fetching ? <Spin size='small' /> : null}
|
||||
options={options}
|
||||
onChange={onCascaderChange}
|
||||
showSearch={{ filter }}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
};
|
||||
export default ProductsSelector;
|
||||
@ -1,139 +0,0 @@
|
||||
import { flush, groupBy, isEmpty, isNotEmpty, unique, uniqWith } from '@/utils/commons';
|
||||
import dayjs from 'dayjs';
|
||||
// Shoulder Season 平季; peak season 旺季
|
||||
const isFullYearOrLonger = (year, startDate, endDate) => {
|
||||
// Parse the dates
|
||||
const start = dayjs(startDate, 'YYYY-MM-DD');
|
||||
const end = dayjs(endDate, 'YYYY-MM-DD');
|
||||
|
||||
// Create the start and end dates for the year
|
||||
const yearStart = dayjs(`${year}-01-01`, 'YYYY-MM-DD');
|
||||
const yearEnd = dayjs(`${year}-12-31`, 'YYYY-MM-DD');
|
||||
|
||||
// Check if start is '01-01' and end is '12-31' and the year matches
|
||||
const isFullYear = start.isSame(yearStart, 'day') && end.isSame(yearEnd, 'day');
|
||||
|
||||
// Check if the range is longer than a year
|
||||
const isLongerThanYear = end.diff(start, 'year') >= 1;
|
||||
|
||||
return isFullYear || isLongerThanYear;
|
||||
};
|
||||
|
||||
const uniqueBySub = (arr) =>
|
||||
arr.filter((subArr1, _, self) => {
|
||||
return !self.some((subArr2) => {
|
||||
if (subArr1 === subArr2) return false; // don't compare a subarray with itself
|
||||
const set1 = new Set(subArr1);
|
||||
const set2 = new Set(subArr2);
|
||||
// check if subArr1 is a subset of subArr2
|
||||
return [...set1].every((value) => set2.has(value));
|
||||
});
|
||||
});
|
||||
export const chunkBy = (use_year, dataList = [], by = []) => {
|
||||
const dataRollSS = dataList.map((rowp, ii) => {
|
||||
const quotation = rowp.quotation.map((quoteItem) => {
|
||||
return {
|
||||
...quoteItem,
|
||||
quote_season: isFullYearOrLonger(use_year, quoteItem.use_dates_start, quoteItem.use_dates_end) ? 'SS' : 'PS',
|
||||
};
|
||||
});
|
||||
return { ...rowp, quotation };
|
||||
});
|
||||
|
||||
// 人等分组只取平季, 因为产品只一行
|
||||
const allQuotesSS = dataRollSS.reduce((acc, rowp) => acc.concat(rowp.quotation.filter((q) => q.quote_season === 'SS')), []);
|
||||
|
||||
const allQuotesPS = dataRollSS.reduce((acc, rowp) => acc.concat(rowp.quotation.filter((q) => q.quote_season === 'PS')), []);
|
||||
const allQuotesSSS = isEmpty(allQuotesSS) ? allQuotesPS : allQuotesSS;
|
||||
|
||||
const PGroupSizeSS = allQuotesSSS.reduce((aq, cq) => {
|
||||
aq[cq.WPI_SN] = aq[cq.WPI_SN] || [];
|
||||
aq[cq.WPI_SN].push(cq.group_size_min);
|
||||
aq[cq.WPI_SN] = unique(aq[cq.WPI_SN]);
|
||||
aq[cq.WPI_SN] = aq[cq.WPI_SN].slice().sort((a, b) => a - b);
|
||||
return aq;
|
||||
}, {});
|
||||
|
||||
const maxGroupSize = Math.max(...allQuotesSSS.map((q) => q.group_size_max));
|
||||
const maxSet = maxGroupSize === 1000 ? Infinity : maxGroupSize;
|
||||
|
||||
const _SSMinSet = uniqWith(Object.values(PGroupSizeSS), (a, b) => a.join(',') === b.join(','));
|
||||
// const uSSsizeSetArr = (_SSMinSet)
|
||||
const uSSsizeSetArr = uniqueBySub(_SSMinSet);
|
||||
|
||||
// * 若不重叠分组, 则上面不要 uniqueBySub
|
||||
for (const key in PGroupSizeSS) {
|
||||
if (Object.prototype.hasOwnProperty.call(PGroupSizeSS, key)) {
|
||||
const element = PGroupSizeSS[key];
|
||||
const findSet = uSSsizeSetArr.find((minCut) => element.every((v) => minCut.includes(v)));
|
||||
PGroupSizeSS[key] = findSet;
|
||||
}
|
||||
}
|
||||
|
||||
const [SSsizeSets, PSsizeSets] = [uSSsizeSetArr, []].map((arr) => {
|
||||
const _arr = structuredClone(arr);
|
||||
const arrSets = _arr.map((keyMins) =>
|
||||
keyMins.reduce((acc, curr, idx, minsArr) => {
|
||||
const _max = idx === minsArr.length - 1 ? maxSet : Number(minsArr[idx + 1]) - 1;
|
||||
acc.push([Number(curr), _max]);
|
||||
return acc;
|
||||
}, [])
|
||||
);
|
||||
return arrSets;
|
||||
});
|
||||
|
||||
const compactSizeSets = {
|
||||
SSsizeSetKey: uSSsizeSetArr.map((s) => s.join(',')).filter(isNotEmpty),
|
||||
sizeSets: SSsizeSets,
|
||||
};
|
||||
|
||||
const chunkSS = structuredClone(dataRollSS).map((rowp) => {
|
||||
const pkey = (PGroupSizeSS[rowp.info.id] || []).join(',') || compactSizeSets.SSsizeSetKey[0]; // todo:
|
||||
|
||||
const thisRange = (PGroupSizeSS[rowp.info.id] || []).reduce((acc, curr, idx, minsArr) => {
|
||||
const _max = idx === minsArr.length - 1 ? maxSet : Number(minsArr[idx + 1]) - 1;
|
||||
acc.push([Number(curr), _max]);
|
||||
return acc;
|
||||
}, []);
|
||||
const _quotation = rowp.quotation.map((quoteItem) => {
|
||||
const ssSets = isEmpty(thisRange) ? SSsizeSets[0] : structuredClone(thisRange).reverse();
|
||||
|
||||
const matchRange = ssSets.find((ss) => quoteItem.group_size_min >= ss[0] && quoteItem.group_size_max <= ss[1]);
|
||||
const findEnd = matchRange || ssSets.find((ss) => quoteItem.group_size_max > ss[0] && quoteItem.group_size_max <= ss[1] && ss[1] !== Infinity);
|
||||
const findStart = findEnd || ssSets.find((ss) => quoteItem.group_size_min >= ss[0]);
|
||||
const finalRange = findStart || ssSets[0];
|
||||
|
||||
quoteItem.quote_size = finalRange.join('-');
|
||||
return quoteItem;
|
||||
});
|
||||
const quote_chunk_flat = groupBy(_quotation, (quoteItem2) => by.map((key) => quoteItem2[key]).join('@'));
|
||||
const quote_chunk = Object.keys(quote_chunk_flat).reduce((qc, ckey) => {
|
||||
const ckeyArr = ckey.split('@');
|
||||
if (isEmpty(qc[ckeyArr[0]])) {
|
||||
qc[ckeyArr[0]] = ckeyArr[1] ? { [ckeyArr[1]]: quote_chunk_flat[ckey] } : quote_chunk_flat[ckey];
|
||||
} else {
|
||||
qc[ckeyArr[0]][ckeyArr[1]] = (qc[ckeyArr[0]][ckeyArr[1]] || []).concat(quote_chunk_flat[ckey]);
|
||||
}
|
||||
return qc;
|
||||
}, {});
|
||||
return {
|
||||
...rowp,
|
||||
sizeSetsSS: pkey,
|
||||
quotation: _quotation,
|
||||
quote_chunk,
|
||||
};
|
||||
});
|
||||
|
||||
const allquotation = chunkSS.reduce((a, c) => a.concat(c.quotation), []);
|
||||
// 取出两季相应的时效区间
|
||||
const SSRange = unique((allquotation || []).filter((q) => q.quote_season === 'SS').map((qr) => `${qr.use_dates_start}~${qr.use_dates_end}`));
|
||||
const PSRange = unique((allquotation || []).filter((q) => q.quote_season === 'PS').map((qr) => `${qr.use_dates_start}~${qr.use_dates_end}`));
|
||||
|
||||
return {
|
||||
chunk: chunkSS,
|
||||
dataSource: chunkSS,
|
||||
SSRange,
|
||||
PSRange,
|
||||
...compactSizeSets,
|
||||
};
|
||||
};
|
||||
@ -1,395 +0,0 @@
|
||||
import { flush, groupBy, isEmpty, isNotEmpty, pick, unique, uniqWith } from '@/utils/commons';
|
||||
import dayjs from 'dayjs';
|
||||
import { formatGroupSize } from './useProductsSets';
|
||||
|
||||
// Shoulder Season 平季; peak season 旺季
|
||||
export const isFullYearOrLonger = (year, startDate, endDate) => {
|
||||
// Parse the dates
|
||||
const start = dayjs(startDate, 'YYYY-MM-DD');
|
||||
const end = dayjs(endDate, 'YYYY-MM-DD');
|
||||
|
||||
// Create the start and end dates for the year
|
||||
const yearStart = dayjs(`${year}-01-01`, 'YYYY-MM-DD');
|
||||
const yearEnd = dayjs(`${year}-12-31`, 'YYYY-MM-DD');
|
||||
|
||||
// Check if start is '01-01' and end is '12-31' and the year matches
|
||||
const isFullYear = start.isSame(yearStart, 'day') && end.isSame(yearEnd, 'day');
|
||||
|
||||
// Check if the range is longer than a year
|
||||
const isLongerThanYear = end.diff(startDate, 'year') >= 1;
|
||||
const isLongerThan12M = end.diff(startDate, 'month') >= 11;
|
||||
|
||||
return isFullYear || isLongerThanYear || isLongerThan12M;
|
||||
};
|
||||
|
||||
const uniqueBySub = (arr) => {
|
||||
const sortedArr = arr.sort((a, b) => b.length - a.length);
|
||||
const uniqueArr = [];
|
||||
sortedArr.forEach((currentSubArr) => {
|
||||
const isSubsetOfUnique = uniqueArr.some((uniqueSubArr) => {
|
||||
return currentSubArr.every((item) => uniqueSubArr.includes(item));
|
||||
});
|
||||
if (!isSubsetOfUnique) {
|
||||
uniqueArr.push(currentSubArr);
|
||||
}
|
||||
});
|
||||
|
||||
return uniqueArr;
|
||||
}
|
||||
|
||||
export const chunkBy = (use_year, dataList = [], by = []) => {
|
||||
const dataRollSS = dataList.map((rowp, ii) => {
|
||||
const quotation = rowp.quotation.map((quoteItem) => {
|
||||
return {
|
||||
...quoteItem,
|
||||
quote_season: isFullYearOrLonger(use_year, quoteItem.use_dates_start, quoteItem.use_dates_end) ? 'SS' : 'PS',
|
||||
};
|
||||
});
|
||||
return { ...rowp, quotation };
|
||||
});
|
||||
|
||||
// 人等分组只取平季, 因为产品只一行
|
||||
const allQuotesSS = dataRollSS.reduce((acc, rowp) => acc.concat(rowp.quotation.filter((q) => q.quote_season === 'SS')), []);
|
||||
|
||||
const allQuotesPS = dataRollSS.reduce((acc, rowp) => acc.concat(rowp.quotation.filter((q) => q.quote_season === 'PS')), []);
|
||||
const allQuotesSSS = isEmpty(allQuotesSS) ? allQuotesPS : allQuotesSS;
|
||||
|
||||
const allQuotesSSS2 = [].concat(allQuotesSS, allQuotesPS);
|
||||
|
||||
const PGroupSizeSS = allQuotesSSS.reduce((aq, cq) => {
|
||||
aq[cq.WPI_SN] = aq[cq.WPI_SN] || [];
|
||||
aq[cq.WPI_SN].push(`${cq.group_size_min}-${cq.group_size_max}`);
|
||||
// aq[cq.WPI_SN].push([cq.group_size_min, cq.group_size_max]);
|
||||
// aq[cq.WPI_SN].push(cq.group_size_min);
|
||||
aq[cq.WPI_SN] = unique(aq[cq.WPI_SN]);
|
||||
aq[cq.WPI_SN] = aq[cq.WPI_SN].slice().sort((a, b) => a.split('-')[0] - b.split('-')[0]);
|
||||
return aq;
|
||||
}, {});
|
||||
// debug:
|
||||
// PGroupSizeSS['5098'] = ['1-1000'];
|
||||
// PGroupSizeSS['5099'] = ['1-2', '3-4'];
|
||||
|
||||
const PGroupSizePS = allQuotesPS.reduce((aq, cq) => {
|
||||
aq[cq.WPI_SN] = aq[cq.WPI_SN] || [];
|
||||
aq[cq.WPI_SN].push(`${cq.group_size_min}-${cq.group_size_max}`);
|
||||
// aq[cq.WPI_SN].push([cq.group_size_min, cq.group_size_max]);
|
||||
// aq[cq.WPI_SN].push(cq.group_size_min);
|
||||
aq[cq.WPI_SN] = unique(aq[cq.WPI_SN]);
|
||||
aq[cq.WPI_SN] = aq[cq.WPI_SN].slice().sort((a, b) => a.split('-')[0] - b.split('-')[0]);
|
||||
return aq;
|
||||
}, {});
|
||||
|
||||
// 补全产品旺季的人等分组 (当旺季和平季的人等不完全一致时)
|
||||
const allWPI = unique(allQuotesSSS2.map((ele) => ele.WPI_SN));
|
||||
for (const WPI of allWPI) {
|
||||
// for (const WPI in PGroupSizeSS) {
|
||||
// if (Object.prototype.hasOwnProperty.call(PGroupSizeSS, WPI)) {
|
||||
const element = PGroupSizeSS[WPI] || [];
|
||||
const elementP = PGroupSizePS[WPI] || [];
|
||||
const diff = (elementP || []).filter((ele, index) => !element.includes(ele));
|
||||
PGroupSizeSS[WPI] = element.concat(diff);
|
||||
// }
|
||||
}
|
||||
|
||||
// console.log('PGroupSizeSS', PGroupSizeSS, '\nPGroupSizePS', PGroupSizePS, '\nallQuotesSSS', allQuotesSSS2)
|
||||
|
||||
// const maxGroupSize = Math.max(...allQuotesSSS.map((q) => q.group_size_max));
|
||||
// const maxSet = maxGroupSize === 1000 ? Infinity : maxGroupSize;
|
||||
|
||||
const _SSMinSet = uniqWith(Object.values(PGroupSizeSS), (a, b) => a.join(',') === b.join(','));
|
||||
// const uSSsizeSetArr = (_SSMinSet)
|
||||
const uSSsizeSetArr = uniqueBySub(_SSMinSet);
|
||||
// console.log('_SSMinSet', _SSMinSet, '\n uSSsizeSetArr', uSSsizeSetArr)
|
||||
|
||||
// * 若不重叠分组, 则上面不要 uniqueBySub
|
||||
for (const key in PGroupSizeSS) {
|
||||
if (Object.prototype.hasOwnProperty.call(PGroupSizeSS, key)) {
|
||||
const element = PGroupSizeSS[key];
|
||||
const findSet = uSSsizeSetArr.find((minCut) => element.every((v) => minCut.includes(v)));
|
||||
PGroupSizeSS[key] = findSet;
|
||||
}
|
||||
}
|
||||
// console.log('PGroupSizeSS -- ', PGroupSizeSS)
|
||||
|
||||
const [SSsizeSets, PSsizeSets] = [uSSsizeSetArr, []].map((arr) => {
|
||||
const _arr = structuredClone(arr);
|
||||
const arrSets = _arr.map((keyMinMaxStrs) =>
|
||||
keyMinMaxStrs.reduce((acc, curr, idx, minMaxArr) => {
|
||||
const curArr = curr.split('-').map(val => parseInt(val, 10));
|
||||
acc.push(curArr);
|
||||
// const _max = idx === minsArr.length - 1 ? maxSet : Number(minsArr[idx + 1]) - 1;
|
||||
// acc.push([Number(curr), _max]);
|
||||
return acc;
|
||||
}, [])
|
||||
);
|
||||
return arrSets;
|
||||
});
|
||||
|
||||
// console.log('uSSsizeSetArr', uSSsizeSetArr);
|
||||
const [SSsizeSetsMap, PSsizeSetsMap] = [uSSsizeSetArr, []].map((arr) => {
|
||||
const _arr = structuredClone(arr);
|
||||
const SetsMap = _arr.reduce((acc, keyMinMaxStrs, ii, strArr) => {
|
||||
const _key = keyMinMaxStrs.join(',');
|
||||
// console.log(_key);
|
||||
const _value = keyMinMaxStrs.reduce((acc, curr, idx, minMaxArr) => {
|
||||
const curArr = curr.split('-').map((val) => parseInt(val, 10));
|
||||
acc.push(curArr);
|
||||
return acc;
|
||||
}, []);
|
||||
return { ...acc, [_key]: _value };
|
||||
}, {});
|
||||
return SetsMap;
|
||||
});
|
||||
// console.log('SSsizeSetsMap', SSsizeSetsMap);
|
||||
|
||||
const compactSizeSets = {
|
||||
SSsizeSetKey: uSSsizeSetArr.map((s) => s.join(',')).filter(isNotEmpty),
|
||||
sizeSets: SSsizeSets,
|
||||
SSsizeSetsMap,
|
||||
};
|
||||
// console.log('sizeSets -- ', SSsizeSets, '\nSSsizeSetKey', compactSizeSets.SSsizeSetKey, '\nSSsizeSetsMap', SSsizeSetsMap)
|
||||
|
||||
const chunkSS = structuredClone(dataRollSS).map((rowp) => {
|
||||
const pkey = (PGroupSizeSS[rowp.info.id] || []).join(',') || compactSizeSets.SSsizeSetKey[0]; // todo:
|
||||
|
||||
let unitCnt = { '0': 0, '1': 0 }; // ? todo: 以平季的为准
|
||||
const _quotation = rowp.quotation.map((quoteItem) => {
|
||||
unitCnt[quoteItem.unit_id]++;
|
||||
|
||||
quoteItem.quote_size = pkey;
|
||||
quoteItem.quote_col_key = formatGroupSize(quoteItem.group_size_min, quoteItem.group_size_max);
|
||||
quoteItem.use_dates_start = quoteItem.use_dates_start.replace(/-/g, '.');
|
||||
quoteItem.use_dates_end = quoteItem.use_dates_end.replace(/-/g, '.');
|
||||
return quoteItem;
|
||||
});
|
||||
const quote_chunk_flat = groupBy(_quotation, (quoteItem2) => by.map((key) => quoteItem2[key]).join('@') || '#');
|
||||
const quote_chunk = Object.keys(quote_chunk_flat).reduce((qc, ckey) => {
|
||||
const ckeyArr = ckey.split('@');
|
||||
if (isEmpty(qc[ckeyArr[0]])) {
|
||||
qc[ckeyArr[0]] = ckeyArr[1] ? { [ckeyArr[1]]: quote_chunk_flat[ckey] } : quote_chunk_flat[ckey];
|
||||
} else {
|
||||
qc[ckeyArr[0]][ckeyArr[1]] = (qc[ckeyArr[0]][ckeyArr[1]] || []).concat(quote_chunk_flat[ckey]);
|
||||
}
|
||||
return qc;
|
||||
}, {});
|
||||
|
||||
const _quotationTransposeBySize = Object.keys(quote_chunk).reduce((accBy, byKey) => {
|
||||
const byValues = quote_chunk[byKey];
|
||||
const groupTablesBySize = groupBy(byValues, 'quote_size');
|
||||
const transposeTables = Object.keys(groupTablesBySize).reduce((accBy, sizeKeys) => {
|
||||
const _sizeRows = groupTablesBySize[sizeKeys];
|
||||
const rowsByDate = groupBy(_sizeRows, qi => `${qi.use_dates_start}~${qi.use_dates_end}`);
|
||||
const _rowsFromDate = Object.keys(rowsByDate).reduce((accDate, dateKeys) => {
|
||||
const _dateRows = rowsByDate[dateKeys];
|
||||
const rowKey = _dateRows.map(e => e.id).join(',');
|
||||
const keepCol = pick(_dateRows[0], ['WPI_SN', 'WPP_VEI_SN', 'currency', 'unit_id', 'unit_name', 'use_dates_start', 'use_dates_end', 'weekdays', 'quote_season']);
|
||||
const _colFromDateRow = _dateRows.reduce((accCols, rowp) => {
|
||||
// const _colRow = pick(rowp, ['currency', 'unit_id', 'unit_name', 'use_dates_start', 'use_dates_end', 'weekdays', 'child_cost', 'adult_cost']);
|
||||
return { ...accCols, [rowp.quote_col_key]: rowp };
|
||||
}, {...keepCol, originRows: _dateRows, rowKey });
|
||||
accDate.push(_colFromDateRow);
|
||||
return accDate;
|
||||
}, []);
|
||||
return { ...accBy, [sizeKeys]: _rowsFromDate };
|
||||
}, {});
|
||||
return { ...accBy, [byKey]: transposeTables };
|
||||
}, {});
|
||||
// console.log(_quotationTransposeBySize);
|
||||
|
||||
return {
|
||||
...rowp,
|
||||
unitCnt,
|
||||
unitSet: Object.keys(unitCnt).reduce((a, b) => unitCnt[a] > unitCnt[b] ? a : b),
|
||||
sizeSetsSS: pkey,
|
||||
_quotationTransposeBySize,
|
||||
quotation: _quotation,
|
||||
quote_chunk,
|
||||
};
|
||||
});
|
||||
|
||||
const allquotation = chunkSS.reduce((a, c) => a.concat(c.quotation), []);
|
||||
// 取出两季相应的时效区间
|
||||
const SSRange = unique((allquotation || []).filter((q) => q.quote_season === 'SS').map((qr) => `${qr.use_dates_start}~${qr.use_dates_end}`));
|
||||
const PSRange = unique((allquotation || []).filter((q) => q.quote_season === 'PS').map((qr) => `${qr.use_dates_start}~${qr.use_dates_end}`));
|
||||
|
||||
// const transposeDataSS = chunkSS
|
||||
|
||||
return {
|
||||
chunk: chunkSS,
|
||||
// dataSource: chunkSS,
|
||||
SSRange,
|
||||
PSRange,
|
||||
...compactSizeSets, // { SSsizeSetKey, sizeSets }
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
* 按[单位, 人等]拆分表格
|
||||
* @use D J B R 8
|
||||
*/
|
||||
export const splitTable_SizeSets = (chunkData) => {
|
||||
const { SSRange, PSRange, SSsizeSetKey, SSsizeSetsMap, chunk } = chunkData;
|
||||
// console.log('---- chunk', chunk);
|
||||
const bySizeUnitSetKey = groupBy(chunk, pitem => ['unitSet', 'sizeSetsSS', ].map((key) => pitem[key]).join('@'));
|
||||
// agencyProducts.J.
|
||||
// console.log('bySizeSetKey', bySizeUnitSetKey);
|
||||
const tables = Object.keys(bySizeUnitSetKey).map((sizeSetsUnitStr) => {
|
||||
const [unitSet, sizeSetsStr] = sizeSetsUnitStr.split('@');
|
||||
const _thisSSsetProducts = bySizeUnitSetKey[sizeSetsUnitStr];
|
||||
const _subTable = _thisSSsetProducts.map(({ info, sizeSetsSS, _quotationTransposeBySize, unitSet, ...pitem }) => {
|
||||
const transpose = _quotationTransposeBySize['#'][sizeSetsSS];
|
||||
const _pRow = transpose.map((quote, qi) => ({ ...quote, rowSpan: qi === 0 ? transpose.length : 0 }));
|
||||
return { info, sizeSetsSS, unitSet, rows: _pRow, transpose };
|
||||
});
|
||||
return { cols: SSsizeSetsMap[sizeSetsStr], colsKey: sizeSetsStr, unitSet, sizeSetsUnitStr, data: _subTable };
|
||||
});
|
||||
// console.log('---- tables', tables);
|
||||
const tablesQuote = tables.map(({ cols, colsKey, unitSet, sizeSetsUnitStr, data }, ti) => {
|
||||
const _table = data.reduce((acc, prow) => {
|
||||
const prows = prow.rows.map((_q) => ({ ..._q, info: prow.info, dateText: `${_q.use_dates_start}~${_q.use_dates_end}` }));
|
||||
return acc.concat(prows);
|
||||
}, []);
|
||||
return { cols, colsKey: sizeSetsUnitStr, data: _table }; // `${unitSet}@${colsKey}`
|
||||
});
|
||||
// console.log('---- tablesQuote', tablesQuote);
|
||||
return tablesQuote;
|
||||
};
|
||||
|
||||
/**
|
||||
* 按季度分列 [平季, 旺季]
|
||||
* @use Q 7 6
|
||||
*/
|
||||
export const splitTable_Season = (chunkData) => {
|
||||
const { SSRange, PSRange, SSsizeSetKey, SSsizeSetsMap, chunk } = chunkData;
|
||||
// console.log(chunkData);
|
||||
const tablesQuote = chunk.map((pitem) => {
|
||||
const { quote_chunk } = pitem;
|
||||
// const bySeason = groupBy(pitem.quotation, (ele) => ele.quote_season);
|
||||
const rowSeason = Object.keys(quote_chunk).reduce((accp, _s) => {
|
||||
const bySeasonValue = groupBy(quote_chunk[_s], (ele) => ['adult_cost', 'child_cost', 'group_size_min', 'group_size_max', 'unit_id'].map((k) => ele[k]).join('@'));
|
||||
// console.log('---- bySeasonValue', _s, bySeasonValue);
|
||||
|
||||
const byDate = groupBy(quote_chunk[_s], (ele) => `${ele.use_dates_start}~${ele.use_dates_end}`);
|
||||
// console.log('---- byDate', _s, byDate);
|
||||
|
||||
const subHeader = Object.keys(bySeasonValue).length >= Object.keys(byDate).length ? 'dates' : 'priceValues';
|
||||
// console.log('---- subHeader', _s, subHeader);
|
||||
|
||||
let valuesArr = [];
|
||||
switch (subHeader) {
|
||||
case 'priceValues':
|
||||
valuesArr = Object.keys(bySeasonValue).reduce((accv, valKey) => {
|
||||
const valRows = bySeasonValue[valKey];
|
||||
const valRow = pick(valRows[0], ['adult_cost', 'child_cost', 'currency', 'unit_id', 'unit_name', 'group_size_min', 'group_size_max']);
|
||||
// valRow.dates = valRows.map((v) => pick(v, ['id', 'use_dates_end', 'use_dates_start']));
|
||||
valRow.rows = [valRows[0]];
|
||||
valRow.originRows = valRows;
|
||||
valRow.rowKey = valRows.map((v) => v.id).join(',');
|
||||
valRow.headerDates = valRows.map((v) => pick(v, ['use_dates_end', 'use_dates_start']));
|
||||
accv.push(valRow);
|
||||
return accv;
|
||||
}, []);
|
||||
break;
|
||||
case 'dates':
|
||||
valuesArr = Object.keys(byDate).reduce((accv, dateKey) => {
|
||||
const valRows = byDate[dateKey];
|
||||
const valRow = pick(valRows[0], ['use_dates_end', 'use_dates_start']);
|
||||
valRow.rows = valRows;
|
||||
valRow.originRows = valRows;
|
||||
valRow.rowKey = valRows.map((v) => v.id).join(',');
|
||||
valRow.headerDates = [pick(valRows[0], ['use_dates_end', 'use_dates_start'])];
|
||||
accv.push(valRow);
|
||||
return accv;
|
||||
}, []);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
const valUnderSeason = Object.keys(bySeasonValue).reduce((accv, valKey) => {
|
||||
const valRows = bySeasonValue[valKey];
|
||||
const valRow = pick(valRows[0], ['adult_cost', 'child_cost', 'currency', 'unit_id', 'unit_name', 'group_size_min', 'group_size_max']);
|
||||
// valRow.dates = valRows.map((v) => pick(v, ['id', 'use_dates_end', 'use_dates_start']));
|
||||
valRow.rows = valRows;
|
||||
valRow.rowKey = valRows.map(v => v.id).join(',');
|
||||
accv.push(valRow);
|
||||
return accv;
|
||||
}, []);
|
||||
|
||||
return { ...accp, [_s]: valUnderSeason, [_s + 'Data']: valuesArr };
|
||||
}, {});
|
||||
return { info: pitem.info, ...rowSeason, rowKey: pitem.info.id };
|
||||
});
|
||||
// console.log('---- tablesQuote', tablesQuote);
|
||||
return tablesQuote;
|
||||
};
|
||||
|
||||
export const splitTable_D = (use_year, dataSource, retTableOnly = true) => {
|
||||
const chunked = chunkBy(use_year, dataSource);
|
||||
// console.log(chunked);
|
||||
const tables = addCityRow4Split(splitTable_SizeSets(chunked));
|
||||
return retTableOnly ? tables : { ...chunked, tables };
|
||||
};
|
||||
|
||||
export const splitTable_J = (use_year, dataSource, retTableOnly = true) => {
|
||||
const chunked = chunkBy(use_year, dataSource);
|
||||
// console.log(chunked);
|
||||
const tables = addCityRow4Split(splitTable_SizeSets(chunked));
|
||||
return retTableOnly ? tables : { ...chunked, tables };
|
||||
};
|
||||
|
||||
export const splitTable_Q = (use_year, dataSource) => {
|
||||
const chunked = chunkBy(use_year, dataSource, ['quote_season']);
|
||||
return addCityRow4Season(splitTable_Season(chunked));
|
||||
};
|
||||
|
||||
export const splitTable_7 = (use_year, dataSource) => {
|
||||
const chunked = chunkBy(use_year, dataSource, ['quote_season']);
|
||||
return addCityRow4Season(splitTable_Season(chunked));
|
||||
};
|
||||
|
||||
export const splitTable_R = (use_year, dataSource, retTableOnly = true) => {
|
||||
const chunked = chunkBy(use_year, dataSource);
|
||||
// console.log(chunked);
|
||||
const tables = addCityRow4Split(splitTable_SizeSets(chunked));
|
||||
return retTableOnly ? tables : { ...chunked, tables };
|
||||
};
|
||||
|
||||
export const splitTable_8 = (use_year, dataSource, retTableOnly = true) => {
|
||||
const chunked = chunkBy(use_year, dataSource);
|
||||
// console.log(chunked);
|
||||
const tables = addCityRow4Split(splitTable_SizeSets(chunked));
|
||||
return retTableOnly ? tables : { ...chunked, tables };
|
||||
};
|
||||
|
||||
export const splitTable_6 = (use_year, dataSource, retTableOnly = true) => {
|
||||
const chunked = chunkBy(use_year, dataSource, ['quote_season']);
|
||||
const tables = splitTable_Season(chunked);
|
||||
return retTableOnly ? tables : { ...chunked, tables };
|
||||
};
|
||||
|
||||
export const splitTable_B = (use_year, dataSource, retTableOnly = true) => {
|
||||
const chunked = chunkBy(use_year, dataSource);
|
||||
// console.log(chunked);
|
||||
const tables = addCityRow4Split(splitTable_SizeSets(chunked));
|
||||
return retTableOnly ? tables : { ...chunked, tables };
|
||||
};
|
||||
|
||||
export const addCityRow4Season = (table) => {
|
||||
const byCity = groupBy(table, (ele) => `${ele.info.city_id}@${ele.info.city_name}`);
|
||||
const withCityRow = Object.keys(byCity).reduce((acc, cityIdName) => {
|
||||
const [cityId, cityName] = cityIdName.split('@');
|
||||
acc.push({ info: { product_title: cityName, isCityRow: true,}, use_dates_end: '', use_dates_start: '', quote_season: 'SS', rowSpan: 1, rowKey: `c_${cityId}` });
|
||||
return acc.concat(byCity[cityIdName]);
|
||||
}, []);
|
||||
return withCityRow;
|
||||
};
|
||||
|
||||
export const addCityRow4Split = (splitTables) => {
|
||||
const tables = splitTables.map(table => {
|
||||
return { ...table, data: addCityRow4Season(table.data)}
|
||||
});
|
||||
return tables;
|
||||
};
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
// 顾问查看客人上传的护照
|
||||
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import { Input, Button, Card, Typography, Space, Alert } from 'antd';
|
||||
import { useParams } from 'react-router-dom';
|
||||
import ImageUploader from '@/components/ImageUploader';
|
||||
|
||||
const { Title, Text } = Typography;
|
||||
|
||||
const ImageViewer = () => {
|
||||
const { GRI_SN, GRI_No } = useParams();
|
||||
const [ossKey, setOssKey] = useState('');
|
||||
const [showUploader, setShowUploader] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
if (GRI_SN && GRI_No) {
|
||||
const key = `ghh/${GRI_SN}-${GRI_No}/passport_image`;
|
||||
setOssKey(key);
|
||||
setShowUploader(true);
|
||||
}
|
||||
}, [GRI_SN, GRI_No]);
|
||||
|
||||
|
||||
return (
|
||||
<div style={{ padding: '20px' }}>
|
||||
<Title level={2}>{GRI_SN}-{GRI_No}</Title>
|
||||
|
||||
{showUploader && (
|
||||
<ImageUploader osskey={ossKey} />
|
||||
)}
|
||||
|
||||
{!showUploader && (
|
||||
<Text>无法从URL中提取订单信息</Text>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default ImageViewer;
|
||||
@ -1,116 +1,109 @@
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { useEffect } from "react";
|
||||
import { Button, Form, Input, Row, Radio, App, Typography } from "antd";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import useAuthStore from "@/stores/Auth";
|
||||
import { appendRequestParams } from "@/utils/request";
|
||||
import { useNavigate } from 'react-router-dom'
|
||||
import { useEffect } from 'react'
|
||||
import { Button, Form, Input, Row, Radio, App } from 'antd'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
import useAuthStore from '@/stores/Auth'
|
||||
import { appendRequestParams } from '@/utils/request'
|
||||
|
||||
function Login() {
|
||||
const [authenticate, loginStatus, defaultRoute] = useAuthStore((state) => [
|
||||
state.authenticate,
|
||||
state.loginStatus,
|
||||
state.defaultRoute,
|
||||
]);
|
||||
const [authenticate, loginStatus, defaultRoute] =
|
||||
useAuthStore((state) => [state.authenticate, state.loginStatus, state.defaultRoute])
|
||||
|
||||
const { t, i18n } = useTranslation();
|
||||
const { notification } = App.useApp();
|
||||
const navigate = useNavigate();
|
||||
const [form] = Form.useForm();
|
||||
const { t, i18n } = useTranslation()
|
||||
const { notification } = App.useApp()
|
||||
const navigate = useNavigate()
|
||||
const [form] = Form.useForm()
|
||||
|
||||
const handleLngChange = (lng) => {
|
||||
appendRequestParams("lgc", lng === "zh" ? 2 : 1);
|
||||
i18n.changeLanguage(lng);
|
||||
};
|
||||
appendRequestParams('lgc', lng === 'zh' ? 2 : 1)
|
||||
i18n.changeLanguage(lng)
|
||||
}
|
||||
|
||||
const defaultLng = i18n.language ?? "zh";
|
||||
appendRequestParams("lgc", defaultLng === "zh" ? 2 : 1);
|
||||
const defaultLng = i18n.language??'zh'
|
||||
appendRequestParams('lgc', defaultLng === 'zh' ? 2 : 1)
|
||||
|
||||
useEffect (() => {
|
||||
if (loginStatus === 302) {
|
||||
navigate(defaultRoute);
|
||||
navigate(defaultRoute)
|
||||
}
|
||||
}, [loginStatus]);
|
||||
}, [loginStatus])
|
||||
|
||||
const onFinish = (values) => {
|
||||
authenticate(values.username, values.password).catch((ex) => {
|
||||
console.error(ex);
|
||||
authenticate(values.username, values.password)
|
||||
.catch(ex => {
|
||||
console.error(ex)
|
||||
notification.error({
|
||||
message: t("Validation.Title"),
|
||||
description: t("Validation.LoginFailed"),
|
||||
placement: "top",
|
||||
message: t('Validation.Title'),
|
||||
description: t('Validation.LoginFailed'),
|
||||
placement: 'top',
|
||||
duration: 4,
|
||||
});
|
||||
});
|
||||
};
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
const onFinishFailed = (errorInfo) => {
|
||||
console.log("Failed:", errorInfo);
|
||||
};
|
||||
console.log('Failed:', errorInfo);
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<Typography.Title className="text-center" level={3}>
|
||||
Highlights Hub
|
||||
</Typography.Title>
|
||||
<Row justify="center" align="middle" className="min-h-96">
|
||||
<Row justify='center' align='middle' className='min-h-96'>
|
||||
<Form
|
||||
name="login"
|
||||
layout="vertical"
|
||||
name='login'
|
||||
layout='vertical'
|
||||
form={form}
|
||||
size="large"
|
||||
size='large'
|
||||
labelCol={{
|
||||
span: 8,
|
||||
}}
|
||||
wrapperCol={{
|
||||
span: 24,
|
||||
}}
|
||||
className="max-w-xl"
|
||||
className='max-w-xl'
|
||||
initialValues={{
|
||||
language: defaultLng,
|
||||
}}
|
||||
onFinish={onFinish}
|
||||
onFinishFailed={onFinishFailed}
|
||||
autoComplete="off"
|
||||
autoComplete='off'
|
||||
>
|
||||
<Form.Item
|
||||
label={t("Username")}
|
||||
name="username"
|
||||
label={t('Username')}
|
||||
name='username'
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
message: t("Validation.UsernameIsEmpty"),
|
||||
message: t('Validation.UsernameIsEmpty'),
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Input />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
label={t("Password")}
|
||||
name="password"
|
||||
label={t('Password')}
|
||||
name='password'
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
message: t("Validation.PasswordIsEmpty"),
|
||||
message: t('Validation.PasswordIsEmpty'),
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Input.Password />
|
||||
</Form.Item>
|
||||
<Form.Item name="language">
|
||||
<Radio.Group onChange={(e) => handleLngChange(e.target.value)}>
|
||||
<Radio value="zh">中文</Radio>
|
||||
<Radio value="en">English</Radio>
|
||||
<Form.Item name='language'>
|
||||
<Radio.Group onChange={e => handleLngChange(e.target.value)}>
|
||||
<Radio value='zh'>中文</Radio>
|
||||
<Radio value='en'>English</Radio>
|
||||
</Radio.Group>
|
||||
</Form.Item>
|
||||
<Form.Item>
|
||||
<Button type="primary" htmlType="submit" className="w-full">
|
||||
{t("Login")}
|
||||
<Button type='primary' htmlType='submit' className='w-full'>
|
||||
{t('Login')}
|
||||
</Button>
|
||||
</Form.Item>
|
||||
</Form>
|
||||
</Row>
|
||||
</>
|
||||
);
|
||||
)
|
||||
}
|
||||
|
||||
export default Login;
|
||||
export default Login
|
||||
|
||||
@ -1,285 +0,0 @@
|
||||
import { useState, useMemo } from 'react';
|
||||
import { Button, Table, Popover, Typography } from 'antd';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { HT_HOST } from '@/config';
|
||||
import { fetchJSON } from '@/utils/request';
|
||||
import { formatGroupSize } from '@/hooks/useProductsSets';
|
||||
import { isEmpty, isNotEmpty } from '@/utils/commons';
|
||||
import { usingStorage } from '@/hooks/usingStorage';
|
||||
|
||||
/**
|
||||
* 产品价格日志
|
||||
*/
|
||||
const getPPLogAction = async (params) => {
|
||||
const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/agency_product_price_log`, params)
|
||||
return errcode !== 0 ? [] : result;
|
||||
};
|
||||
|
||||
/**
|
||||
* 产品价格: 已发布的
|
||||
*/
|
||||
const getPPRunningAction = async (params) => {
|
||||
const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/agency_product_price_running`, params)
|
||||
return errcode !== 0 ? [] : result;
|
||||
};
|
||||
|
||||
/**
|
||||
* 产品价格快照
|
||||
*/
|
||||
const getPPSnapshotAction = async (params) => {
|
||||
const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/agency_product_price_snapshot`, params)
|
||||
return errcode !== 0 ? [] : result;
|
||||
}
|
||||
|
||||
const parseJson = (str) => {
|
||||
let result;
|
||||
if (str === null || str === undefined || str === '') {
|
||||
return {};
|
||||
}
|
||||
try {
|
||||
result = typeof str === 'string' ? JSON.parse(str) : str;
|
||||
return Array.isArray(result) ? result.reduce((acc, cur) => ({ ...acc, ...cur }), {}) : result;
|
||||
} catch (e) {
|
||||
return {};
|
||||
}
|
||||
};
|
||||
|
||||
const statesForHideEdited = [1, 2];
|
||||
export const columnsSets = (t, colorize = true) => [
|
||||
{
|
||||
key: 'adult',
|
||||
title: t('AgeType.Adult'),
|
||||
width: '12rem',
|
||||
render: (_, { adult_cost, currency, unit_id, unit_name, audit_state_id, lastedit_changed }) => {
|
||||
const _changed = parseJson(lastedit_changed);
|
||||
const ifCompare = colorize && !statesForHideEdited.includes(audit_state_id);
|
||||
const ifData = isNotEmpty(_changed.adult_cost) || isNotEmpty(_changed.unit_id) || isNotEmpty(_changed.currency);
|
||||
const preValue =
|
||||
ifCompare && ifData ? (
|
||||
<div className='text-muted line-through '>{`${_changed.adult_cost || adult_cost} ${_changed.currency || currency} / ${t(`PriceUnit.${_changed.unit_id || unit_id}`)}`}</div>
|
||||
) : null;
|
||||
const editCls = ifCompare && ifData ? 'text-danger' : '';
|
||||
return (
|
||||
<div>
|
||||
{preValue}
|
||||
<span className={editCls}>{`${adult_cost} ${currency} / ${t(`PriceUnit.${unit_id}`)}`}</span>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
key: 'child',
|
||||
title: t('AgeType.Child'),
|
||||
width: '12rem',
|
||||
render: (_, { child_cost, currency, unit_id, unit_name, audit_state_id, lastedit_changed }) => {
|
||||
const _changed = parseJson(lastedit_changed);
|
||||
const ifCompare = colorize && !statesForHideEdited.includes(audit_state_id);
|
||||
const ifData = isNotEmpty(_changed.child_cost) || isNotEmpty(_changed.unit_id) || isNotEmpty(_changed.currency);
|
||||
const preValue =
|
||||
ifCompare && ifData ? (
|
||||
<div className='text-muted line-through '>{`${_changed.child_cost || child_cost} ${_changed.currency || currency} / ${t(`PriceUnit.${_changed.unit_id || unit_id}`)}`}</div>
|
||||
) : null;
|
||||
const editCls = ifCompare && ifData ? 'text-danger' : '';
|
||||
return (
|
||||
<div>
|
||||
{preValue}
|
||||
<span className={editCls}>{`${child_cost} ${currency} / ${t(`PriceUnit.${unit_id}`)}`}</span>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
// {key: 'unit', title: t('Unit'), },
|
||||
{
|
||||
key: 'groupSize',
|
||||
dataIndex: ['group_size_min'],
|
||||
title: t('group_size'),
|
||||
width: '6rem',
|
||||
render: (_, { audit_state_id, group_size_min, group_size_max, lastedit_changed }) => {
|
||||
const _changed = parseJson(lastedit_changed);
|
||||
const preValue =
|
||||
colorize && !statesForHideEdited.includes(audit_state_id) && (isNotEmpty(_changed.group_size_min) || isNotEmpty(_changed.group_size_max)) ? (
|
||||
<div className='text-muted line-through '>{`${_changed.group_size_min ?? group_size_min} - ${_changed.group_size_max ?? group_size_max}`}</div>
|
||||
) : null;
|
||||
const editCls = colorize && !statesForHideEdited.includes(audit_state_id) && (isNotEmpty(_changed.group_size_min) || isNotEmpty(_changed.group_size_max)) ? 'text-danger' : '';
|
||||
return (
|
||||
<div>
|
||||
{preValue}
|
||||
<span className={editCls}>{formatGroupSize(group_size_min, group_size_max)}</span>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
key: 'useDates',
|
||||
dataIndex: ['use_dates_start'],
|
||||
title: t('use_dates'),
|
||||
width: '12rem',
|
||||
render: (_, { use_dates_start, use_dates_end, weekdays, audit_state_id, lastedit_changed }) => {
|
||||
const _changed = parseJson(lastedit_changed);
|
||||
const preValue =
|
||||
colorize && !statesForHideEdited.includes(audit_state_id) && (isNotEmpty(_changed.use_dates_start) || isNotEmpty(_changed.use_dates_end)) ? (
|
||||
<div className='text-muted'>
|
||||
{isNotEmpty(_changed.use_dates_start) ? <span className=' line-through '>{_changed.use_dates_start}</span> : use_dates_start} ~{' '}
|
||||
{isNotEmpty(_changed.use_dates_end) ? <span className='t line-through '>{_changed.use_dates_end}</span> : use_dates_end}
|
||||
</div>
|
||||
) : null;
|
||||
const editCls = colorize && !statesForHideEdited.includes(audit_state_id) && (isNotEmpty(_changed.use_dates_start) || isNotEmpty(_changed.use_dates_end)) ? 'text-danger' : '';
|
||||
return (
|
||||
<div>
|
||||
{preValue}
|
||||
<span className={editCls}>{`${use_dates_start} ~ ${use_dates_end}`}</span>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
key: 'weekdays',
|
||||
dataIndex: ['weekdays'],
|
||||
title: t('Weekdays'),
|
||||
width: '6rem',
|
||||
render: (text, { weekdays, audit_state_id, lastedit_changed }) => {
|
||||
const _changed = parseJson(lastedit_changed);
|
||||
const ifCompare = colorize && !statesForHideEdited.includes(audit_state_id);
|
||||
const ifData = !isEmpty(_changed.weekdays);
|
||||
const _weekdays = ifData
|
||||
? _changed.weekdays
|
||||
.split(',')
|
||||
.filter(Boolean)
|
||||
.map((w) => t(`common:weekdaysShort.${w}`))
|
||||
.join(', ')
|
||||
: '';
|
||||
const preValue = ifCompare && ifData ? <div className='text-muted line-through '>{_weekdays}</div> : null;
|
||||
const editCls = ifCompare && ifData ? 'text-danger' : '';
|
||||
const weekdaysTxt = weekdays
|
||||
.split(',')
|
||||
.filter(Boolean)
|
||||
.map((w) => t(`common:weekdaysShort.${w}`))
|
||||
.join(', ');
|
||||
return (
|
||||
<div>
|
||||
{preValue}
|
||||
<span className={editCls}>{weekdaysTxt || t('Unlimited')}</span>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
];
|
||||
|
||||
const useLogMethod = (method) => {
|
||||
const { t } = useTranslation('products');
|
||||
const methodMap = {
|
||||
'history': {
|
||||
title: '📑' + t('versionHistory'),
|
||||
btnText: t('versionHistory'),
|
||||
fetchData: async (params) => {
|
||||
const data = await getPPLogAction(params);
|
||||
return { data };
|
||||
},
|
||||
},
|
||||
'published': {
|
||||
title: '✅' + t('versionPublished'),
|
||||
btnText: t('versionPublished'),
|
||||
fetchData: async (params) => {
|
||||
const { travel_agency_id, product_id, price_id, use_year } = params;
|
||||
const data = await getPPRunningAction({ travel_agency_id, product_id_list: product_id, use_year });
|
||||
return { data: data?.[0]?.quotation || [] };
|
||||
},
|
||||
},
|
||||
'snapshot': {
|
||||
title: '📷' + t('versionSnapshot'),
|
||||
btnText: t('versionSnapshot'),
|
||||
fetchData: async (params) => {
|
||||
const { price_id, ..._params } = params;
|
||||
const data = await getPPSnapshotAction(_params);
|
||||
return data; //?.[0]?.quotation || [];
|
||||
},
|
||||
},
|
||||
};
|
||||
return methodMap[method];
|
||||
};
|
||||
|
||||
/**
|
||||
* ProductQuotationLogPopover - A popover component that displays product quotation change logs or published data
|
||||
*
|
||||
* This component shows a history of price changes for a specific product quotation in a popover table.
|
||||
* It supports displaying different data sources (history logs or published data) and shows
|
||||
* comparison between previous and current values with visual indicators.
|
||||
*
|
||||
* @param {Object} props - Component props
|
||||
* @param {string} props.btnText - The text to display on the trigger button and in the popover header
|
||||
* @param {'history' | 'published' | 'snapshot'} props.method - Determines data source - "history" for change logs or "published" for published quotations
|
||||
* @param {Object} props.triggerProps - Additional props to pass to the trigger button
|
||||
* @param {number} props.travel_agency_id - ID of the travel agency (used in data fetching)
|
||||
* @param {number} props.product_id - ID of the product (used in data fetching)
|
||||
* @param {number} props.price_id - ID of the price entry (used in data fetching)
|
||||
* @param {number} props.use_year - Year to use for fetching data (used in data fetching)
|
||||
* @param {Function} props.onOpenChange - Callback function to be called when the popover opens or closes
|
||||
*/
|
||||
const ProductQuotationLogPopover = ({ method, triggerProps = {}, onOpenChange, ...props }) => {
|
||||
const { travel_agency_id, product_id, price_id, use_year } = props;
|
||||
const { travelAgencyId } = usingStorage();
|
||||
|
||||
const { t } = useTranslation('products');
|
||||
const [open, setOpen] = useState(false);
|
||||
const [logData, setLogData] = useState([]);
|
||||
|
||||
const { title, btnText: methodBtnText, fetchData } = useLogMethod(method);
|
||||
|
||||
const tablePagination = useMemo(() => method === 'history' ? { pageSize: 5, position: ['bottomLeft']} : { pageSize: 10, position: ['bottomLeft']}, [method]);
|
||||
|
||||
const [loading, setLoading] = useState(false);
|
||||
const getData = async () => {
|
||||
setLoading(true);
|
||||
const { data } = await fetchData({ travel_agency_id: travel_agency_id || travelAgencyId, product_id, price_id, use_year });
|
||||
setLogData(data);
|
||||
invokeOpenChange(true);
|
||||
setLoading(false);
|
||||
};
|
||||
|
||||
const invokeOpenChange = (_open) => {
|
||||
if (typeof onOpenChange === 'function') {
|
||||
onOpenChange(_open);
|
||||
}
|
||||
};
|
||||
|
||||
const columns = [...columnsSets(t, false),
|
||||
{ title: t('common:time'), dataIndex: 'updatetime', key: 'updatetime', width: '10rem', },
|
||||
{ title: t('common:operator'), dataIndex: 'update_by', key: 'update_by' }
|
||||
];
|
||||
return (
|
||||
<Popover
|
||||
placement='bottom'
|
||||
className=''
|
||||
rootClassName='w-5/6'
|
||||
{...props}
|
||||
title={
|
||||
<div className='flex justify-between mt-0 gap-4 items-center '>
|
||||
<Typography.Text strong>{title}</Typography.Text>
|
||||
<Button
|
||||
size='small'
|
||||
onClick={() => {
|
||||
setOpen(false);
|
||||
invokeOpenChange(false);
|
||||
}}>
|
||||
×
|
||||
</Button>
|
||||
</div>
|
||||
}
|
||||
content={
|
||||
<>
|
||||
<Table columns={columns} dataSource={logData} rowKey={'id'} size='small' loading={loading} pagination={tablePagination} />
|
||||
</>
|
||||
}
|
||||
trigger={['click']}
|
||||
open={open}
|
||||
onOpenChange={(v) => {
|
||||
setOpen(v);
|
||||
invokeOpenChange(v);
|
||||
}}>
|
||||
<Button {...triggerProps} onClick={getData} title={title}>
|
||||
{props.btnText || methodBtnText}
|
||||
</Button>
|
||||
</Popover>
|
||||
);
|
||||
};
|
||||
export default ProductQuotationLogPopover;
|
||||
@ -1,299 +0,0 @@
|
||||
import { useState, useMemo } from 'react';
|
||||
import { Button, Table, Popover, Typography, List, Flex } from 'antd';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { HT_HOST } from '@/config';
|
||||
import { fetchJSON } from '@/utils/request';
|
||||
import { formatGroupSize } from '@/hooks/useProductsSets';
|
||||
import { isEmpty, isNotEmpty } from '@/utils/commons';
|
||||
import { chunkBy } from '@/hooks/useProductsQuotationFormat';
|
||||
|
||||
/**
|
||||
* 产品价格日志
|
||||
*/
|
||||
const getPPLogAction = async (params) => {
|
||||
const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/agency_product_price_log`, params)
|
||||
return errcode !== 0 ? [] : result;
|
||||
};
|
||||
|
||||
/**
|
||||
* 产品价格: 已发布的
|
||||
*/
|
||||
const getPPRunningAction = async (params) => {
|
||||
const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/agency_product_price_running`, params)
|
||||
return errcode !== 0 ? [] : result;
|
||||
};
|
||||
|
||||
/**
|
||||
* 产品价格快照
|
||||
*/
|
||||
const getPPSnapshotAction = async (params) => {
|
||||
const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/agency_product_price_snapshot`, params)
|
||||
return errcode !== 0 ? [] : result;
|
||||
}
|
||||
|
||||
const parseJson = (str) => {
|
||||
let result;
|
||||
if (str === null || str === undefined || str === '') {
|
||||
return {};
|
||||
}
|
||||
try {
|
||||
result = JSON.parse(str);
|
||||
return Array.isArray(result) ? result.reduce((acc, cur) => ({ ...acc, ...cur }), {}) : result;
|
||||
} catch (e) {
|
||||
return {};
|
||||
}
|
||||
};
|
||||
|
||||
export const columnsSets = (t, colorize = true) => [
|
||||
{
|
||||
key: 'adult',
|
||||
title: t('AgeType.Adult'),
|
||||
width: '12rem',
|
||||
render: (_, { adult_cost, currency, unit_id, unit_name, audit_state_id, lastedit_changed }) => {
|
||||
const _changed = parseJson(lastedit_changed);
|
||||
const ifCompare = colorize && ![-1, 1, 2].includes(audit_state_id);
|
||||
const ifData = isNotEmpty(_changed.adult_cost) || isNotEmpty(_changed.unit_id) || isNotEmpty(_changed.currency);
|
||||
const preValue =
|
||||
ifCompare && ifData ? (
|
||||
<div className='text-muted line-through '>{`${_changed.adult_cost} ${_changed.currency || currency} / ${t(`PriceUnit.${_changed.unit_id || unit_id}`)}`}</div>
|
||||
) : null;
|
||||
const editCls = ifCompare && ifData ? 'text-danger' : '';
|
||||
return (
|
||||
<div>
|
||||
{preValue}
|
||||
<span className={editCls}>{`${adult_cost} ${currency} / ${t(`PriceUnit.${unit_id}`)}`}</span>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
key: 'child',
|
||||
title: t('AgeType.Child'),
|
||||
width: '12rem',
|
||||
render: (_, { child_cost, currency, unit_id, unit_name, audit_state_id, lastedit_changed }) => {
|
||||
const _changed = parseJson(lastedit_changed);
|
||||
const ifCompare = colorize && ![-1, 1, 2].includes(audit_state_id);
|
||||
const ifData = isNotEmpty(_changed.child_cost) || isNotEmpty(_changed.unit_id) || isNotEmpty(_changed.currency);
|
||||
const preValue =
|
||||
ifCompare && ifData ? (
|
||||
<div className='text-muted line-through '>{`${_changed.child_cost} ${_changed.currency || currency} / ${t(`PriceUnit.${_changed.unit_id || unit_id}`)}`}</div>
|
||||
) : null;
|
||||
const editCls = ifCompare && ifData ? 'text-danger' : '';
|
||||
return (
|
||||
<div>
|
||||
{preValue}
|
||||
<span className={editCls}>{`${child_cost} ${currency} / ${t(`PriceUnit.${unit_id}`)}`}</span>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
// {key: 'unit', title: t('Unit'), },
|
||||
{
|
||||
key: 'groupSize',
|
||||
dataIndex: ['group_size_min'],
|
||||
title: t('group_size'),
|
||||
width: '6rem',
|
||||
render: (_, { audit_state_id, group_size_min, group_size_max, lastedit_changed }) => {
|
||||
const _changed = parseJson(lastedit_changed);
|
||||
const preValue =
|
||||
colorize && ![-1, 1, 2].includes(audit_state_id) && (isNotEmpty(_changed.group_size_min) || isNotEmpty(_changed.group_size_max)) ? (
|
||||
<div className='text-muted line-through '>{`${_changed.group_size_min ?? group_size_min} - ${_changed.group_size_max ?? group_size_max}`}</div>
|
||||
) : null;
|
||||
const editCls = colorize && ![-1, 1, 2].includes(audit_state_id) && (isNotEmpty(_changed.group_size_min) || isNotEmpty(_changed.group_size_max)) ? 'text-danger' : '';
|
||||
return (
|
||||
<div>
|
||||
{preValue}
|
||||
<span className={editCls}>{formatGroupSize(group_size_min, group_size_max)}</span>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
key: 'useDates',
|
||||
dataIndex: ['use_dates_start'],
|
||||
title: t('use_dates'),
|
||||
width: '12rem',
|
||||
render: (_, { use_dates_start, use_dates_end, weekdays, audit_state_id, lastedit_changed }) => {
|
||||
const _changed = parseJson(lastedit_changed);
|
||||
const preValue =
|
||||
colorize && ![-1, 1, 2].includes(audit_state_id) && (isNotEmpty(_changed.use_dates_start) || isNotEmpty(_changed.use_dates_end)) ? (
|
||||
<div className='text-muted'>
|
||||
{isNotEmpty(_changed.use_dates_start) ? <span className=' line-through '>{_changed.use_dates_start}</span> : use_dates_start} ~{' '}
|
||||
{isNotEmpty(_changed.use_dates_end) ? <span className='t line-through '>{_changed.use_dates_end}</span> : use_dates_end}
|
||||
</div>
|
||||
) : null;
|
||||
const editCls = colorize && ![-1, 1, 2].includes(audit_state_id) && (isNotEmpty(_changed.use_dates_start) || isNotEmpty(_changed.use_dates_end)) ? 'text-danger' : '';
|
||||
return (
|
||||
<div>
|
||||
{preValue}
|
||||
<span className={editCls}>{`${use_dates_start} ~ ${use_dates_end}`}</span>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
key: 'weekdays',
|
||||
dataIndex: ['weekdays'],
|
||||
title: t('Weekdays'),
|
||||
width: '6rem',
|
||||
render: (text, { weekdays, audit_state_id, lastedit_changed }) => {
|
||||
const _changed = parseJson(lastedit_changed);
|
||||
const ifCompare = colorize && ![-1, 1, 2].includes(audit_state_id);
|
||||
const ifData = !isEmpty((_changed.weekdayList || []).filter((s) => s));
|
||||
const preValue = ifCompare && ifData ? <div className='text-muted line-through '>{_changed.weekdayList}</div> : null;
|
||||
const editCls = ifCompare && ifData ? 'text-danger' : '';
|
||||
return (
|
||||
<div>
|
||||
{preValue}
|
||||
<span className={editCls}>{text || t('Unlimited')}</span>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
];
|
||||
|
||||
const useLogMethod = (method) => {
|
||||
const { t } = useTranslation('products');
|
||||
const methodMap = {
|
||||
'history': {
|
||||
title: '📑' + t('versionHistory'),
|
||||
btnText: t('versionHistory'),
|
||||
fetchData: async (params) => {
|
||||
const data = await getPPLogAction(params);
|
||||
return {data};
|
||||
},
|
||||
},
|
||||
'published': {
|
||||
title: '✅' + t('versionPublished'),
|
||||
btnText: t('versionPublished'),
|
||||
fetchData: async (params) => {
|
||||
const { travel_agency_id, product_id, price_id, use_year } = params;
|
||||
const data = await getPPRunningAction({ travel_agency_id, product_id_list: product_id, use_year });
|
||||
return {data: data?.[0]?.quotation || []};
|
||||
},
|
||||
},
|
||||
'snapshot': {
|
||||
title: '📷' + t('versionSnapshot'),
|
||||
btnText: t('versionSnapshot'),
|
||||
subTitle: t('点击左侧价格版本查看具体价格'),
|
||||
fetchData: async (params) => {
|
||||
const { price_id, ..._params } = params;
|
||||
const data = await getPPSnapshotAction(_params);
|
||||
return {data}; //?.[0]?.quotation || [];
|
||||
},
|
||||
},
|
||||
};
|
||||
return methodMap[method];
|
||||
};
|
||||
|
||||
/**
|
||||
* ProductQuotationLogPopover - A popover component that displays product quotation change logs or published data
|
||||
*
|
||||
* This component shows a history of price changes for a specific product quotation in a popover table.
|
||||
* It supports displaying different data sources (history logs or published data) and shows
|
||||
* comparison between previous and current values with visual indicators.
|
||||
*
|
||||
* @param {Object} props - Component props
|
||||
* @param {string} props.btnText - The text to display on the trigger button and in the popover header
|
||||
* @param {'history' | 'published' | 'snapshot'} props.method - Determines data source - "history" for change logs or "published" for published quotations
|
||||
* @param {Object} props.triggerProps - Additional props to pass to the trigger button
|
||||
* @param {number} props.travel_agency_id - ID of the travel agency (used in data fetching)
|
||||
* @param {number} props.product_id - ID of the product (used in data fetching)
|
||||
* @param {number} props.price_id - ID of the price entry (used in data fetching)
|
||||
* @param {number} props.use_year - Year to use for fetching data (used in data fetching)
|
||||
* @param {Function} props.onOpenChange - Callback function to be called when the popover opens or closes
|
||||
*/
|
||||
const ProductQuotationSnapshotPopover = ({ method, triggerProps = {}, onOpenChange, ...props }) => {
|
||||
const { travel_agency_id, product_id, price_id, use_year } = props;
|
||||
|
||||
const { t } = useTranslation('products');
|
||||
const [open, setOpen] = useState(false);
|
||||
const [logData, setLogData] = useState([]);
|
||||
|
||||
const { title, subTitle, btnText: methodBtnText, fetchData } = useLogMethod(method);
|
||||
|
||||
const tablePagination = useMemo(() => method === 'history' ? { pageSize: 5, position: ['bottomLeft']} : { pageSize: 10, position: ['bottomLeft']}, [method]);
|
||||
|
||||
const [viewSnapshotItem, setViewSnapshotItem] = useState([]);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const getData = async () => {
|
||||
setLoading(true);
|
||||
const { data } = await fetchData({ travel_agency_id, product_id, price_id, use_year });
|
||||
setLogData(data);
|
||||
invokeOpenChange(true);
|
||||
setLoading(false);
|
||||
};
|
||||
|
||||
const invokeOpenChange = (_open) => {
|
||||
if (typeof onOpenChange === 'function') {
|
||||
onOpenChange(_open);
|
||||
}
|
||||
};
|
||||
|
||||
const onClickSnapshotItem = (item) => {
|
||||
console.log(item)
|
||||
setViewSnapshotItem(item);
|
||||
console.log('cc\n');
|
||||
const chunk = chunkBy(2025, [{...item, quotation: item.quotation.map(q => ({...q, WPI_SN: product_id })), info: { id: product_id }}], ['quote_season', 'quote_size']);
|
||||
console.log(chunk)
|
||||
};
|
||||
|
||||
const columns = [...columnsSets(t, false), { title: '时间', dataIndex: 'updatetime', key: 'updatetime' }];
|
||||
return (
|
||||
<Popover
|
||||
placement='bottom'
|
||||
className=''
|
||||
rootClassName='w-5/6'
|
||||
{...props}
|
||||
title={
|
||||
<div className='flex mt-0 gap-4 items-center '>
|
||||
<Typography.Text strong>{title}</Typography.Text>
|
||||
{subTitle && <Typography.Text type='secondary'>{subTitle}</Typography.Text>}
|
||||
<Button
|
||||
size='small' className='ml-auto'
|
||||
onClick={() => {
|
||||
setOpen(false);
|
||||
invokeOpenChange(false);
|
||||
}}>
|
||||
×
|
||||
</Button>
|
||||
</div>
|
||||
}
|
||||
content={
|
||||
<>
|
||||
<Flex direction='column' gap='small'>
|
||||
<List
|
||||
bordered
|
||||
dataSource={logData}
|
||||
loading={loading}
|
||||
renderItem={(item) => (
|
||||
<List.Item onClick={() => onClickSnapshotItem(item)} className={viewSnapshotItem.version === item.version ? 'active' : ''}>
|
||||
{item.version}
|
||||
</List.Item>
|
||||
)}
|
||||
pagination={{ pageSize: 5, size: 'small', showLessItems: true, simple: { readOnly: true } }}
|
||||
className=' cursor-pointer basis-48 flex flex-col [&>*:first-child]:flex-1 [&_.ant-list-pagination]:m-1 [&_.ant-list-item]:py-1 [&_.ant-list-item.active]:bg-blue-100'
|
||||
/>
|
||||
<div className='flex-auto'>
|
||||
<Table columns={columns} dataSource={viewSnapshotItem.quotation} rowKey={'id'} size='small' loading={loading} pagination={tablePagination} />
|
||||
</div>
|
||||
</Flex>
|
||||
</>
|
||||
}
|
||||
trigger={['click']}
|
||||
open={open}
|
||||
onOpenChange={(v) => {
|
||||
setOpen(v);
|
||||
invokeOpenChange(v);
|
||||
if (v === false) {
|
||||
setLogData([]);
|
||||
setViewSnapshotItem([]);
|
||||
}
|
||||
}}>
|
||||
<Button {...triggerProps} onClick={getData} title={title}>
|
||||
{props.btnText || methodBtnText}
|
||||
</Button>
|
||||
</Popover>
|
||||
);
|
||||
};
|
||||
export default ProductQuotationSnapshotPopover;
|
||||
@ -1,40 +0,0 @@
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { Row, DatePicker, Flex, Col, Typography } from "antd";
|
||||
import dayjs from "dayjs";
|
||||
import { usingStorage } from "@/hooks/usingStorage";
|
||||
|
||||
function PickYear() {
|
||||
const navigate = useNavigate();
|
||||
const { travelAgencyId } = usingStorage();
|
||||
|
||||
return (
|
||||
<>
|
||||
<Row justify="center">
|
||||
<Col span={4}>
|
||||
<Flex gap="middle" vertical>
|
||||
<Typography.Title className="text-center" level={3}>
|
||||
请选择产品年份
|
||||
</Typography.Title>
|
||||
<DatePicker
|
||||
className="w-full"
|
||||
size="large"
|
||||
variant="underlined"
|
||||
needConfirm
|
||||
inputReadOnly={true}
|
||||
minDate={dayjs('2022-01-01')}
|
||||
maxDate={dayjs().add(2, "year")}
|
||||
allowClear={false}
|
||||
picker="year"
|
||||
open={true}
|
||||
onOk={(date) => {
|
||||
const useYear = date.year();
|
||||
navigate(`/products/${travelAgencyId}/${useYear}/all/edit`);
|
||||
}}
|
||||
/>
|
||||
</Flex>
|
||||
</Col>
|
||||
</Row>
|
||||
</>
|
||||
);
|
||||
}
|
||||
export default PickYear;
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,65 +0,0 @@
|
||||
import { Button } from 'antd';
|
||||
import { useProductsAuditStatesMapVal, useProductsTypesMapVal } from '@/hooks/useProductsSets';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import useProductsStore, { getAgencyAllExtrasAction } from '@/stores/Products/Index';
|
||||
import RequireAuth from '@/components/RequireAuth';
|
||||
import { PERM_PRODUCTS_OFFER_AUDIT } from '@/config';
|
||||
import dayjs from 'dayjs';
|
||||
|
||||
import AgencyContract from '../Print/AgencyContract';
|
||||
import { saveAs } from 'file-saver';
|
||||
import { Packer } from 'docx';
|
||||
import { isEmpty } from '@/utils/commons';
|
||||
|
||||
const ExportDocxBtn = ({ params = { travel_agency_id: '', use_year: '', audit_state: '' }, ...props }) => {
|
||||
const { t } = useTranslation();
|
||||
const [agencyProducts] = useProductsStore((state) => [state.agencyProducts]);
|
||||
const [activeAgency] = useProductsStore((state) => [state.activeAgency]);
|
||||
const { travel_agency_id, use_year, audit_state } = params;
|
||||
|
||||
const auditStatesMap = useProductsAuditStatesMapVal();
|
||||
const productsTypesMapVal = useProductsTypesMapVal();
|
||||
|
||||
const { getRemarkList } = useProductsStore((selector) => ({
|
||||
getRemarkList: selector.getRemarkList,
|
||||
}));
|
||||
const handleDownload = async () => {
|
||||
// await refresh();
|
||||
const _agencyExtras = await getAgencyAllExtrasAction(params);
|
||||
const agencyExtras = Object.keys(_agencyExtras).reduce((acc, pid) => {
|
||||
const pitemExtras = _agencyExtras[pid];
|
||||
const _pitem = (pitemExtras || []).map(eitem => ({ ...eitem, info: { ...eitem.info, product_type_name_txt: productsTypesMapVal[eitem.info.product_type_id]?.label || eitem.info.product_type_name } } ));
|
||||
return { ...acc, [pid]: _pitem };
|
||||
}, {});
|
||||
const remarks = await getRemarkList();
|
||||
const remarksMappedByType = remarks.reduce((r, v) => ({ ...r, [v.product_type_id]: v }), {});
|
||||
const documentCreator = new AgencyContract();
|
||||
const doc = documentCreator.create([
|
||||
params,
|
||||
activeAgency,
|
||||
agencyProducts,
|
||||
agencyExtras,
|
||||
// remarks,
|
||||
remarksMappedByType,
|
||||
]);
|
||||
|
||||
const _d = dayjs().format('YYYYMMDD_HH.mm.ss.SSS'); // Date.now().toString(32)
|
||||
// console.log(params);
|
||||
const _state = isEmpty(audit_state) ? '' : auditStatesMap[audit_state].label;
|
||||
Packer.toBlob(doc).then((blob) => {
|
||||
saveAs(blob, `${activeAgency.travel_agency_name}${use_year}年地接合同-${_state}-${_d}.docx`);
|
||||
});
|
||||
};
|
||||
return (
|
||||
<>
|
||||
{/* todo: export, 审核完成之后才能导出 */}
|
||||
<RequireAuth subject={PERM_PRODUCTS_OFFER_AUDIT}>
|
||||
<Button size='small' onClick={handleDownload}>
|
||||
{t('Export')} .docx
|
||||
</Button>
|
||||
{/* <PrintContractPDF /> */}
|
||||
</RequireAuth>
|
||||
</>
|
||||
);
|
||||
};
|
||||
export default ExportDocxBtn;
|
||||
Loading…
Reference in New Issue