Merge remote-tracking branch 'origin/master' into mkt-change

莫红玲
2 parents 36f42c23 14be4f5e
Showing 8 changed files with 41 additions and 95 deletions
src/pages/coupon/CouponConfig/components/FullReduce.tsx
src/pages/mkt/ActivityCreate/ExternalPromotion/api.ts
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/SignupGifts.tsx
src/pages/mkt/ActivityManage/components/Operation.tsx
src/pages/pms/storage/partShop/components/PartShopModal.tsx
src/pages/pms/storage/partShop/interface.d.ts
@@ -174,7 +174,7 @@ export default function FullReduce({
         {/* 实物兑换券选择兑换物品 */}
         {classifyInfo.code === "dhyhq" && (
           <Form.Item label="兑换物品" name="amsCode" extra={<span style={{ fontSize: 12 }}>*兑换物品仅限一个</span>} rules={[{ required: true, message: '请选择' }]}>
-            <RenderSelectGoos multiple={false} disabled={readonly} />
+            <RenderSelectGoos multiple={false} disabled={readonly || !!confNo} />
           </Form.Item>
         )}
         <Form.Item
@@ -63,8 +63,8 @@ export function getSignUpDetail(params: { activityNo?: string, change?: boolean 
 /**
  * 查询签到有礼配置信息
  */
-export function getSignInDetail(activityNo?: string): http.PromiseResp<ExternalPromotion.SignInParams> {
-  return request.get(`${MKT_HOST}/erp/activity/flow/sign/in/detail`, { params: { activityNo } });
+export function getSignInDetail(params: { activityNo?: string, change?: boolean }): http.PromiseResp<ExternalPromotion.SignInParams> {
+  return request.get(`${MKT_HOST}/erp/activity/flow/sign/in/detail`, { params });
 }
  
 /**
@@ -146,12 +146,6 @@ export function saveChangeCoupon(params: MktConponSpace.ConListParams): http.Pro
 export function getCouponChangeDetails(params: { activityNo?: string, confNo?: string }): http.PromiseResp<MktConponSpace.ConListParams> {
   return request.get(`${MKT_HOST}/erp/activity/change/coupon/info`, { params });
 }
-/**
- * 保存奖品变更信息(优惠券)
- */
-export function saveChangeGift(params: MktConponSpace.ConListParams): http.PromiseResp<MktConponSpace.ConListParams> {
-  return request.post(`${MKT_HOST}/erp/activity/change/gift/save`, params);
-}
  
 /**
  * 变更奖项名称(礼包奖品名称)
@@ -17,7 +17,7 @@ import {
   deleteConfigList,
   batchDeleteCoupon,
 } from "@/pages/coupon/CouponConfig/api"; //删除优惠券配置
-import { getCouponChangeDetails, saveChangeCoupon, saveChangeGift, saveChangeAwardName } from '../../api';
+import { getCouponChangeDetails, saveChangeCoupon, saveChangeAwardName } from '../../api';
 import { useStore } from "@/pages/mkt/ActivityCreate/index";
  
 const { Column } = Table;
@@ -174,22 +174,7 @@ export default function Coupons({
       if (!(coupon.index === undefined || coupon.itemIndex === undefined)) {
         _savaList[coupon.index].giftItems[coupon.itemIndex] = pa;
       }
-    }
-    /**优惠券变更 */
-    if (coupon.giftItemId) {
-      //@ts-ignore
-      saveChangeGift({ ...pa, giftItemId: coupon.giftItemId, activityNo, giftId: value[0] && value[0].giftId }).then(res => {
-        message.success("奖品变更成功");
-        if (!(coupon.index === undefined || coupon.itemIndex === undefined)) {
-          _savaList[coupon.index].giftItems[coupon.itemIndex] = { ...pa, giftItemId: coupon.giftItemId };
-        }
-        onChange && onChange([..._savaList]);
-      }).catch(err => {
-        message.error(err);
-      });
-    }
-    if (!coupon.giftItemId && !coupon.confNo) {
-      //新增
+    } else {
       if (coupon.index !== undefined) {
         _savaList[coupon.index].giftItems.push(pa);
         setSaveList([..._savaList]);
@@ -372,21 +357,21 @@ export default function Coupons({
                           });
                         }}
                       >
-                        {itemIndex + 1}.{item.aliasName}
+                        <span style={{whiteSpace: 'pre-wrap'}}>{itemIndex + 1}.{item.aliasName}</span> 
                       </Button>
-                      {item.aliasName && !readOnly && (
+                      {((item.aliasName && !readOnly) || changeEnable) && (
                         <Popconfirm
                           title="删除将丢失优惠券信息，确定删除？"
                           okText="确定"
                           cancelText="取消"
                           onConfirm={() => _onDelete(index, itemIndex)}
                         >
-                          <Button type="link" disabled={readOnly}>
+                          <Button type="link" danger disabled={readOnly && !changeEnable}>
                             删除
                           </Button>
                         </Popconfirm>
                       )}
-                      {item.aliasName && changeEnable && item.giftItemId && (
+                      {/* {item.aliasName && changeEnable && item.giftItemId && (
                         <Popconfirm
                           title="是否确定替换该优惠券，已发放优惠券不受影响"
                           okText="确定"
@@ -406,7 +391,7 @@ export default function Coupons({
                             替换后续发放优惠券
                           </Button>
                         </Popconfirm>
-                      )}
+                      )} */}
                     </Space>
                   </div>
                 ))}
@@ -418,8 +403,8 @@ export default function Coupons({
                 <Space>
                   {!record.awardName.includes("谢谢惠顾") && (
                     <Button
-                      disabled={disabled}
-                      hidden={disabled}
+                      disabled={disabled && !changeEnable}
+                      hidden={disabled && !changeEnable}
                       style={{ padding: 0 }}
                       type="link"
                       onClick={() => setCoupon({
@@ -538,7 +523,7 @@ export default function Coupons({
       {/* 优惠券配置 */}
       <UpsertCoupon
         visible={coupon.visible}
-        disabled={coupon.giftItemId ? false : disabled}
+        disabled={coupon.giftItemId ? false : disabled && !changeEnable}
         onCancel={() => setCoupon({ ...coupon, visible: false, confNo: undefined })}
         onSave={_onSava}
         remark="市场活动"
@@ -14,7 +14,7 @@ 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);
+  const { data, errMsg, loading, params, setParams } = useInitial(getSignInDetail, {}, {activityNo, change: changeEnable});
   const [form] = Form.useForm();
   const [saveLoading, setSaveLoading] = useState<boolean>(false);
  
@@ -47,13 +47,13 @@ export default function index() {
           gifts: fileds.gifts,
         },
       };
-      if (changeEnable && pa.endTime == data.endTime) {
-        message.info("暂无变更项");
-        return;
-      }
+      // if (changeEnable && pa.endTime == data.endTime) {
+      //   message.info("暂无变更项");
+      //   return;
+      // }
       setSaveLoading(true);
       const api = changeEnable ? saveChangeSignInApi : saveSignInApi;
-      api(changeEnable ? { endTime, activityNo } : pa).then((res) => {
+      api(pa).then((res) => {
         message.success("签到有礼保存成功");
         getFlowConfig(activityNo);
       })
@@ -56,20 +56,7 @@ function SignupGifts({ value, onChange, disabled }: Props) {
       const _tempDataSource = currentData.map((item) => (item.couponCode === tempObj.couponCode ? tempObj : item));
       setGiftList(_tempDataSource);
       onChange && onChange([{ ...value && value[0], giftItems: _tempDataSource }]);
-    }
-    /**优惠券变更 */
-    if (coupon.giftItemId) {
-      //@ts-ignore
-      saveChangeGift({ ...pa, giftItemId: coupon.giftItemId, activityNo, giftId: value[0] && value[0].giftId }).then(res => {
-        message.success("奖品变更成功");
-        const _tempDataSource = currentData.map((item) => (item.giftItemId === coupon.giftItemId ? { ...pa, giftItemId: coupon.giftItemId } : item));
-        setGiftList(_tempDataSource);
-        onChange && onChange([{ ...value && value[0], giftItems: _tempDataSource }]);
-      }).catch(err => {
-        message.error(err);
-      });
-    }
-    if (!coupon.confNo && !coupon.giftItemId) {
+    } else {
       // 新增优惠券
       currentData.push(pa);
       setGiftList(currentData);
@@ -89,7 +76,7 @@ function SignupGifts({ value, onChange, disabled }: Props) {
       <Card
         style={{ display: "block" }}
         extra={
-          !disabled && (
+          (!disabled || changeEnable) && (
             <div
               style={{
                 flex: 1,
@@ -101,7 +88,7 @@ function SignupGifts({ value, onChange, disabled }: Props) {
               <Button
                 type="link"
                 icon={<PlusOutlined />}
-                disabled={disabled}
+                disabled={disabled && !changeEnable}
                 onClick={() => setCoupon({
                   ...coupon,
                   visible: true,
@@ -156,14 +143,14 @@ function SignupGifts({ value, onChange, disabled }: Props) {
               record: ExternalPromotion.giftItems,
               index: number
             ) => (
-              disabled ? (
+              disabled && !changeEnable ? (
                 <>
-                  <Button type="link" onClick={() => setCoupon({ ...coupon, visible: true, confNo: record.couponCode })}>{changeEnable ? "编辑" : "查看"}</Button>
-                  {record.giftItemId && (
+                  <Button type="link" onClick={() => setCoupon({ ...coupon, visible: true, confNo: record.couponCode })}>查看</Button>
+                  {/* {record.giftItemId && (
                     <Popconfirm title="是否确定替换该优惠券，已发放优惠券不受影响，将在审批通过后生效" onConfirm={() => setCoupon({ ...coupon, visible: true, giftItemId: record.giftItemId })}>
                       {!!changeEnable && <Button type="link" style={{ margin: 0, fontSize: 12 }} danger>替换后续发放优惠券</Button>}
                     </Popconfirm>
-                  )}
+                  )} */}
                 </>
               ) : (
                 <Space>
@@ -199,7 +186,7 @@ function SignupGifts({ value, onChange, disabled }: Props) {
       <UpsertCoupon
         visible={coupon.visible}
         onCancel={() => setCoupon({ ...coupon, visible: false, confNo: undefined, giftItemId: undefined })}
-        disabled={coupon.giftItemId ? false : disabled}
+        disabled={coupon.giftItemId ? false : disabled && !changeEnable}
         onSave={onSave}
         remark="市场活动"
         confNo={coupon.confNo}
@@ -105,7 +105,7 @@ export default function Oparetion(props: Props) {
         if ([4, 5].includes(status) && record.changeStatus !== 2) {
           menus = [
             <Button type="primary" ghost size="small" onClick={changeBaseInfo}>变更信息</Button>,
-            <Button danger ghost size="small" onClick={endActivity}>终止</Button>,
+            // <Button danger ghost size="small" onClick={endActivity}>终止</Button>,
           ];
         }
         return (
@@ -18,31 +18,10 @@ export default function PartShopModal() {
     } else {
       setIsadd(false);
       setIsprice(false);
-      form.setFieldsValue({
-        costPrice: "",
-        stock: 0,
-        lockStock: 0,
-        shopId: "",
-        part: "",
-        user: "",
-        fixRemark: ""
-      });
-    }
-  }, [visible]);
-
-  useEffect(() => {
-    if (isadd) {
       setItem({});
-      console.log(isadd, item);
-      form.setFieldsValue({
-        costPrice: "",
-        stock: 0,
-        lockStock: 0,
-        shopId: "",
-        part: ""
-      });
+      form.resetFields();
     }
-  }, [isadd]);
+  }, [visible]);
  
   const handleSubmit = () => {
     form.validateFields().then(values => {
@@ -50,11 +29,12 @@ export default function PartShopModal() {
         ...item,
         partId: values.part.partId,
         costPrice: values.costPrice,
-        stock: values.stock,
-        lockStock: values.lockStock,
+        stock: values.stock || 0,
+        lockStock: values.lockStock || 0,
         shopId: values.shopId,
         user: values.user,
-        fixRemark: values.fixRemark
+        fixRemark: values.fixRemark,
+        type: isadd ? 1 : isprice ? 3 : 2
       };
       setConfirmLoading(true);
       savePartShopApi(params).then(res => {
@@ -76,8 +56,7 @@ export default function PartShopModal() {
  
   const validatorLockStock = (rule: any, value: number) => {
     if (value > form.getFieldsValue(['stock']).stock) {
-      // eslint-disable-next-line prefer-promise-reject-errors
-      return Promise.reject('锁定库存不能超过总库存数量！');
+      return Promise.reject(new Error('锁定库存不能超过总库存数量！'));
     } else return Promise.resolve();
   };
  
@@ -113,13 +92,13 @@ export default function PartShopModal() {
           <ChoosePart disabled={!!item.id} />
         </Item>
         <Item label="加权成本价(元)" name="costPrice" rules={[{ required: true, message: "请输入加权成本价" }]}>
-          <InputNumber style={{ width: "100%" }} min={0} step={0.1} placeholder="加权成本价(元)" />
+          <InputNumber style={{ width: "100%" }} min={0} step={0.1} placeholder="加权成本价(元)" disabled={!(isadd || isprice)} />
         </Item>
-        <Item label="总库存数量" name="stock" rules={[{ required: true, message: "请输入总库存数量" }]}>
-          <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="总库存数量" disabled={isprice || isadd} />
+        <Item label="总库存数量" name="stock">
+          <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="总库存数量" disabled={isprice || isadd} defaultValue={0} />
         </Item>
-        <Item label="锁定库存" name="lockStock" rules={[{ required: true, message: "请输入锁定库存" }, { validator: validatorLockStock }]}>
-          <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="锁定库存" disabled />
+        <Item label="锁定库存" name="lockStock" rules={[{ validator: validatorLockStock }]}>
+          <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="锁定库存" disabled defaultValue={0} />
         </Item>
         {!!fw && !isprice && !isadd && (
         <Item label="修改人" name="user" rules={[{ required: true, message: "请输入修改人" }]}>
@@ -34,6 +34,7 @@ declare namespace PmsStoragePartShop {
     shopId?: number, // 服务站ID
     user?: string //修改人名称
     fixRemark?: string //修改原因
+    type?: number //类型1新增2修改库存3修改价格
   }
  
   interface Option {