Commit f2126191 authored by 武广's avatar 武广

fix: 修改有效期数据处理

parent b7a7533a
...@@ -315,6 +315,8 @@ const filterServiceItem = (type, serviceItem) => { ...@@ -315,6 +315,8 @@ const filterServiceItem = (type, serviceItem) => {
resetTime(serviceItem.purchaseStartTime), resetTime(serviceItem.purchaseStartTime),
resetTime(serviceItem.purchaseEndTime), resetTime(serviceItem.purchaseEndTime),
], // 购买开始时间 ], // 购买开始时间
validityPeriodType: serviceItem.validityPeriodType,
validityPeriodDays: serviceItem.validityPeriodDays,
shopIds: serviceItem.shopIds || [], // 适用门店列表 shopIds: serviceItem.shopIds || [], // 适用门店列表
unavailableDate: serviceItem.unavailableDate, // 不可用日期 unavailableDate: serviceItem.unavailableDate, // 不可用日期
useTimeDescription: serviceItem.useTimeDescription, // 使用时间 useTimeDescription: serviceItem.useTimeDescription, // 使用时间
......
...@@ -42,7 +42,9 @@ const FormRuleSetting = forwardRef((props, ref) => { ...@@ -42,7 +42,9 @@ const FormRuleSetting = forwardRef((props, ref) => {
const shopIds = getIsInShops(editData.shopIds); const shopIds = getIsInShops(editData.shopIds);
goodInfo.shopIds = shopIds; goodInfo.shopIds = shopIds;
} }
console.log('goodInfo :>> ', goodInfo);
if (goodInfo.validityPeriodType) { if (goodInfo.validityPeriodType) {
console.log('+goodInfo.validityPeriodType :>> ', +goodInfo.validityPeriodType);
setDateType(+goodInfo.validityPeriodType); setDateType(+goodInfo.validityPeriodType);
} }
form.setFieldsValue(goodInfo); form.setFieldsValue(goodInfo);
...@@ -52,15 +54,17 @@ const FormRuleSetting = forwardRef((props, ref) => { ...@@ -52,15 +54,17 @@ const FormRuleSetting = forwardRef((props, ref) => {
const onCheck = async () => { const onCheck = async () => {
try { try {
const { useTime, purchaseTime, ...values } = await form.validateFields(); const { useTime, purchaseTime, ...values } = await form.validateFields();
return { const params = {
useStartTime: formatTime(useTime[0]),
useEndTime: formatTime(useTime[1]),
purchaseStartTime: formatTime(purchaseTime[0]), purchaseStartTime: formatTime(purchaseTime[0]),
purchaseEndTime: formatTime(purchaseTime[1]), purchaseEndTime: formatTime(purchaseTime[1]),
temp: 'serviceItem', temp: 'serviceItem',
...values, ...values,
}; };
if (useTime && useTime.length === 2) {
params.useStartTime = formatTime(useTime[0]);
params.useEndTime = formatTime(useTime[1]);
}
return params;
} catch (errorInfo) { } catch (errorInfo) {
return null; return null;
} }
...@@ -90,7 +94,7 @@ const FormRuleSetting = forwardRef((props, ref) => { ...@@ -90,7 +94,7 @@ const FormRuleSetting = forwardRef((props, ref) => {
form={form} form={form}
name="register" name="register"
initialValues={{ initialValues={{
useTime: [], // 使用开始时间 // useTime: [], // 使用开始时间
validityPeriodType: '1', // 有效期类型 validityPeriodType: '1', // 有效期类型
// useEndTime: '', // 使用结束时间 // useEndTime: '', // 使用结束时间
purchaseTime: [], // 购买开始时间 purchaseTime: [], // 购买开始时间
...@@ -118,8 +122,8 @@ const FormRuleSetting = forwardRef((props, ref) => { ...@@ -118,8 +122,8 @@ const FormRuleSetting = forwardRef((props, ref) => {
rules={[{ required: true, message: '请选择有效期类型!' }]} rules={[{ required: true, message: '请选择有效期类型!' }]}
> >
<Radio.Group onChange={onChangeDateType}> <Radio.Group onChange={onChangeDateType}>
<Radio value="1">固定日期</Radio> <Radio value={1}>固定日期</Radio>
<Radio value="2">指定范围</Radio> <Radio value={2}>指定范围</Radio>
</Radio.Group> </Radio.Group>
</Form.Item> </Form.Item>
{dateType === 1 ? ( {dateType === 1 ? (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment