From be392588db60fede04642f6dec682a31a740fdb2 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Fri, 9 Aug 2024 16:37:24 +0800 Subject: [PATCH] =?UTF-8?q?perf(=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86):=20f?= =?UTF-8?q?orm=20tooltip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/locales/en/products.json | 21 ++++++++++--------- public/locales/zh/products.json | 21 ++++++++++--------- src/views/products/Detail/ProductInfoForm.jsx | 8 +++---- .../products/Detail/ProductInfoQuotation.jsx | 18 ++++++++-------- 4 files changed, 35 insertions(+), 33 deletions(-) diff --git a/public/locales/en/products.json b/public/locales/en/products.json index e5e841c..f947430 100644 --- a/public/locales/en/products.json +++ b/public/locales/en/products.json @@ -124,22 +124,23 @@ "City": "起始城市，举例：北京", "Dept": "Department", "Duration": "", - "RecommendsRate": "Recommends Rate", + "RecommendsRate": "", "OpenHours": "Open Hours", "OpenWeekdays": "Open Weekdays", - "DisplayToC": "Display Type", - "KM": "往返", - "Description": "Description", + "DisplayToC": "", + "KM": "", + "Description": "", "Remarks": "", + "UseDates": "数值越短，价格越优先。举例：英文导游1.1-12.31价300元， 8.1-8.31价400元，如走团时间为8月，自动取400元。", "NewTitle": { "6": "", - "B": "A点-B点，举例：桂林-龙胜", - "J": "A点-B点时长车费，举例：张家界5晚6天车费", - "Q": "城市语种导游工资单位，举例：北京英文导游工资（元/天/团）", + "B": "A点-B点（有疑议的需加往返/单程），举例：北京大兴机场-市区（单程）", + "J": "A点-B点时长车费（有疑议的需加往返/单程），举例：张家界高铁站-市区（车费，单程）", + "Q": "城市语种导游工资单位，举例：北京英语导游工资（元/天/团）", "7": "官方景点名称，举例：陕西历史博物馆", - "R": "普通、豪华、特色餐标，举例：普通餐标", - "8": "举例：故宫导游门票", - "D": "城市A点-B点时间包含内容，举例：北京市区一日游车导" + "R": "普通餐标、豪华餐标、特色餐标，举例：普通餐标", + "8": "举例：故宫导游门票、上海外滩深度游导游补助", + "D": "城市A点-B点时间包含内容，举例：北京市区一日游（车导）" }, "----Todo: 下面一组待定": "#", "6": { diff --git a/public/locales/zh/products.json b/public/locales/zh/products.json index 37cfb4f..eefd182 100644 --- a/public/locales/zh/products.json +++ b/public/locales/zh/products.json @@ -113,22 +113,23 @@ "City": "起始城市，举例：北京", "Dept": "Department", "Duration": "", - "RecommendsRate": "Recommends Rate", + "RecommendsRate": "", "OpenHours": "Open Hours", "OpenWeekdays": "Open Weekdays", - "DisplayToC": "Display Type", - "KM": "往返", - "Description": "Description", + "DisplayToC": "", + "KM": "", + "Description": "", "Remarks": "", + "UseDates": "数值越短，价格越优先。举例：英文导游1.1-12.31价300元， 8.1-8.31价400元，如走团时间为8月，自动取400元。", "NewTitle": { "6": "", - "B": "A点-B点，举例：桂林-龙胜", - "J": "A点-B点时长车费，举例：张家界5晚6天车费", - "Q": "城市语种导游工资单位，举例：北京英文导游工资（元/天/团）", + "B": "A点-B点（有疑议的需加往返/单程），举例：北京大兴机场-市区（单程）", + "J": "A点-B点时长车费（有疑议的需加往返/单程），举例：张家界高铁站-市区（车费，单程）", + "Q": "城市语种导游工资单位，举例：北京英语导游工资（元/天/团）", "7": "官方景点名称，举例：陕西历史博物馆", - "R": "普通、豪华、特色餐标，举例：普通餐标", - "8": "举例：故宫导游门票", - "D": "城市A点-B点时间包含内容，举例：北京市区一日游车导" + "R": "普通餐标、豪华餐标、特色餐标，举例：普通餐标", + "8": "举例：故宫导游门票、上海外滩深度游导游补助", + "D": "城市A点-B点时间包含内容，举例：北京市区一日游（车导）" } }, diff --git a/src/views/products/Detail/ProductInfoForm.jsx b/src/views/products/Detail/ProductInfoForm.jsx index 65bbc2e..65e6e0d 100644 --- a/src/views/products/Detail/ProductInfoForm.jsx +++ b/src/views/products/Detail/ProductInfoForm.jsx @@ -192,7 +192,7 @@ function getFields(props) { item( 'product_title', 99, - + , fieldProps?.product_title?.col || midCol @@ -200,7 +200,7 @@ function getFields(props) { item( 'code', 99, - + , fieldProps?.code?.col || midCol @@ -224,7 +224,7 @@ function getFields(props) { item( 'duration', 99, - + {/* */} , @@ -300,7 +300,7 @@ function getFields(props) { item( 'open_weekdays', 99, - + , fieldProps?.open_weekdays?.col || 24 diff --git a/src/views/products/Detail/ProductInfoQuotation.jsx b/src/views/products/Detail/ProductInfoQuotation.jsx index 21fae95..469aaa5 100644 --- a/src/views/products/Detail/ProductInfoQuotation.jsx +++ b/src/views/products/Detail/ProductInfoQuotation.jsx @@ -1,7 +1,7 @@ import { useState } from 'react' -import { Table, Form, Modal, Button, Radio, Input, Flex, Card, Select, InputNumber, Checkbox, DatePicker, Space, App } from 'antd' +import { Table, Form, Modal, Button, Radio, Input, Flex, Card, Select, InputNumber, Checkbox, DatePicker, Space, App, Tooltip } from 'antd' import { useTranslation } from 'react-i18next' -import { CloseOutlined, StarTwoTone, PlusOutlined, ExclamationCircleFilled } from '@ant-design/icons' +import { CloseOutlined, StarTwoTone, PlusOutlined, ExclamationCircleFilled, QuestionCircleOutlined, QuestionOutlined } from '@ant-design/icons' import { useDatePresets } from '@/hooks/useDatePresets' import dayjs from 'dayjs' import useProductsStore from '@/stores/Products/Index' @@ -202,14 +202,14 @@ const ProductInfoQuotation = ({ editable, ...props }) => { const quotationColumns = [ { title: 'id', dataIndex: 'id', width: 40, className: 'italic text-gray-400' }, // test: 0 { title: 'WPI_SN', dataIndex: 'WPI_SN', width: 40, className: 'italic text-gray-400' }, // test: 0 - { title: t('products:adultPrice'), dataIndex: 'adult_cost', width: '4rem' }, - { title: t('products:childrenPrice'), dataIndex: 'child_cost', width: '4rem' }, + { title: t('products:adultPrice'), dataIndex: 'adult_cost', width: '5rem' }, + { title: t('products:childrenPrice'), dataIndex: 'child_cost', width: '5rem' }, { title: t('products:currency'), dataIndex: 'currency', width: '4rem' }, { - title: t('products:Types'), + title: t('products:PriceUnit.title'), dataIndex: 'unit_id', width: '4rem', - render: (text) => (text === '0' ? '每人' : text === '1' ? '每团' : text), + render: (text) => t(`products:PriceUnit.${text}`), // (text === '0' ? '每人' : text === '1' ? '每团' : text), }, { title: t('products:number'), @@ -219,9 +219,9 @@ const ProductInfoQuotation = ({ editable, ...props }) => { }, { - title: t('products:validityPeriod'), + title: (<>{t('products:validityPeriod')} ), dataIndex: 'use_dates', - width: '6rem', + // width: '6rem', render: (_, record) => `${record.use_dates_start}-${record.use_dates_end}`, }, @@ -229,7 +229,7 @@ const ProductInfoQuotation = ({ editable, ...props }) => { { title: t('products:operation'), dataIndex: 'operation', - width: '3%', + width: '10rem', render: (_, quotation) => { // const _rowEditable = [-1,3].includes(quotation.audit_state_id); const _rowEditable = true; // test: 0