From d1c9bacb950bf7b1c2f0ed37b083128b7ca82c11 Mon Sep 17 00:00:00 2001
From: zhangds <c664256297@163.com>
Date: Mon, 4 Mar 2024 14:28:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20=E5=85=91=E6=8D=A2?=
 =?UTF-8?q?=E7=A0=81=E5=8C=85=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/exchangecode/exchangecodeAdd/index.jsx | 14 ++++++++++++--
 src/pages/exchangecode/exchangecodeAdd/utils.js  |  3 ++-
 src/pages/plan/key/UseKeyAddEdit.jsx             |  3 +--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/pages/exchangecode/exchangecodeAdd/index.jsx b/src/pages/exchangecode/exchangecodeAdd/index.jsx
index ce058d9a..1ece92fc 100644
--- a/src/pages/exchangecode/exchangecodeAdd/index.jsx
+++ b/src/pages/exchangecode/exchangecodeAdd/index.jsx
@@ -204,7 +204,8 @@ export default class exchangeAdd extends React.Component {
               tempdata: reqCopy.goods || [],
               plan_time: [reqCopy.plan.begin_time, reqCopy.plan.end_time],
               rank: checkedArray,
-              rankoptions: arr
+              rankoptions: arr,
+              settlement_type: reqCopy.plan.settlement_type
             })
           },
           (err) => {}
@@ -586,8 +587,17 @@ export default class exchangeAdd extends React.Component {
         return Notify.error("请绑定对象")
       }
 
-      let approval_id = sessionStorage.getItem("approval_id")
+      // 判断是否是 包码
+      if (this.state.settlement_type > 0) {
+        // 包码 合并数组
+        let all_arr = [...updateProduct, ...addProduct]
+        if (all_arr.length > 1) {
+          Notify.error("包码只能创建一个商品")
+          return
+        }
+      }
 
+      let approval_id = sessionStorage.getItem("approval_id")
       if (Number(approval_id) <= 0) {
         //非审核中状态
         getIsRequireApproval(code_batch_id, data).then((res) => {
diff --git a/src/pages/exchangecode/exchangecodeAdd/utils.js b/src/pages/exchangecode/exchangecodeAdd/utils.js
index e02253c8..871fdf99 100644
--- a/src/pages/exchangecode/exchangecodeAdd/utils.js
+++ b/src/pages/exchangecode/exchangecodeAdd/utils.js
@@ -183,7 +183,8 @@ export const init = () => {
     planSelectData: [] /* 归属计划数据 */,
     keyBatchSelectData: [] /* 归属key数据 */,
     codeStatus: "" /* 兑换码状态 */,
-    productData: null
+    productData: null,
+    settlement_type: 0 // 大于0是包码
   }
 }
 
diff --git a/src/pages/plan/key/UseKeyAddEdit.jsx b/src/pages/plan/key/UseKeyAddEdit.jsx
index f23d3e30..4884dd3e 100644
--- a/src/pages/plan/key/UseKeyAddEdit.jsx
+++ b/src/pages/plan/key/UseKeyAddEdit.jsx
@@ -292,7 +292,6 @@ const UseKeyAddEdit = () => {
       })
       getResellerFun(planObj.reseller_id)
     }
-
     // KeyPcType 1编辑 2复制 3新增
     if (state.KeyPcType === "3") {
       setState({
@@ -658,7 +657,7 @@ const UseKeyAddEdit = () => {
       if (validator) {
         let param = addEditExchangeEl.current.getModel()
         if (state.isSettlement >= 1) {
-          // 合并数组
+          // 包码 合并数组
           let all_arr = [...param.product.legal, ...param.product.reduce, ...param.product.cash]
           if (all_arr.length > 1) {
             Notify.error("包码只能创建一个商品")