From 541857aeabbbb7e33f145cf87384adc76eb8d8b6 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Wed, 1 Jun 2022 18:03:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=AB=8B=E5=87=8F?=
 =?UTF-8?q?=E9=87=91=E5=85=BC=E5=AE=B9=E8=80=81=E6=95=B0=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/exchangecode/list/list.js |  8 ++++++--
 src/pages/plan/knockGold/index.jsx  | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/pages/exchangecode/list/list.js b/src/pages/exchangecode/list/list.js
index 1f126489..8a2e1091 100644
--- a/src/pages/exchangecode/list/list.js
+++ b/src/pages/exchangecode/list/list.js
@@ -519,14 +519,18 @@ export default class acclist extends React.Component {
                 if (com == 'opearo') {
                   return (
                     <div>
-                      {rowData.status != 4 && rowData.status != 5 ? (
+                      {rowData.status != 4 &&
+                      rowData.status != 5 &&
+                      rowData.status != 6 ? (
                         <span
                           className='grid-link'
                           onClick={(e) => this.editinfo(e, rowData)}>
                           编辑
                         </span>
                       ) : (
-                        <span style={{ color: '#d8dbdd' }}>编辑</span>
+                        <span style={{ color: '#d8dbdd', marginRight: '5px' }}>
+                          编辑
+                        </span>
                       )}
                       {rowData.status != 4 && rowData.status != 5 ? (
                         <span
diff --git a/src/pages/plan/knockGold/index.jsx b/src/pages/plan/knockGold/index.jsx
index 7f01ee01..61638750 100644
--- a/src/pages/plan/knockGold/index.jsx
+++ b/src/pages/plan/knockGold/index.jsx
@@ -46,7 +46,7 @@ const receiveTypeList = [
   { key: 'dey', text: '每天' }
 ]
 //预警百分比
-const earlyPerList = ['70', '50', '30', '20']
+const earlyPerList = [70, 50, 30, 20]
 const initArray = (targetNum) => {
   return Array.from({ length: targetNum }, (_, index) => index)
 }
@@ -157,6 +157,7 @@ export default class addKnockGold extends Component {
           if (item.mobile === items.key) return items
         }).filter((item1) => item1)[0]
       })
+      model.origin = this.props.data
       /* 以下操作 筛选出输入框的预警值并经行填充 */
       const copy_early_per = this.props.data?.early_per || []
       copy_early_per.map((item) => {
@@ -272,7 +273,6 @@ export default class addKnockGold extends Component {
     ) {
       if (this.props.data) {
         let temp = []
-
         if (sessionStorage.getItem('knockGoldData')) {
           temp = JSON.parse(sessionStorage.getItem('knockGoldData'))
 
@@ -281,13 +281,18 @@ export default class addKnockGold extends Component {
               item.channel_activity_id === this.props.data.channel_activity_id
             )
           })
-
           /* 校验表单 */
           if (this.limitFunction() === false) {
             return false
           }
-
-          temp[index] = this.transformDataCode()
+          if (this.props.data?.goods_id) {
+            temp[index] = Object.assign({
+              ...this.state.model.origin,
+              ...this.transformDataCode()
+            })
+          } else {
+            temp[index] = this.transformDataCode()
+          }
 
           sessionStorage.setItem('knockGoldData', JSON.stringify(temp))