Merge remote-tracking branch 'origin/dev/2025b' into dev/2025b

main
Lei OT 2 months ago
commit 0d5ffc1fc8

@ -44,7 +44,7 @@ const ProductInfoQuotation = ({ editable, ...props }) => {
const batchSetupInitialValues = {
'defList': [
//
//
{
'useDateList': [{'useDate': getYearRange(switchParams.use_year)}],
'unitId': '0',
@ -85,7 +85,7 @@ const ProductInfoQuotation = ({ editable, ...props }) => {
}
]
},
//
//
{
'useDateList': [
{
@ -293,7 +293,7 @@ const ProductInfoQuotation = ({ editable, ...props }) => {
{fields.map((field, index) => (
<Card
size='small'
title={index == 0 ? '旺季' : index == 1 ? '淡季' : '其他'}
title={index == 0 ? '全年' : index == 1 ? '特殊时间段' : '其他'}
key={field.key}
extra={index == 0 ? <StarTwoTone twoToneColor='#eb2f96' /> : <CloseOutlined onClick={() => {
remove(field.name)
@ -461,7 +461,7 @@ const ProductInfoQuotation = ({ editable, ...props }) => {
if (!groupMaxUnlimit) quotationForm.setFieldValue('group_size_max', 999)
setGroupSizeUnlimit(false)
}
}}>不分人等(0~1000)</Checkbox>
}}><span className='font-bold'>不分人等(0~1000)</span></Checkbox>
<Form.Item
label={t('products:group_size')}
name='group_size_min'
@ -483,7 +483,7 @@ const ProductInfoQuotation = ({ editable, ...props }) => {
quotationForm.setFieldValue('group_size_max', 999)
setGroupMaxUnlimit(false)
}
}}>不限(1000)</Checkbox>
}}><span className='font-bold'>不限(1000)</span></Checkbox>
<Form.Item
label={t('products:group_size')}
name='group_size_max'

@ -26,10 +26,8 @@ function PickYear() {
allowClear={false}
picker="year"
styles={{
popup: {
root: {
color: 'red'
}
root: {
color: 'red'
}
}}
open={true}

Loading…
Cancel
Save