diff --git a/src/pages/exchangecode/exchangecodeAdd/index.jsx b/src/pages/exchangecode/exchangecodeAdd/index.jsx index c433eb41..d37bea71 100644 --- a/src/pages/exchangecode/exchangecodeAdd/index.jsx +++ b/src/pages/exchangecode/exchangecodeAdd/index.jsx @@ -795,11 +795,14 @@ export default class exchangeAdd extends React.Component { addProduct(type) { this.setState({ addIsType: type }) /* 类型 */ let direct_reseller_ids = this.state.direct_reseller_id + if (direct_reseller_ids <= 0) { - // 老数据不能进行新增商品操作 - Notify.error(`请添加映射分销商`) - return + return Notify.error(`请添加映射分销商`) } + if (!this.state.isState && !this.state.codeInfo.keyBatchSelect.key) { + return Notify.error(`请选择归属key批次`) + } + if (type === "addProduct") { this.setState({ product_title: "新建商品", newGoodsBtnLoading: true }) } else { @@ -1074,10 +1077,10 @@ export default class exchangeAdd extends React.Component { this.getResellerFunction(e.reseller_id) this.handleChange("", "keyBatchSelect") this.setState({ - plan_time: [e.start_time, e.end_time] + plan_time: [e.begin_time, e.end_time] }) const time = { - start_time: e.start_time, + begin_time: e.begin_time, end_time: e.end_time } sessionStorage.setItem("knockGold_effectDate", JSON.stringify(time)) diff --git a/src/pages/exchangecode/list/list.js b/src/pages/exchangecode/list/list.js index cabb64f7..f72d66dd 100644 --- a/src/pages/exchangecode/list/list.js +++ b/src/pages/exchangecode/list/list.js @@ -149,6 +149,7 @@ export default class acclist extends React.Component { } /* 新建/复制/编辑/兑换码 */ addCodeFunction(type, param) { + sessionStorage.setItem("knockGold_effectDate", JSON.stringify({})) let activerou = [ { pagetitle: "新建兑换码", @@ -185,7 +186,6 @@ export default class acclist extends React.Component { sessionStorage.setItem("isState", type) sessionStorage.setItem("breaknav", JSON.stringify(activerou)) sessionStorage.setItem("pathname2", "/home/exchangecode-exchangecodeAdd") - this.props.history.push("/home/exchangecode-exchangecodeAdd") } @@ -247,65 +247,6 @@ export default class acclist extends React.Component { return element } - /* 编辑 */ - editinfo(e, rowData) { - sessionStorage.setItem("pathname2", "/home/exchangecode-edit") - let activerou = [ - { - pagetitle: "编辑", - items: [ - { - path: "/home/exchangecode-list", - name: "兑换码管理" - }, - { - path: "/home/exchangecode-add", - name: "编辑:" + rowData.title - } - ] - } - ] - sessionStorage.setItem( - "knockGold_effectDate", - JSON.stringify(rowData.keyBatch.plan) - ) - sessionStorage.setItem("code_id", rowData.id) - sessionStorage.setItem("breaknav", JSON.stringify(activerou)) - sessionStorage.setItem("approval_id", rowData.approval_id) - sessionStorage.setItem("approval_status", rowData.status) - window.open("#/home/exchangecode-edit") - } - - /* 复制 */ - copyFunction(key_batch_id, id, keyBatch, title) { - sessionStorage.setItem("keybatch_id", key_batch_id) - sessionStorage.setItem("copy_code_id", id) - sessionStorage.setItem("key_reseller_id", keyBatch.plan.reseller_id) - sessionStorage.setItem("approval_id", keyBatch.approval_id) /* 审核id */ - let breakchangenav = [ - { - pagetitle: "复制key", - items: [ - { - path: "/home/exchangecode-list", - name: "兑换码管理" - }, - { - path: "/home/exchangecode-copyCode", - name: "复制:" + title - } - ] - } - ] - sessionStorage.setItem( - "knockGold_effectDate", - JSON.stringify(keyBatch.plan) - ) - sessionStorage.setItem("pathname2", "/home/exchangecode-copyCode") - sessionStorage.setItem("breaknav", JSON.stringify(breakchangenav)) - this.props.history.push("/home/exchangecode-copyCode") - } - tabFn(index) { this.setState({ tabIndex: index, key_word: "" }) this.setState({ page: 1, limit: 10 })