HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4

This commit is contained in:
zhangds 2022-08-09 14:51:43 +08:00
parent ca839ca6f0 bcdd504161
commit 3991829fb0
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pages/exchangecode/add/add.js
View File

@ -124,7 +124,8 @@ export default class acclist extends React.Component {
newGoodsBtnLoading: false, newGoodsBtnLoading: false,
newGoldLoading: false, newGoldLoading: false,
product_title: '新建商品', product_title: '新建商品',
addIsType: '' addIsType: '',
keyCodeId:'',//key批次ID
} }
} }
@ -141,7 +142,7 @@ export default class acclist extends React.Component {
this.setState({ white_visible: true }) this.setState({ white_visible: true })
} }
//编辑 //复制
if (batch_id > 0 || copyOpearo == 2) { if (batch_id > 0 || copyOpearo == 2) {
// this.setState({isEdit:true}) // this.setState({isEdit:true})
getKeyBatchDetail(batch_id).then((res) => { getKeyBatchDetail(batch_id).then((res) => {
@ -160,7 +161,6 @@ export default class acclist extends React.Component {
let model = { let model = {
title: req.plan_title, title: req.plan_title,
batch_name: '',
style: req.style, style: req.style,
quantity: req.quantity, quantity: req.quantity,
allow_repetition: req.allow_repetition, allow_repetition: req.allow_repetition,
@ -173,7 +173,7 @@ export default class acclist extends React.Component {
this.setState({ model: model }) this.setState({ model: model })
this.setState({ endtime: req.end_time }) this.setState({ endtime: req.end_time })
this.setState({ begintime: req.begin_time }) this.setState({ begintime: req.begin_time })
this.setState({ keyCodeId: req.id })
let list = _.map(req.code_batch, (item) => { let list = _.map(req.code_batch, (item) => {
item.product = item.product.map((item1) => { item.product = item.product.map((item1) => {
let obj = {} let obj = {}
@ -226,7 +226,6 @@ export default class acclist extends React.Component {
productRange.push(item.product_name) productRange.push(item.product_name)
}) })
productRange = productRange.toString() productRange = productRange.toString()
console.log(255, productRange)
pr.range = productRange pr.range = productRange
pr.restrict = item.restrict pr.restrict = item.restrict
pr.title = item.title pr.title = item.title
@ -744,6 +743,7 @@ export default class acclist extends React.Component {
this.setState({ audit_visible: false }) this.setState({ audit_visible: false })
let id = sessionStorage.getItem('key_plan_id') let id = sessionStorage.getItem('key_plan_id')
data.copy_key_batch_id=this.state.keyCodeId;
addKeysBatchInfo(id, data).then((res) => { addKeysBatchInfo(id, data).then((res) => {
handelResponse( handelResponse(
res, res,

4
src/pages/plan/keyList/index.jsx
View File

@ -122,7 +122,9 @@ export default class acclist extends React.Component {
this.setState({ distdata: req.data }) this.setState({ distdata: req.data })
this.setState({ dataCount: req.total }) this.setState({ dataCount: req.total })
}, },
(err) => {} (err) => {
Notify.warn(err)
}
) )
}) })
} }