促销负激励确认折让差异，接口联调

莫红玲
1 parent c48ef7a2
Showing 3 changed files with 26 additions and 20 deletions
src/pages/stock/AllowanceConfirm/EditComfirm/components/AddRewardsModal.tsx
src/pages/stock/AllowanceConfirm/EditComfirm/components/PromotionConfig.tsx
src/pages/stock/AllowanceConfirm/EditComfirm/store.ts
@@ -50,7 +50,6 @@ export default function CreateModal(props: Props) {
  
   useEffect(() => {
     if (visible) {
-      console.log("currentItem", currentItem);
       setAmount(currentItem.actualRebateAmount || 0);
       // 选中商家
       if (currentItem.costSharing && currentItem.costSharing.length) {
@@ -15,7 +15,7 @@ import { savePromotionApi } from &quot;../api&quot;;
 import { useStore } from "../index";
 import { debounce } from "lodash";
 import WaitConfirmList from "./WaitConfirmList";
-import { getRemoveCheckListApi } from "@/pages/stock/AllowanceConfirm/EditComfirm/Manufacturer/api";
+import { getRemoveCheckListApi, savePromotionNegativeApi } from "@/pages/stock/AllowanceConfirm/EditComfirm/Manufacturer/api";
 import AddRewardsModal from "@/pages/stock/AllowanceConfirm/EditComfirm/components/AddRewardsModal";
 import { AwardTypeEnum, SubjectTypeEnum } from "@/pages/stock/AllowanceConfirm/entity";
  
@@ -35,6 +35,7 @@ export default function PromotionConfig(props: Props) {
     loading,
     promotionReward,
     discountPromotion,
+    setDiscountLoading,
     setRewardParams,
     setDiscountParams,
     RewardPagination, //正激励
@@ -55,20 +56,21 @@ export default function PromotionConfig(props: Props) {
   );
   const [activityVisible, setActivityVisible] = useState<boolean>(false);
   const [awardType, setAwardType] = useState<number>();
-  
+
+  /**保存促销负激励折让差异 */
   function handSubmit() {
     if (saveLoading) return;
     const pa = {
       rebateId,
       promotionId: saveItem.promotionId,
       reason: saveItem.reason,
-      actualSupportStandard: saveItem.actualSupportStandard,
+      actualRebateAmount: saveItem.actualRebateAmount,
     };
     setSaveLoading(true);
-    savePromotionApi(pa)
+    savePromotionNegativeApi(pa)
       .then((res) => {
         setSaveLoading(false);
-        setLoading(true);
+        setDiscountLoading(true);
         setSaveLoading(false);
         setSaveVissible(false);
         message.success("操作成功");
@@ -137,7 +139,7 @@ export default function PromotionConfig(props: Props) {
             rowKey="id"
             loading={loading}
           >
-            <Column title="促销名称" width="15%" dataIndex="fundsName" />
+            <Column title="促销名称" width="20%" dataIndex="fundsName" />
             <Column
               title="考核类型"
               width="10%"
@@ -157,7 +159,7 @@ export default function PromotionConfig(props: Props) {
             />
             <Column
               title="实际折让金额(元)"
-              width="10%"
+              width="15%"
               dataIndex="actualRebateAmount"
             />
             {/* <Column
@@ -184,7 +186,7 @@ export default function PromotionConfig(props: Props) {
             />
             <Column
               width="10%"
-              title={awardType === 1 ? "符合条件车辆" : "折让分摊"}
+              title={awardType === 1 ? "符合条件车辆" : "操作"}
               render={
                 (_, record: FvmAllowance.PromotionVo) => (awardType === 1 ? (
                   <a
@@ -200,10 +202,12 @@ export default function PromotionConfig(props: Props) {
                   </a>
                 ) : record.subjectType === 1 ? (
                   <a onClick={() => onEdit(record)}>
-                    {readOnly ? "查看" : "设置"}
+                    {readOnly ? "查看" : "折让分摊"}
                   </a>
                 ) : (
-                  "--"
+                  <a onClick={() => { setSaveItem(record); setSaveVissible(true); }}>
+                    {readOnly ? "查看" : "确认折让差异"}
+                  </a>
                 ))
               }
             />
@@ -306,7 +310,8 @@ export default function PromotionConfig(props: Props) {
       <Modal
         title={
           <div style={{ marginRight: 80, color: "#666" }}>
-            {`${saveItem.fundsName} ——实际支持标准单价确认`}
+            {/* {`${saveItem.fundsName} ——实际折让金额确认`} */}
+            实际折让金额确认
           </div>
         }
         centered
@@ -318,18 +323,19 @@ export default function PromotionConfig(props: Props) {
         }}
         onOk={handSubmit}
       >
+        <div style={{ marginBottom: 15 }}>促销名称：{saveItem.fundsName}</div>
         <Row style={{ alignItems: "center", marginBottom: 20 }}>
-          <span>实际支持标准单价(元)：</span>
+          <span>实际折让金额(元)：</span>
           <InputNumber
             precision={2}
-            style={{ width: "60%"}}
-            value={saveItem.actualSupportStandard}
+            style={{ width: "60%" }}
+            value={saveItem.actualRebateAmount}
             placeholder="输入折让实际金额"
-            onChange={(v) => setSaveItem({ ...saveItem, actualSupportStandard: v })}
+            onChange={(v) => setSaveItem({ ...saveItem, actualRebateAmount: v })}
           />
         </Row>
-        <span>差异原因：</span>
-        <Input.TextArea placeholder="折让不足原因" onChange={(v) => setSaveItem({ ...saveItem, reason: v.target.value })} />
+        <span style={{ marginLeft: 53 }}>差异原因：</span>
+        <Input style={{ width: "60%" }} placeholder="折让不足原因" onChange={(v) => setSaveItem({ ...saveItem, reason: v.target.value })} />
       </Modal>
       {/* 厂家促销==》选择待确认活动 */}
       <WaitConfirmList
@@ -53,7 +53,7 @@ export default function useStore() {
   /**
    * 查询促销折让提交详情(厂家促销--负激励)
    */
-  const { list: discountPromotion, setParams: setDiscountParams, paginationConfig: DiscountPagination } = usePagination(queryDetailListApi, {
+  const { list: discountPromotion, setLoading: setDiscountLoading, setParams: setDiscountParams, paginationConfig: DiscountPagination } = usePagination(queryDetailListApi, {
     rebateId,
     awardType: 2
   }, { delay });
@@ -244,7 +244,8 @@ export default function useStore() {
     DiscountPagination, //负激励
     setDiscountParams, //负激励
     discountPromotion, //负激励list
-
+    setDiscountLoading,
+    
     /** 移除提交清单 */
     commonRemoveCheckList,
     /** 加入提交清单 */