Haina
/
GHHub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	src/views/products/Detail/ProductInfoQuotation.jsx
perf/export-docx
Lei OT 11 months ago
parent 19fc024967 058e8ef33a
commit c8299b747b
4 changed files with 39 additions and 53 deletions
Show Stats Download Patch File Download Diff File

41
public/locales/en/products.json
Unescape Escape View File

@ -70,21 +70,13 @@
"adultPrice": "Adult price",
"childrenPrice": "Child price",
"currency": "Currency",
"Types": "Type",
"number": "Number",
"validityPeriod":"Validity period",
"operation": "Operation",
"price": "Price",
"weekends":"Weekends",
"Quotation": "Quotation",
"Offer": "Offer",
"Unit": "Unit",
"GroupSize": "Group Size",
"UseDates": "Use Dates",
"Weekdays": "Weekdays",
"unit_name": "类型",
"group_size": "人等",
"use_dates": "有效期",
"operation": "操作",
"price": "价格",
"Offer": "报价",
"Weekdays": "周末",
"OnWeekdays": "On Weekdays: ",
"Unlimited": "Unlimited",
@ -104,18 +96,15 @@
"requiredTypes": "Please select product types",
"requiredDept": "Please pick a owner department"
},
"quotationTable": {
"Adult": "Adult",
"Child": "Child",
"Currency": "Currency",
"Unit": "Unit",
"GroupSize": "Group Size",
"UseDates": "Use Dates",
"Operation": "Operation",
"Weekdays": "Weekdays"
"Validation": {
"adultPrice": "请输入成人价",
"childrenPrice": "请输入儿童价",
"currency": "请输入币种",
"unit_name": "请输入类型",
"group_size_min": "请输入人等",
"group_size_max": "请输入人等",
"use_dates": "请输入有效期"
},
"sureSubmitAudit": "确认提交所有产品审核? 提交后，所有产品将进入待审核流程. ",
"FormTooltip": {
"Type": "Product Type",

31
public/locales/zh/products.json
Unescape Escape View File

@ -67,17 +67,16 @@
"adultPrice": "成人价",
"childrenPrice": "儿童价",
"currency": "币种",
"Types": "类型",
"number": "人等",
"validityPeriod": "有效期",
"unit_name": "类型",
"group_size": "人等",
"use_dates": "有效期",
"operation": "操作",
"price": "价格",
"Quotation": "报价",
"Offer": "报价",
"Unit": "单位",
"GroupSize": "人等",
"UseDates": "使用日期",
"Weekdays": "周末",
"OnWeekdays": "周: ",
"Unlimited": "不限",
"UseYear": "年份",
@ -94,17 +93,15 @@
"requiredTypes": "请选择产品类型",
"requiredDept": "请选择所属小组"
},
"quotationTable": {
"Adult": "成人",
"Child": "儿童",
"Currency": "币种",
"Unit": "类型",
"GroupSize": "人等",
"UseDates": "使用日期",
"Weekdays": "周末",
"Operation": "Operation"
"Validation": {
"adultPrice": "请输入成人价",
"childrenPrice": "请输入儿童价",
"currency": "请输入币种",
"unit_name": "请输入类型",
"group_size_min": "请输入人等",
"group_size_max": "请输入人等",
"use_dates": "请输入有效期"
},
"sureSubmitAudit": "确认提交所有产品审核? 提交后，所有产品将进入待审核流程. ",
"FormTooltip": {
"Type": "Product Type",

4
src/views/App.jsx
Unescape Escape View File

@ -105,7 +105,7 @@ function App() {
<Layout className='min-h-screen'>
<Header className='sticky top-0 z-10 w-full'>
<Row gutter={{ md: 24 }} justify='end' align='middle'>
<Col span={16}>
<Col span={15}>
<NavLink to='/'>
<img src={AppLogo} className='float-left h-9 my-4 mr-6 ml-0 bg-white/30' alt='App logo' />
</NavLink>
@ -132,7 +132,7 @@ function App() {
]}
/>
</Col>
<Col span={6}>
<Col span={7}>
<h3 className='text-white mb-0 line-clamp-1 text-end'>
{currentUser?.travelAgencyName}
</h3>

16
src/views/products/Detail/ProductInfoQuotation.jsx
Unescape Escape View File

@ -1,5 +1,5 @@
import { useState } from 'react'
import { Table, Form, Modal, Button, Radio, Input, Flex, Card, Select, InputNumber, Checkbox, DatePicker, Space, App, Tooltip } from 'antd'
import { Table, Form, Modal, Button, Radio, Input, Flex, Card, InputNumber, Checkbox, DatePicker, Space, App, Tooltip } from 'antd'
import { useTranslation } from 'react-i18next'
import { CloseOutlined, StarTwoTone, PlusOutlined, ExclamationCircleFilled, QuestionCircleOutlined, QuestionOutlined } from '@ant-design/icons'
import { useDatePresets } from '@/hooks/useDatePresets'
@ -206,20 +206,20 @@ const ProductInfoQuotation = ({ editable, ...props }) => {
{ title: t('products:childrenPrice'), dataIndex: 'child_cost', width: '5rem' },
{ title: t('products:currency'), dataIndex: 'currency', width: '4rem' },
{
title: t('products:PriceUnit.title'),
title: t('products:unit_name'),
dataIndex: 'unit_id',
width: '4rem',
render: (text) => t(`products:PriceUnit.${text}`), // (text === '0' ? '每人' : text === '1' ? '每团' : text),
},
{
title: t('products:number'),
title: t('products:group_size'),
dataIndex: 'group_size',
width: '4rem',
render: (_, record) => `${record.group_size_min}-${record.group_size_max}`,
},
{
title: (<>{t('products:validityPeriod')} <Tooltip placement='top' overlayInnerStyle={{width: '24rem'}} title={t('products:FormTooltip.UseDates')}><QuestionCircleOutlined className='text-gray-500' /></Tooltip> </>),
title: (<>{t('products:use_dates')} <Tooltip placement='top' overlayInnerStyle={{width: '24rem'}} title={t('products:FormTooltip.UseDates')}><QuestionCircleOutlined className='text-gray-500' /></Tooltip> </>),
dataIndex: 'use_dates',
// width: '6rem',
render: (_, record) => `${record.use_dates_start}-${record.use_dates_end}`,
@ -414,7 +414,7 @@ const ProductInfoQuotation = ({ editable, ...props }) => {
</Radio.Group>
</Form.Item>
<Form.Item
label={t('products:Types')}
label={t('products:unit_name')}
name='unit_id'
rules={[
{
@ -429,7 +429,7 @@ const ProductInfoQuotation = ({ editable, ...props }) => {
</Radio.Group>
</Form.Item>
<Form.Item
label={t('products:number')}
label={t('products:group_size')}
name='group_size_min'
rules={[
{
@ -441,7 +441,7 @@ const ProductInfoQuotation = ({ editable, ...props }) => {
<InputNumber style={{ width: '100%' }} />
</Form.Item>
<Form.Item
label={t('products:number')}
label={t('products:group_size')}
name='group_size_max'
rules={[
{
@ -453,7 +453,7 @@ const ProductInfoQuotation = ({ editable, ...props }) => {
<InputNumber style={{ width: '100%' }} />
</Form.Item>
<Form.Item
label={t('products:validityPeriod')}
label={t('products:use_dates')}
name='use_dates'
rules={[
{

Write Preview
Loading…
Cancel
Save