合并冲突

src/pages/exchangecode/add/add.js

@@ -140,7 +140,8 @@ export default class acclist extends React.Component {
       this.setState({ model: model })
       this.setState({ white_visible: true })
     }
-    //复制
+
+    //编辑
     if (batch_id > 0 || copyOpearo == 2) {
       //  this.setState({isEdit:true})
       getKeyBatchDetail(batch_id).then((res) => {
@@ -150,26 +151,16 @@ export default class acclist extends React.Component {
             this.setState({ pagetitle: '复制key' })
             getReseller(req.reseller_id).then((res) => {
               handelResponse(res, (req, msg) => {
-                this.setState({
+                this.setState({ reseller: req })
-                  phone_list: req.contact_phone,
+
-                  direct_reseller_id: req.direct_reseller_id,
+                this.setState({ phone_list: req.contact_phone })
-                  email_list: req.contact_email,
+                this.setState({ email_list: req.contact_email })
-                  reseller: req
-                })
-                getProductInfoSelect({
-                  reseller_id: req.direct_reseller_id
-                }).then((res) => {
-                  if (res.code === 200) {
-                    sessionStorage.setItem(
-                      'productsList',
-                      JSON.stringify(res.data.data)
-                    )
-                  }
-                })
               })
             })
+
             let model = {
               title: req.plan_title,
+              batch_name: '',
               style: req.style,
               quantity: req.quantity,
               allow_repetition: req.allow_repetition,
@@ -178,24 +169,10 @@ export default class acclist extends React.Component {
               code_batch: req.code_batch,
               batch_name: `${req.batch_name}_${++req.copy_count}`
             }
-            let codeInfo = {
+            this.setState({ checkedList: req.bind_object })
-              //数据模型不可少
+            this.setState({ model: model })
-              date_time: [req.begin_time, req.end_time]
+            this.setState({ endtime: req.end_time })
-            }
+            this.setState({ begintime: req.begin_time })
-            sessionStorage.setItem(
-              'plan_item',
-              JSON.stringify({
-                begin_time: req.begin_time,
-                end_time: req.end_time
-              })
-            )
-            this.setState({
-              checkedList: req.bind_object,
-              model: model,
-              endtime: req.end_time,
-              begintime: req.begin_time,
-              codeInfo: codeInfo
-            })
 
             let list = _.map(req.code_batch, (item) => {
               item.product = item.product.map((item1) => {
@@ -266,7 +243,6 @@ export default class acclist extends React.Component {
           (err) => {}
         )
       })
-      /* 新增 */
     } else {
       let plan_item = sessionStorage.getItem('plan_item')
       if (plan_item) {
@@ -283,6 +259,7 @@ export default class acclist extends React.Component {
         getReseller(id).then((res) => {
           handelResponse(res, (req, msg) => {
             this.setState({ reseller: req })
+
             this.setState({ phone_list: req.contact_phone })
             this.setState({ email_list: req.contact_email })
             this.setState({
@@ -1038,6 +1015,7 @@ export default class acclist extends React.Component {
                   let success = req.count - req.errorCount
                   this.setState({ success_count: success })
                   this.setState({ exceldata: req.validationFailed })
+
                   this.setState({ success_visible: true })
                 },
                 (err) => {