Commit 35f12c68b2a890a6cbdaa54baa6e39c6549a2ffd
Merge remote-tracking branch 'origin/master' into evaluate
Showing
3 changed files
with
11 additions
and
12 deletions
src/pages/mkt/ActivityCreate/BasicInformation/index.tsx
... | ... | @@ -86,7 +86,6 @@ function Index({ onNext }: Props) { |
86 | 86 | // } |
87 | 87 | // } |
88 | 88 | params.bizType = undefined; |
89 | - params.activityName = undefined; | |
90 | 89 | params.activityType = undefined; |
91 | 90 | params.address = undefined; |
92 | 91 | params.addressType = undefined; |
... | ... | @@ -170,7 +169,7 @@ function Index({ onNext }: Props) { |
170 | 169 | </Select> |
171 | 170 | </FormItem> |
172 | 171 | <FormItem name="activityName" label="活动名称" {...formRules.activityName}> |
173 | - <Input placeholder="输入活动名称" disabled={readOnly} /> | |
172 | + <Input placeholder="输入活动名称" disabled={readOnly && !changeEnable} /> | |
174 | 173 | </FormItem> |
175 | 174 | <FormItem label="活动描述"> |
176 | 175 | <BraftEditor | ... | ... |
src/pages/mkt/ActivityCreate/ExternalPromotion/components/ActivityScope/index.tsx
... | ... | @@ -710,7 +710,7 @@ function Index() { |
710 | 710 | {({ getFieldValue }) => (getFieldValue("goalType") === 2 ? ( |
711 | 711 | <Form.Item name="goalJoinLimit" rules={[{ required: true, message: "请选择活动报名条件" }]}> |
712 | 712 | <Radio.Group |
713 | - disabled={readOnly} | |
713 | + disabled={readOnly && !changeEnable} | |
714 | 714 | onChange={(v) => { |
715 | 715 | setGoalJoinLimit(v.target.value); |
716 | 716 | if (v.target.value === 1) { |
... | ... | @@ -739,7 +739,7 @@ function Index() { |
739 | 739 | {bizType !== 2 && ( |
740 | 740 | <Form.Item name="nonGoalJoin" valuePropName="checked"> |
741 | 741 | <Checkbox |
742 | - disabled={readOnly || disable || JoinLimit === 1} | |
742 | + disabled={(readOnly && !changeEnable) || disable || JoinLimit === 1} | |
743 | 743 | onChange={(v) => { |
744 | 744 | if (v.target.checked) { |
745 | 745 | form.setFieldsValue({ nonGoalBrowse: true }); |
... | ... | @@ -754,7 +754,7 @@ function Index() { |
754 | 754 | <div style={{ marginTop: 35, color: '#666' }}>*活动页面展示(C端---{'>'}霏车车小程序)</div> |
755 | 755 | <Form.Item name="publicity" valuePropName="checked"> |
756 | 756 | <Checkbox |
757 | - disabled={readOnly || [5, 6, 9].includes(activityType || 0)} | |
757 | + disabled={(readOnly && !changeEnable) || [5, 6, 9].includes(activityType || 0)} | |
758 | 758 | onChange={(v) => { |
759 | 759 | if (v.target.checked) { |
760 | 760 | form.setFieldsValue({ nonGoalBrowse: true }); |
... | ... | @@ -767,7 +767,7 @@ function Index() { |
767 | 767 | </Form.Item> |
768 | 768 | <div style={{ marginTop: 30, color: '#666' }}>*车系详情中"查看优惠"页面展示活动信息</div> |
769 | 769 | <Form.Item name="nonGoalBrowse" valuePropName="checked"> |
770 | - <Checkbox disabled={readOnly || (disable && JoinLimit !== 1) || (!!nonGoalLimit.nonGoalJoin || !!nonGoalLimit.publicity)}> 非目标客户可查看</Checkbox> | |
770 | + <Checkbox disabled={(readOnly && !changeEnable) || (disable && JoinLimit !== 1) || (!!nonGoalLimit.nonGoalJoin || !!nonGoalLimit.publicity)}> 非目标客户可查看</Checkbox> | |
771 | 771 | </Form.Item> |
772 | 772 | |
773 | 773 | <Form.Item style={{ marginTop: 30, textAlign: "center" }}> | ... | ... |
src/pages/stock/TicketImport/components/ComfirmOrder.tsx
... | ... | @@ -84,12 +84,12 @@ export default function ComfirmModal() { |
84 | 84 | }); |
85 | 85 | } |
86 | 86 | function onSaveModal() { |
87 | - if (currentItem.directSellingTag && !currentItem.memberIdCard) { | |
88 | - message.info("请选择指定客户后保存"); | |
89 | - return; | |
90 | - } | |
91 | - if (currentItem.bindingTag && !currentItem.memberIdCard) { | |
92 | - message.info("绑定订单需指定客户,请选择指定客户后保存", 5); | |
87 | + // if (currentItem.directSellingTag && !currentItem.memberIdCard) { | |
88 | + // message.info("请选择指定客户后保存"); | |
89 | + // return; | |
90 | + // } | |
91 | + if (currentItem.customTag && !currentItem.memberIdCard) { | |
92 | + message.info("定制车需指定客户,请选择指定客户后保存", 5); | |
93 | 93 | return; |
94 | 94 | } |
95 | 95 | const index = data.findIndex(i => i.id == currentItem.id); | ... | ... |