From bcd82a9b16c00a6c23a92b4a19910e1915ca45fb Mon Sep 17 00:00:00 2001
From: Wind-58 <wangsongsole@126.com>
Date: Thu, 1 Sep 2022 11:21:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=85=91=E6=8D=A2=E7=A0=81?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E3=80=81=E6=96=B0=E5=A2=9E=E3=80=81=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exchangecode/exchangecodeAdd/index.jsx    | 20 +++++++++++++------
 .../exchangecode/exchangecodeAdd/utils.js     |  6 +++---
 src/pages/exchangecode/list/list.js           |  6 +++---
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/pages/exchangecode/exchangecodeAdd/index.jsx b/src/pages/exchangecode/exchangecodeAdd/index.jsx
index ed999300..1780d36e 100644
--- a/src/pages/exchangecode/exchangecodeAdd/index.jsx
+++ b/src/pages/exchangecode/exchangecodeAdd/index.jsx
@@ -285,12 +285,13 @@ export default class exchangeAdd extends React.Component {
               //获取分销商
               this.getResellerFunction(reqCopy.plan.reseller_id)
 
-              this.setState({ codeInfo: codeInfo })
-              this.setState({ isload: true })
+              this.setState({ codeInfo: codeInfo, isload: true })
+
               _.map(reqCopy.goods, (res) => {
                 res.checked = true
                 return res
               })
+
               this.setState({ tempdata: reqCopy.goods || [] })
 
               let a1 = reqCopy.goods.map((item) => {
@@ -339,9 +340,9 @@ export default class exchangeAdd extends React.Component {
     }
   }
 
+  /* 审核中转换数据 */
   transFormData1(req, type) {
     const newData = []
-    /* 转换数据结构 */
     req.legal.map((item1) => {
       item1.type = 1
       item1.only = item1.product_id
@@ -362,6 +363,7 @@ export default class exchangeAdd extends React.Component {
         obj.id = item1?.goods_id
       }
       obj.product_id = item1?.goods_id
+      obj.code_batch_id = item1?.code_batch_id
       obj.product_type_text = "立减金"
       obj.contract_price = item1.price
       obj.create_time = item1.create_time
@@ -392,12 +394,13 @@ export default class exchangeAdd extends React.Component {
     return newData
   }
 
-  /* 转换数据 */
+  /* 无审核转换数据 */
   transFormData(reqCopy) {
     const resData = []
     reqCopy.goods.map((item) => {
       /* type 1为商品 2为立减金 转译字符方便处理 */
       /* 此处only 商品为product_id 立减金为channel_activity_id */
+      if (this.state.isState === 1) delete item.entity.id /* 复制时删除id */
       if (item.type === 1) {
         item.entity.upstream = "直连天下"
         item.entity.only = item.entity.product_id
@@ -407,6 +410,7 @@ export default class exchangeAdd extends React.Component {
         resData.push(item.entity)
       } else if (item.type === 2) {
         item.entity.weight = item.weight
+        item.entity.code_batch_id = item.code_batch_id
         resData.push({
           origin: item.entity,
           type: item.type,
@@ -646,7 +650,7 @@ export default class exchangeAdd extends React.Component {
   /* 复制\新增状态下数据提交 */
   submitCopyOrAddCodeData() {
     let data = this.copyOrAddBuildData()
-    let id = sessionStorage.getItem("keybatch_id")
+    let id = sessionStorage.getItem("keyBatch_id")
 
     keyEditApproval(id, data).then((res) => {
       handelResponse(
@@ -1108,7 +1112,11 @@ export default class exchangeAdd extends React.Component {
                     prop='keyBatchSelect'
                     id='keyBatchSelect'>
                     <Select
-                      onChange={(e) => this.handleChange(e, "keyBatchSelect")}
+                      onChange={(e) => {
+                        this.handleChange(e, "keyBatchSelect")
+                        /* 新增时保存key批次 */
+                        sessionStorage.setItem("keyBatch_id", e?.id)
+                      }}
                       clearable
                       value={this.state.codeInfo.keyBatchSelect}
                       options={this.state.keyBatchSelectData}
diff --git a/src/pages/exchangecode/exchangecodeAdd/utils.js b/src/pages/exchangecode/exchangecodeAdd/utils.js
index 58c0caad..9025d510 100644
--- a/src/pages/exchangecode/exchangecodeAdd/utils.js
+++ b/src/pages/exchangecode/exchangecodeAdd/utils.js
@@ -161,8 +161,8 @@ export const init = () => {
     tableLoading: false,
     newGoldLoading: false,
     addIsType: "",
-    isState: 0,
-    planSelectData: [] /* 营销计划数据 */,
-    keyBatchSelectData: [] /* 营销计划ID */
+    isState: 0 /* 0:新增 1:复制 2:编辑 */,
+    planSelectData: [] /* 归属计划数据 */,
+    keyBatchSelectData: [] /* 归属key数据 */
   }
 }
diff --git a/src/pages/exchangecode/list/list.js b/src/pages/exchangecode/list/list.js
index 20ce8636..cabb64f7 100644
--- a/src/pages/exchangecode/list/list.js
+++ b/src/pages/exchangecode/list/list.js
@@ -172,12 +172,12 @@ export default class acclist extends React.Component {
         "knockGold_effectDate",
         JSON.stringify(param.keyBatch.plan)
       )
-      sessionStorage.setItem("keybatch_id", param.key_batch_id)
-      sessionStorage.setItem("key_reseller_id", param.keyBatch.plan.reseller_id)
-      sessionStorage.setItem("approval_id", param.keyBatch.approval_id)
+      /* 复制兑换码的key批次Id */
+      sessionStorage.setItem("keyBatch_id", param.key_batch_id)
     } else if (type === 2) {
       activerou[0].pagetitle = "编辑"
       activerou[0].items[1].name = `编辑:${param.title}兑换码的商品范围列表`
+      sessionStorage.setItem("approval_id", param.keyBatch.approval_id)
       sessionStorage.setItem("approval_status", param.status)
     }