@@ -240,25 +240,25 @@ const CreateForm = (props) => { | |||||
{'送券'} | {'送券'} | ||||
</Option> | </Option> | ||||
<Option key={2} value={2}> | <Option key={2} value={2}> | ||||
{'阶梯抵扣金'} | |||||
{'买满减现'} | |||||
</Option> | </Option> | ||||
<Option key={3} value={3}> | <Option key={3} value={3}> | ||||
{'特价商品'} | {'特价商品'} | ||||
</Option> | </Option> | ||||
<Option key={4} value={4}> | <Option key={4} value={4}> | ||||
{'阶梯优惠券'} | |||||
{'买满赠送(优惠券)'} | |||||
</Option> | </Option> | ||||
<Option key={5} value={5}> | <Option key={5} value={5}> | ||||
{'阶梯商品'} | |||||
{'买满赠送(商品)'} | |||||
</Option> | </Option> | ||||
<Option key={6} value={6}> | <Option key={6} value={6}> | ||||
{'阶梯消费次数'} | |||||
{'消费次数换购(阶梯)'} | |||||
</Option> | </Option> | ||||
<Option key={7} value={7}> | <Option key={7} value={7}> | ||||
{'循环消费次数'} | |||||
{'消费次数换购(循环)'} | |||||
</Option > | </Option > | ||||
<Option key={8} value={8}> | <Option key={8} value={8}> | ||||
{'加价格换购'} | |||||
{'加价换购'} | |||||
</Option> | </Option> | ||||
</Select > | </Select > | ||||
</Form.Item > | </Form.Item > | ||||
@@ -160,9 +160,13 @@ const activityInfManage = () => { | |||||
dataIndex: 'activityType', | dataIndex: 'activityType', | ||||
valueEnum: { | valueEnum: { | ||||
1: { text: '送券', status: 'Processing' }, | 1: { text: '送券', status: 'Processing' }, | ||||
2: { text: '送现金', status: 'Success' }, | |||||
2: { text: '买满减现', status: 'Success' }, | |||||
3: { text: '商品促销', status: 'Success' }, | 3: { text: '商品促销', status: 'Success' }, | ||||
4: { text: '商城优惠券', status: 'Success' }, | |||||
4: { text: '买满赠送(优惠券)', status: 'Success' }, | |||||
5: { text: '买满赠送(商品)', status: 'Success' }, | |||||
6: { text: '消费次数换购(阶梯)', status: 'Success' }, | |||||
7: { text: '消费次数换购(循环)', status: 'Success' }, | |||||
8: { text: '加价换购', status: 'Success' }, | |||||
}, | }, | ||||
}, | }, | ||||
{ | { | ||||
@@ -36,12 +36,15 @@ const GoodsbomFrom = (props) => { | |||||
</Select> | </Select> | ||||
</Form.Item> | </Form.Item> | ||||
<Form.Item name="bomId" label="配方信息" rules={[{ required: true, message: '配方信息' }]}> | <Form.Item name="bomId" label="配方信息" rules={[{ required: true, message: '配方信息' }]}> | ||||
<Select placeholder="请选配方信息"> | |||||
<Select | |||||
showSearch | |||||
optionFilterProp="children" | |||||
placeholder="请选配方信息"> | |||||
{getGoodsBoms.map((item, index) => { | {getGoodsBoms.map((item, index) => { | ||||
return ( | return ( | ||||
<Select.Option index={index} value={item.id} key={item.id}> | |||||
<Option index={index} value={item.id} key={item.id}> | |||||
{item.name} | {item.name} | ||||
</Select.Option> | |||||
</Option> | |||||
); | ); | ||||
})} | })} | ||||
</Select> | </Select> | ||||