Merge branch 'bug_fix' of gitlab.feewee.cn:FEV2/fw-cms into bug_fix

李娅兰
2 parents f2ee322e 392aa7d8
Showing 6 changed files with 32 additions and 48 deletions
src/pages/cas/ClaimConfirmation/components/DetailModal.tsx
src/pages/coupon/CouponConfig/components/FullReduce.tsx
src/pages/mkt/ActivityCreate/ExternalPromotion/components/ActivityFlow/Coupons.tsx
src/pages/mkt/ActivityCreate/ExternalPromotion/components/ActivityFlow/SignIn.tsx
src/pages/mkt/ActivityCreate/ExternalPromotion/components/ActivityFlow/SignUp.tsx
src/pages/mkt/ActivityCreate/ExternalPromotion/components/ActivityFlow/SignupGifts.tsx
 import React, { useEffect, useState } from 'react';
 import { Descriptions, Form, Input, message, Modal, Popconfirm, Select, Spin, Table } from 'antd';
 import moment from 'moment';
+import {isEmpty} from "lodash";
 import { ColumnsType } from 'antd/es/table';
  
 import { formatPartCnt } from '../../utils';
@@ -119,7 +120,7 @@ export default function DetailMOdal({ current, visible, setVisible, setLoading: 
       dataIndex: 'totalPrice',
       title: '材料费',
       align: 'center',
-      render: (totalPrice: number) => rmb.p(totalPrice),
+      render: (totalPrice: number) => isNaN(totalPrice) ? '--' : rmb.p(totalPrice ?? 0),
     },
     {
       dataIndex: 'partName',
@@ -357,7 +358,7 @@ export default function DetailMOdal({ current, visible, setVisible, setLoading: 
             {(detail && detail.consultantDesc) || '--'}
           </DescriptionItem>
           <DescriptionItem label="附件" span={3}>
-            <ImageModal title="查看附件" fids={detail?.fids || []} />
+            <ImageModal title="查看附件" fids={isEmpty(detail?.fids) ? [] : detail?.fids} />
           </DescriptionItem>
         </Descriptions>
  
@@ -155,7 +155,7 @@ export default function FullReduce({ info, readonly, form, getCouponType, confNo
         )}
         {/* 全部默认不叠加false，立减券允许修改类型  */}
         <Form.Item label="可与其他同类型优惠券叠加使用" name="superimposed" >
-          <Radio.Group disabled={readonly || !!confNo || info.discountsType != 1}>
+          <Radio.Group disabled={readonly || info.discountsType != 1}>
             <Radio key={1} value={true}>可叠加</Radio>
             <Radio key={0} value={false}>不可叠加</Radio>
           </Radio.Group>
@@ -223,7 +223,7 @@ export default function Coupons({ awardWay, mulLottery, value, onChange, remove,
                     onClick={() => {
                       remove && remove(name);
                     }}
-                    // disabled={readOnly}
+                  // disabled={readOnly}
                   />
                 )}
  
@@ -251,7 +251,7 @@ export default function Coupons({ awardWay, mulLottery, value, onChange, remove,
                     setVisible(true);
                     setNoRewad(false);
                   }}
-                  // disabled={readOnly}
+                // disabled={readOnly}
                 >
                   新增
                 </Button>
@@ -275,12 +275,12 @@ export default function Coupons({ awardWay, mulLottery, value, onChange, remove,
                       onClick={
                         changeEnable
                           ? () => {
-                              // setVisible(true);
-                              setNoRewad(false);
-                              SetCurrentItem(record);
-                              setItemIndex(index);
-                              setVisible(true);
-                            }
+                            // setVisible(true);
+                            setNoRewad(false);
+                            SetCurrentItem(record);
+                            setItemIndex(index);
+                            setVisible(true);
+                          }
                           : undefined
                       }
                     >
@@ -325,7 +325,7 @@ export default function Coupons({ awardWay, mulLottery, value, onChange, remove,
                           {itemIndex + 1}.{item.aliasName}
                         </span>
                       </Button>
-                      {((item.aliasName && !readOnly) || changeEnable) && (
+                      {(item.aliasName && !readOnly) && (
                         <Popconfirm
                           title="删除将丢失优惠券信息，确定删除？"
                           okText="确定"
@@ -432,15 +432,15 @@ export default function Coupons({ awardWay, mulLottery, value, onChange, remove,
           wrapperCol={{ span: 16 }}
           onFinish={_onOk}
           autoComplete="off"
-          // initialValues={{
-          //   awardName: (awardWay === 2 && noReward) ? "谢谢惠顾" : "",
-          // }}
+        // initialValues={{
+        //   awardName: (awardWay === 2 && noReward) ? "谢谢惠顾" : "",
+        // }}
         >
           <Form.Item
             label="奖项名称："
             name="awardName"
             rules={[{ required: true, message: '请输入奖项名称' }]}
-            // initialValue={(awardWay === 2 && noReward) ? "谢谢惠顾" : ""}
+          // initialValue={(awardWay === 2 && noReward) ? "谢谢惠顾" : ""}
           >
             <Input
               // disabled={(awardWay === 2 && noReward) || !!currentItem.awardName}
@@ -10,11 +10,11 @@ import moment from &quot;moment&quot;;
 const { RangePicker } = DatePicker;
 const { Option } = Select;
  
-export default function index() {
+export default function Index() {
   const { baseInfo, readOnly, getFlowConfig, externalInfo } = useStore();
   const { activityNo, changeEnable } = baseInfo;
   const { flowDisable } = externalInfo;
-  const { data, errMsg, loading, params, setParams } = useInitial(getSignInDetail, {}, {activityNo, change: changeEnable});
+  const { data, errMsg, loading, params, setParams } = useInitial(getSignInDetail, {}, { activityNo, change: changeEnable });
   const [form] = Form.useForm();
   const [saveLoading, setSaveLoading] = useState<boolean>(false);
  
 import React, { useState, useEffect } from 'react';
-import { Button, Form, InputNumber, message, Space, Spin, Divider, Radio, Row, Alert } from 'antd';
+import { Button, Form, InputNumber, message, Space, Spin, Divider, Radio, Row } from 'antd';
 import useInitial from '@/hooks/useInitail';
 import { PlusOutlined, MinusCircleOutlined } from '@ant-design/icons';
 import { saveSignUpApi, getSignUpDetail, saveChangeSignUpApi } from '../../api'; //保存报名有礼
@@ -163,25 +163,6 @@ export default function Index() {
                 <Radio value={1}>按报名顺序不同赠送不同优惠券</Radio>
               </Radio.Group>
             </Form.Item>
-            {changeEnable ? (
-              <Alert
-                message="提示"
-                type="warning"
-                showIcon
-                closable
-                style={{ marginBottom: 10 }}
-                description={
-                  <div>
-                    <p style={{ margin: 0, fontSize: 12, color: '#999' }}>
-                      1.优惠券编辑变更：范围只能扩大不能缩小，变更前所发优惠券与变更后所发优惠券的限制范围一致
-                    </p>
-                    <p style={{ margin: 0, fontSize: 12, color: '#999' }}>
-                      2.优惠券删除-新增变更：不限制优惠券变更范围，变更前所发优惠券使用范围不变，变更后所发优惠券限制范围变更
-                    </p>
-                  </div>
-                }
-              />
-            ) : null}
             <Form.Item noStyle shouldUpdate={(prevValues, currentValues) => prevValues.ladderReward !== currentValues.ladderReward}>
               {({ getFieldValue }) => {
                 return (
@@ -167,16 +167,18 @@ function SignupGifts({ value, onChange, disabled }: Props) {
                   >
                     编辑
                   </Button>
-                  <Popconfirm
-                    title="删除将丢失优惠券信息，确定删除？"
-                    okText="确定"
-                    cancelText="取消"
-                    onConfirm={() => deleteQestion(index)}
-                  >
-                    <Button type="link" danger>
-                      删除
-                    </Button>
-                  </Popconfirm>
+                  {!changeEnable && (
+                    <Popconfirm
+                      title="删除将丢失优惠券信息，确定删除？"
+                      okText="确定"
+                      cancelText="取消"
+                      onConfirm={() => deleteQestion(index)}
+                    >
+                      <Button type="link" danger>
+                        删除
+                      </Button>
+                    </Popconfirm>
+                  )}
                 </Space>
               )
             )}