diff --git a/public/locales/en/group.json b/public/locales/en/group.json index 4286b80..2083c6e 100644 --- a/public/locales/en/group.json +++ b/public/locales/en/group.json @@ -1,6 +1,7 @@ { "ArrivalDate": "Arrival Date", "RefNo": "Reference number", + "unconfirmed": "Unconfirmed", "Pax": "Pax", "Status": "Status", "City": "City", diff --git a/public/locales/zh/group.json b/public/locales/zh/group.json index 2f25071..5b18f89 100644 --- a/public/locales/zh/group.json +++ b/public/locales/zh/group.json @@ -1,6 +1,7 @@ { "ArrivalDate": "抵达日期", "RefNo": "团号", + "unconfirmed": "未确认", "Pax": "人数", "Status": "状态", "City": "城市", @@ -11,6 +12,5 @@ "ConfirmationDate": "确认日期", "ConfirmationDetails": "确认信息", "PNR": "旅客订座记录", - "#": "#" } diff --git a/src/components/SearchForm.jsx b/src/components/SearchForm.jsx index 1dcafe2..acfd6a3 100644 --- a/src/components/SearchForm.jsx +++ b/src/components/SearchForm.jsx @@ -1,5 +1,5 @@ import { useEffect } from 'react'; -import { Form, Input, Row, Col, Select, DatePicker, Space, Button } from 'antd'; +import { Form, Input, Row, Col, Select, DatePicker, Space, Button, Checkbox } from 'antd'; import { objectMapper, at } from '@/utils/commons'; import { DATE_FORMAT, SMALL_DATETIME_FORMAT } from '@/config'; import useFormStore from '@/stores/Form'; @@ -243,14 +243,6 @@ function getFields(props) { , fieldProps?.username?.col || 4 ), - item( - 'realname', - 99, - - - , - fieldProps?.realname?.col || 4 - ), /** * */ @@ -301,6 +293,14 @@ function getFields(props) { , fieldProps?.dept?.col || 6 ), + item( + 'unconfirmed', + 99, + + {t('group:unconfirmed')} + , + fieldProps?.unconfirmed?.col || 2 + ), ]; baseChildren = baseChildren .map((x) => { diff --git a/src/stores/Account.js b/src/stores/Account.js index 47abc92..f11f545 100644 --- a/src/stores/Account.js +++ b/src/stores/Account.js @@ -1,6 +1,6 @@ import { create } from 'zustand' import { fetchJSON, postForm } from '@/utils/request' -import { isEmpty } from '@/utils/commons' +import { isEmpty, isNotEmpty } from '@/utils/commons' import { HT_HOST } from "@/config" import { usingStorage } from '@/hooks/usingStorage' @@ -139,16 +139,18 @@ const useAccountStore = create((set, get) => ({ }, searchAccountByCriteria: async (formValues) => { - + let travel_agency_ids = null + if (isNotEmpty(formValues.agency)) { + travel_agency_ids = formValues.agency.map((ele) => ele.key).join(',') + } const searchParams = { username: formValues.username, - realname: formValues.realname, + travel_agency_ids: travel_agency_ids, lgc: 2 } const resultArray = await fetchAccountList(searchParams) - console.info(resultArray) const mapAccoutList = resultArray.map((r) => { return { accountId: r.wu_id, diff --git a/src/stores/Reservation.js b/src/stores/Reservation.js index 8990ae7..f777162 100644 --- a/src/stores/Reservation.js +++ b/src/stores/Reservation.js @@ -91,17 +91,18 @@ const useReservationStore = create((set, get) => ({ })) }, - fetchReservationList: (formVal, current=1) => { + fetchReservationList: (formValues, current=1) => { const { travelAgencyId } = usingStorage() const { reservationPage } = get() // 设置为 0，后端会重新计算总数，当跳转第 X 页时可用原来的总数。 - const totalNum = current == 1 ? 0 : reservationPage.total; + const totalNum = current == 1 ? 0 : reservationPage.total + const notConfirmValue = formValues.notConfirm ? 1 : 0 const fetchUrl = prepareUrl(HT_HOST + '/service-cusservice/GetPlanSearchList') .append('VEI_SN', travelAgencyId) - .append('GroupNo', formVal.referenceNo) - .append('DateStart', formVal.startdate) - .append('DateEnd', formVal.enddate) - .append('NotConfirm', '')//status)// Todo: 待解决 + .append('GroupNo', formValues.referenceNo) + .append('DateStart', formValues.startdate) + .append('DateEnd', formValues.enddate) + .append('NotConfirm', notConfirmValue) .append('TotalNum', totalNum) .append('PageSize', reservationPage.size) .append('PageIndex', current) diff --git a/src/views/App.jsx b/src/views/App.jsx index a9c4937..73abe43 100644 --- a/src/views/App.jsx +++ b/src/views/App.jsx @@ -17,7 +17,7 @@ import useAuthStore from '@/stores/Auth' import { useThemeContext } from '@/stores/ThemeContext' import { usingStorage } from '@/hooks/usingStorage' -import { PERM_ACCOUNT_MANAGEMENT, PERM_ROLE_NEW, PERM_OVERSEA, PERM_AIR_TICKET } from '@/config' +import { PERM_ACCOUNT_MANAGEMENT, PERM_ROLE_NEW, PERM_OVERSEA, PERM_AIR_TICKET, PERM_PRODUCTS_MANAGEMENT } from '@/config' const { Header, Content, Footer } = Layout; const { Title } = Typography; @@ -117,7 +117,7 @@ function App() { isPermitted(PERM_OVERSEA) ? { key: 'feedback', label: {t('menu.Feedback')} } : null, isPermitted(PERM_OVERSEA) ? { key: 'report', label: {t('menu.Report')} } : null, isPermitted(PERM_AIR_TICKET) ? { key: 'airticket', label: {t('menu.Airticket')} } : null, - { key: 'products', label: {t('menu.Products')} }, + isPermitted(PERM_PRODUCTS_MANAGEMENT) ? { key: 'products', label: {t('menu.Products')} } : null, { key: 'notice', label: ( diff --git a/src/views/account/Management.jsx b/src/views/account/Management.jsx index bb00571..5a8abdc 100644 --- a/src/views/account/Management.jsx +++ b/src/views/account/Management.jsx @@ -324,12 +324,12 @@ function Management() { {t('account:accountList')} { handelAccountSearch() diff --git a/src/views/products/Detail.jsx b/src/views/products/Detail.jsx index cab7064..7655105 100644 --- a/src/views/products/Detail.jsx +++ b/src/views/products/Detail.jsx @@ -1,9 +1,9 @@ import React, { useState, useEffect, useRef, useMemo } from 'react'; -import { Button, Card, Col, Row, Breadcrumb, Table, Popconfirm, Form, Input, InputNumber, Tag, Modal, Select, Tree } from 'antd'; +import { Button, Card, Col, Row, Breadcrumb, Table, Popconfirm, Form, Input, InputNumber, Tag, Modal, Select, Tree, FloatButton, DatePicker } from 'antd'; import { Link } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; import AddValidityWithWeekend from '@/views/products/Detail/addValidityWithWeekend'; -import { searchAgencyAction, getAgencyProductsAction } from '@/stores/Products/Index'; +import { getAgencyProductsAction } from '@/stores/Products/Index'; import { useProductsTypes } from '@/hooks/useProductsSets'; import Extras from './Detail/Extras'; import { groupBy } from '@/utils/commons'; @@ -12,9 +12,16 @@ import useProductsStore from '@/stores/Products/Index'; import { useHTLanguageSets } from '@/hooks/useHTLanguageSets'; import { useDefaultLgc } from '@/i18n/LanguageSwitcher'; import BatchImportPrice from './Detail/BatchImportPrice1'; +import dayjs from 'dayjs'; +import { PlusCircleFilled } from '@ant-design/icons'; +import { info } from 'autoprefixer'; +import { DeptSelector } from '@/components/DeptSelector'; +import { useDatePresets } from '@/hooks/useDatePresets'; + function Detail() { const { t } = useTranslation(); const [form] = Form.useForm(); + const { RangePicker } = DatePicker; const [editingid, setEditingid] = useState(''); const [tags, setTags] = useState([]); const [isModalVisible, setIsModalVisible] = useState(false); @@ -22,6 +29,7 @@ function Detail() { const [saveData, setSaveData] = useState(null); const [datePickerVisible, setDatePickerVisible] = useState(false); const [batchImportPriceVisible, setBatchImportPriceVisible] = useState(false); + const [quotationTableVisible, setQuotationTableVisible] = useState(false) const [currentid, setCurrentid] = useState(null); const [languageStatus, setLanguageStatus] = useState(null); const [selectedNodeid, setSelectedNodeid] = useState(null); @@ -33,25 +41,40 @@ function Detail() { const [quotation, setQuotation] = useState(null); const [lgc_details, setLgc_details] = useState(null); const [languageLabel, setLanguageLabel] = useState(null); + const [infoDataForId, setInfoDataForId] = useState(null); const { travel_agency_id } = useParams(); const { language } = useDefaultLgc(); const HTLanguageSets = useHTLanguageSets(); const { Search } = Input; - + const [addProductVisible, setAddProductVisible] = useState(false); const [editingProduct, setEditingProduct] = useProductsStore((state) => [state.editingProduct, state.setEditingProduct]); - + const [agencyProducts, setAgencyProducts] = useProductsStore((state) => [state.agencyProducts, state.setAgencyProducts]); + const { getAgencyProducts } = useProductsStore(); const [expandedKeys, setExpandedKeys] = useState([]); const [searchValue, setSearchValue] = useState(''); const [autoExpandParent, setAutoExpandParent] = useState(true); const [dataList, setDataList] = useState([]); const [defaultData, setDefaultData] = useState([]); const [batchImportData, setBatchImportData] = useState([]); + const [addProductType, setAddProductType] = useState(''); + const [addproductName, setAddProductName] = useState(''); + const [dataFetched, setDataFetched] = useState(false); // 添加一个标志位 + const [selectedNodeKey, setSelectedNodeKey] = useState(null); + const [selectedDays, setSelectedDays] = useState([]); + const [currentQuotationRecord, setCurrentQuotationRecord] = useState(null); + const presets = useDatePresets(); const handleBatchImportData = (data) => { setBatchImportData(data); }; + const days = [ + 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday' + ]; const productProject = { - "6": [], + "6": [ + { code: "code", name: t('products:Code'), nameKey: 'products:Code' }, + { code: "city_name", name: t('products:City'), nameKey: 'products:City' }, + ], "B": [ { code: "code", name: t('products:Code'), nameKey: 'products:Code' }, { code: "city_name", name: t('products:City'), nameKey: 'products:City' }, @@ -110,42 +133,45 @@ function Detail() { const languageLabel = matchedLanguage.label setLanguageLabel(languageLabel) setSelectedTag(languageLabel) - setRemainderLanguage(HTLanguageSets.filter(item => item.key !== language.toString())) - }, []); + // setRemainderLanguage(HTLanguageSets.filter(item => item.key !== language.toString())) + }, []); useEffect(() => { const fetchData = async () => { - const a = { travel_agency_id }; - const res = await getAgencyProductsAction(a); - const groupedProducts = groupBy(res.products, (row) => row.info.product_type_id); - - const generateTreeData = (productsTypes, productsData) => { - return productsTypes.map(type => ({ - title: type.label, - key: type.value, - selectable: false, - children: (productsData[type.value] || []).map(product => ({ - title: product.info.title, - key: `${type.value}-${product.info.id}`, - _raw: product, - })) - })); - }; - - - const treeData = generateTreeData(productsTypes, groupedProducts); - console.log("treeData", treeData) - setTreeData(treeData); - setProductsData(groupedProducts); - setDefaultData(treeData); - setDataList(flattenTreeData(treeData)); + if (productsTypes && !dataFetched) { + const agency_id = { travel_agency_id }; + await getAgencyProducts(agency_id); + console.log("agencyProducts", agencyProducts) + console.log("productsTypes", productsTypes) + const generateTreeData = (productsTypes, productsData) => { + return productsTypes.map(type => ({ + title: type.label, + key: type.value, + selectable: false, + children: (productsData[type.value] || []).map(product => ({ + title: product.info.title, + key: `${type.value}-${product.info.id}`, + _raw: product, + })) + })); + }; + + const treeData = generateTreeData(productsTypes, agencyProducts); + console.log("treeData", treeData) + setDataFetched(true); // 设置标志位为 true，表示数据已获取 + setTreeData(treeData); + setProductsData(agencyProducts); + setDefaultData(treeData); + setDataList(flattenTreeData(treeData)); + } + }; fetchData(); - }, [productsTypes]); + }, [agencyProducts, dataFetched]); const flattenTreeData = (tree) => { let flatList = []; @@ -218,6 +244,9 @@ function Detail() { const isEditing = (record) => record.id === editingid; const edit = (record) => { + // setQuotationTableVisible(true); + // setCurrentQuotationRecord(record); + console.log("record", record) form.setFieldsValue({ ...record }); setEditingid(record.id); }; @@ -237,7 +266,17 @@ function Detail() { delete newData[index].quotation delete newData[index].extras console.log("newData", newData) - setQuotation(newData); + + //按人等范围排序 + const sortedData = [...newData].sort((a, b) => { + // 首先按照 group_size_min 升序排序 + if (a.group_size_min !== b.group_size_min) { + return a.group_size_min - b.group_size_min; + } + // 如果 group_size_min 相同，则按照 group_size_max 升序排序 + return a.group_size_max - b.group_size_max; + }); + setQuotation(sortedData); setEditingid(''); } else { newData.push(restRow); @@ -253,12 +292,23 @@ function Detail() { const newData = [...quotation]; const index = newData.findIndex((item) => id === item.id); newData.splice(index, 1); - setQuotation(newData); + + //按人等范围排序 + const sortedData = [...newData].sort((a, b) => { + // 首先按照 group_size_min 升序排序 + if (a.group_size_min !== b.group_size_min) { + return a.group_size_min - b.group_size_min; + } + // 如果 group_size_min 相同，则按照 group_size_max 升序排序 + return a.group_size_max - b.group_size_max; + }); + + setQuotation(sortedData); }; const handleAdd = () => { const newData = { - id: `${quotation.length + 1}`, + // id: `${quotation.length + 1}`, value: '', currency: '', unit_name: '', @@ -280,8 +330,18 @@ function Detail() { setDatePickerVisible(true); }; + const quotationTableVisibleOK = () => { + setQuotationTableVisible(false); + } + const quotationTableVisibleCancel = () => { + setQuotationTableVisible(false); + } const handleDateChange = ({ dateRange, selectedDays }) => { + console.log("dateRange", dateRange) + console.log("selectedDays", selectedDays) + + // 计算周末 const weekdays = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']; let weekDayCount = selectedDays.map(day => weekdays.indexOf(day) + 1).sort().join(','); @@ -299,20 +359,22 @@ function Detail() { }; const handleDateOk = () => { - const { dateRange } = selectedDateData; - const dateRangeList = dateRange.split('-'); - const use_dates_start = dateRangeList[0]; - const use_dates_end = dateRangeList[1]; + let { dateRange } = selectedDateData; + console.log("handleDateOk_dateRange", dateRange) + const use_dates_start = dateRange[0]; + const use_dates_end = dateRange[1]; if (currentid !== null) { const newData = [...quotation]; const index = newData.findIndex((item) => currentid === item.id); if (index > -1) { newData[index].use_dates_start = use_dates_start; newData[index].use_dates_end = use_dates_end; + console.log("newData", newData) setQuotation(newData); setCurrentid(null); } } + setSelectedDateData({ dateRange: null, selectedDays: [] }) setDatePickerVisible(false); } @@ -329,8 +391,18 @@ function Detail() { // 将剩余的属性添加到 quotation 中 const newData = [...quotation, ...tempBatchImportData]; + //按人等范围排序 + const sortedData = [...newData].sort((a, b) => { + // 首先按照 group_size_min 升序排序 + if (a.group_size_min !== b.group_size_min) { + return a.group_size_min - b.group_size_min; + } + // 如果 group_size_min 相同，则按照 group_size_max 升序排序 + return a.group_size_max - b.group_size_max; + }); + // 更新状态来更新页面 - setQuotation(newData); + setQuotation(sortedData); setBatchImportPriceVisible(false); } @@ -358,8 +430,8 @@ function Detail() { if (dataIndex === 'currency' && editing) { inputNode = ( ); } @@ -448,10 +520,8 @@ function Detail() { const editable = isEditing(record); return editable ? ( - {/* handleSave(record.id)} style={{ marginRight: 8 }}>{t('Save')} */} - {/* {t('Cancel')} */} ) : ( @@ -507,17 +577,20 @@ function Detail() { let tempRemainderLanguage = remainderLanguage.filter((item) => { return item.label !== selectedTag; }) - console.log("AAAA", lgc_details) - console.log("selectTag", selectedTag) + const matchedLanguage = HTLanguageSets.find(HTLanguage => HTLanguage.label === selectedTag); - const languageKey = matchedLanguage.key - const tempLgc_details = { - ...lgc_details, [languageKey]: { - title: {}, + const languageKey = parseInt(matchedLanguage.key) + if (!(languageKey in lgc_details)) { + const tempLgc_details = { + ...lgc_details, [languageKey]: { + title: "", + lgc: languageKey, + descriptions: "" + } } + setLgc_details(tempLgc_details) } - console.log("languageKey", languageKey) setRemainderLanguage(tempRemainderLanguage) setTags([...tags, selectedTag]) @@ -532,37 +605,78 @@ function Detail() { const handleTagChange = (value) => { console.log("handleTagChange", value) setSelectedTag(value); - console.log("setSelectedTag", selectedTag) }; const handleChange = (field, value) => { - console.log("languageStatus", languageStatus) - console.log("...lgc_details[languageStatus]", { ...lgc_details[languageStatus] }) // 更新整个 lgc_details 对象 const updatedLgcDetails = { ...lgc_details, [languageStatus]: { ...lgc_details[languageStatus], [field]: value, lgc: languageStatus } }; + console.log("updatedLgcDetails", updatedLgcDetails) setLgc_details(updatedLgcDetails) - console.log("AAAAAAAAAAAAAA", lgc_details); }; + const handleDayClick = (day) => { + setSelectedDays((prevSelectedDays) => { + const updatedDays = prevSelectedDays.includes(day) + ? prevSelectedDays.filter((d) => d !== day) + : [...prevSelectedDays, day]; + return updatedDays; + }); + }; + //树组件方法 const handleNodeSelect = (_, { node }) => { + if (!node._raw.info.id) { + console.log("nodeNoID", node) + const infoData = node._raw.info + const newLgcDetails = node._raw.lgc_details + const fatherKey = node.key.split('-')[0]; + setSelectedNodeid(node.key); + setSelectedNodeKey(fatherKey); + form.setFieldsValue({ + info: { + title: infoData.title, + code: infoData.code, + product_type_name: infoData.product_type_name, + city_name: infoData.city_name, + remarks: infoData.remarks, + open_weekdays: infoData.open_weekdays, + recommends_rate: infoData.recommends_rate, + duration: infoData.duration, + dept: infoData.dept, + km: infoData.km, + dept_name: infoData.dept_name, + }, + lgc_details: { + lgc: language, + title: newLgcDetails[language]?.title || '', + descriptions: newLgcDetails[language]?.descriptions || '' + } + }) + return + } + + setTags([languageLabel]) // 如果点击的是同一个节点，不做任何操作 if (selectedNodeid === node.key) return; - const fatherKey = node.key.split('-')[0]; - setSelectedCategory(productProject[fatherKey]) + setSelectedNodeid(node.key); + const fatherKey = node.key.split('-')[0]; + setSelectedNodeKey(fatherKey); + console.log("node.key", node.key); + console.log("fatherKey", fatherKey) + setSelectedCategory(productProject[fatherKey]); setLanguageStatus(language); const matchedLanguage = HTLanguageSets.find(HTLanguage => HTLanguage.key === language.toString()); - const languageLabelRefresh = matchedLanguage.label - setLanguageLabel(languageLabelRefresh) - setSelectedTag(languageLabelRefresh) - setRemainderLanguage(HTLanguageSets.filter(item => item.key !== language.toString())) + const languageLabelRefresh = matchedLanguage.label; + setLanguageLabel(languageLabelRefresh); + setSelectedTag(languageLabelRefresh); + setRemainderLanguage(HTLanguageSets.filter(item => item.key !== language.toString())); setEditingProduct(node._raw); @@ -570,55 +684,186 @@ function Detail() { let initialQuotationData = null; let infoData = null; let lgcDetailsData = null; + console.log("productsData", productsData) + console.log("productsData[fatherKey]", productsData[fatherKey]) + console.log("node", node) + // console.log("node",node._raw) productsData[fatherKey].forEach(element => { - if (element.info.title === node.title) { + if (element.info.id === node._raw.info.id) { initialQuotationData = element.quotation; infoData = element.info; lgcDetailsData = element.lgc_details; - return true; } }); - console.log("infoData", infoData) + if (!node._raw.info.id) { + + } + + console.log("lgcDetailsData", lgcDetailsData) // 累积 lgc_details 数据 let newLgcDetails = {}; - lgcDetailsData.forEach(element => { - newLgcDetails[element.lgc] = element; - }); + if (lgcDetailsData) { + lgcDetailsData.forEach(element => { + newLgcDetails[element.lgc] = element; + }); + } + console.log("infoData", infoData) + console.log("laug", language) - // 一次性更新 lgc_details + if (node._raw.info.id) { + setInfoDataForId(infoData.id) + } setLgc_details(newLgcDetails); - setQuotation(initialQuotationData); // 使用 setTimeout 确保 lgc_details 已经更新 - form.setFieldsValue({ + if (node._raw.info.id) { + form.setFieldsValue({ + info: { + title: infoData.title, + code: infoData.code, + product_type_name: infoData.product_type_name, + city_name: infoData.city_name, + remarks: infoData.remarks, + open_weekdays: infoData.open_weekdays, + recommends_rate: infoData.recommends_rate, + duration: infoData.duration, + dept: infoData.dept, + km: infoData.km, + dept_name: infoData.dept_name, + }, + lgc_details: { + lgc: language, + title: newLgcDetails[language]?.title || '', + descriptions: newLgcDetails[language]?.descriptions || '' + } + }); + } + + }; + + const handelAddProduct = () => { + // 找到对应的产品类型节点 + const productTypeNode = treeData.find(item => item.key === addProductType); + console.log("productTypeNode", productTypeNode); + + if (productTypeNode) { + // 在 children 数组中插入新的产品节点 + const newChildren = [ + ...productTypeNode.children, + { + title: addproductName, + key: `${addProductType}-${Date.now()}`, // 使用时间戳作为唯一的 key + _raw: { + info: { code: '' }, + lgc_details: [], + quotation: [] + } + } + ]; + // 创建新的 treeData 数组，确保 React 能够检测到更改 + const newTreeData = treeData.map(item => { + if (item.key === addProductType) { + return { + ...item, + children: newChildren, + }; + } + return item; + }); + // 更新 treeData + setEditingProduct(null) + setTreeData(newTreeData); + } + + console.log("productData", productsData) + console.log("addProductType", addProductType) + let tempProductDataList = productsData[addProductType]; + + //初始化产品数据 + const newProduct = { info: { - title: infoData.title, - code: infoData.code, - product_type_name: infoData.product_type_name, - city_name: infoData.city_name, - remarks: infoData.remarks, - open_weekdays: infoData.open_weekdays, - recommends_rate: infoData.recommends_rate, - duration: infoData.duration, - dept: infoData.dept, - km: infoData.km, - dept_name: infoData.dept_name + code: 'addProduct' }, - lgc_details: { - lgc: language, - title: newLgcDetails[language]?.title || '', - descriptions: newLgcDetails[language]?.descriptions || '' - } - }); + quotation: [], + lgc_details: [] + } + tempProductDataList.push(newProduct); + console.log("tempProductDataList", tempProductDataList) + const newProductsData = { + ...productsData, // 假设使用了展开运算符来复制现有数组 + [addProductType]: tempProductDataList + }; + setProductsData(newProductsData); + console.log("newProductsData", newProductsData) + setAddProductVisible(false); }; const onSave = (values) => { - const tempData = values; - tempData['quotation'] = quotation; - setSaveData(tempData); - console.log("保存的数据", tempData) + // 找到匹配的树节点 + let matchedTreeData = treeData.find(treeKey => treeKey.key === selectedNodeKey); + if (matchedTreeData) { + // 找到匹配的子节点 + const matchedTreeDataChildren = matchedTreeData.children; + // 检查是否已存在具有 selectedNodeid 的子节点 + console.log("matchedTreeDataChildren", matchedTreeDataChildren) + console.log("selectedNodeid", selectedNodeid) + // if (matchedTreeDataChildren.some(child => child.key === selectedNodeid)) { + // console.log("Child with this ID already exists."); + // return; + // } + let tempTreeDataChildrenData = matchedTreeDataChildren.find(element => element.key === selectedNodeid); + console.log("tempTreeDataChildrenData", tempTreeDataChildrenData); + // if (tempTreeDataChildrenData) { + tempTreeDataChildrenData._raw = values; + console.log("tempTreeDataChildrenData改", tempTreeDataChildrenData) + console.log("treeData111111", treeData) + console.log("lgc_details", lgc_details) + tempTreeDataChildrenData._raw.lgc_details = lgc_details + // console.log("matchedTreeData", matchedTreeData) + // if (!matchedTreeData.children.some(element => element.key === selectedNodeid)) { + // console.log("重复了"); + // matchedTreeData.children.push(tempTreeDataChildrenData) + // console.log("matchedTreeData改", matchedTreeData) + // return; + // } + + + // } else { + // console.log("No matching child node found."); + // } + } else { + console.log("No matching tree node found."); + } + + + + + // if (infoDataForId) { + // // 创建新的 tempData 对象 + // const tempData = { + // ...values, + // info: { ...values.info, id: infoDataForId }, + // quotation: quotation, + // lgc_details: Object.values(lgc_details) + // }; + + // setSaveData(tempData); + // console.log("保存的数据", tempData); + // } else { + // // 创建新的 tempData 对象 + // const tempData = { + // ...values, + // info: { ...values.info }, + // quotation: quotation, + // lgc_details: Object.values(lgc_details) + // }; + + // setSaveData(tempData); + // console.log("保存的数据", tempData); + // } + }; return ( @@ -626,7 +871,10 @@ function Detail() { - + + + +

{t('products:EditComponents.info')}

- {selectedCategory.map((item, index) => ( - - - - {item.code === "duration" ? ( - - ) : (item.code === "display_to_c") ? ( - - ) : ( - - )} - - - ))} + {selectedCategory.map((item, index) => { + // const key = `${item.code}-${index}`; + // console.log(key); + return ( + + + {item.code === "duration" ? ( + + ) : (item.code === "display_to_c") ? ( + + ) : (item.code === "dept_name") ? ( + + ) : ( + + )} + + + ); + })} - {/* */} + {/* */} - {/* */} + {/* */}

{t('products:supplierQuotation')}

提交审核 - - - - {/* */} - - {/* */} + + + {/* */} + + {/* */} + } onClick={() => setAddProductVisible(true)} /> @@ -782,6 +1035,94 @@ function Detail() { ) } + + { + addProductVisible && ( + setAddProductVisible(false)} + > +

选择产品类别

+ + + +

新增产品名称

+ setAddProductName(e.target.value)} + /> + + ) + } + + {/* { + quotationTableVisible && ( + +

成人价

+ +

儿童价

+ +

币种

+ +

类型

+ + +

人等

+ +

有效期

+ +

周末

+ {days.map((day, index) => ( + + ))} + + + + ) + } */} ); } diff --git a/src/views/products/Detail/BatchImportPrice1.jsx b/src/views/products/Detail/BatchImportPrice1.jsx index 906b68f..71269ca 100644 --- a/src/views/products/Detail/BatchImportPrice1.jsx +++ b/src/views/products/Detail/BatchImportPrice1.jsx @@ -2,6 +2,7 @@ import React, { useState } from 'react'; import { Button, Card, Checkbox, Col, DatePicker, Form, Input, Row, Select, Space, Tag, Table, InputNumber } from 'antd'; import { CloseOutlined } from '@ant-design/icons'; import dayjs from 'dayjs'; +import { useDatePresets } from '@/hooks/useDatePresets'; const { Option } = Select; const { RangePicker } = DatePicker; @@ -13,7 +14,7 @@ const BatchImportPrice = ({ onBatchImportData }) => { const [checkedDays, setCheckedDays] = useState([]); const [tableData, setTableData] = useState([]); const [sendData, setSendData] = useState(null); - + const presets = useDatePresets(); // 获取当前年份 const currentYear = new Date().getFullYear(); const startOfYear = dayjs(new Date(currentYear, 0, 1)); @@ -330,10 +331,11 @@ const BatchImportPrice = ({ onBatchImportData }) => {
{periodFields.map((periodField, idx) => ( - - + {/* + /> */} + periodOpt.remove(periodField.name)} /> diff --git a/src/views/products/Detail/addValidityWithWeekend.jsx b/src/views/products/Detail/addValidityWithWeekend.jsx index 0ad9a74..8d90ee3 100644 --- a/src/views/products/Detail/addValidityWithWeekend.jsx +++ b/src/views/products/Detail/addValidityWithWeekend.jsx @@ -1,20 +1,22 @@ + import React, { useState } from 'react'; import { DatePicker, Button } from 'antd'; - +import dayjs from 'dayjs'; +import { useDatePresets } from '@/hooks/useDatePresets'; const addValidityWithWeekend = ({ onDateChange }) => { const dateFormat = 'YYYY/MM/DD'; const { RangePicker } = DatePicker; const [dateRange, setDateRange] = useState(null); const [selectedDays, setSelectedDays] = useState([]); - + const presets = useDatePresets(); const days = [ 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday' ]; + const handleChange = (date, dateString) => { - const range = dateString[0] + "-" + dateString[1]; - setDateRange(range); - onDateChange({ dateRange: range, selectedDays }); + console.log("dateString",dateString) + onDateChange({ dateRange: dateString, selectedDays }); }; @@ -24,7 +26,7 @@ const addValidityWithWeekend = ({ onDateChange }) => { const updatedDays = prevSelectedDays.includes(day) ? prevSelectedDays.filter((d) => d !== day) : [...prevSelectedDays, day]; - onDateChange({ dateRange, selectedDays: updatedDays }); + onDateChange({ dateRange, selectedDays: updatedDays }); return updatedDays; }); }; @@ -32,7 +34,7 @@ const addValidityWithWeekend = ({ onDateChange }) => { return (

Data

- + {}

Weekdays

{days.map((day, index) => ( @@ -51,3 +53,25 @@ const addValidityWithWeekend = ({ onDateChange }) => { }; export default addValidityWithWeekend; + + +// import React, { useState } from 'react'; +// import { DatePicker, Button } from 'antd'; +// import dayjs from 'dayjs'; +// import { useDatePresets } from '@/hooks/useDatePresets'; +// // import 'dayjs/locale/zh-cn'; // 引入中文语言包 + +// // const { RangePicker } = DatePicker; + +// const DateRangePicker = () => { +// const { RangePicker } = DatePicker; +// const presets = useDatePresets(); + + +// return ( +// <> +// +// ); +// }; + +// export default DateRangePicker; diff --git a/src/views/reservation/Newest.jsx b/src/views/reservation/Newest.jsx index b2330ab..9a02816 100644 --- a/src/views/reservation/Newest.jsx +++ b/src/views/reservation/Newest.jsx @@ -201,8 +201,9 @@ function Newest() {
+ handleInputGroupSize('group_size_min', currentQuotationRecord.id, 'group_size', value)} + style={{ width: '50%', marginRight: '10px' }} + /> + - + handleInputGroupSize('group_size_max', currentQuotationRecord.id, 'group_size', value)} + style={{ width: '50%', marginLeft: '10px' }} + /> +