Commit e833b247 authored by Marcus's avatar Marcus

web下单,品牌可以非必选,后台下单品牌是必须,需要统一

http://zentao.jdshangmen.com/bug-view-1070.html
parent 095cfff5
...@@ -406,19 +406,12 @@ export default { ...@@ -406,19 +406,12 @@ export default {
mounted() { mounted() {
getProductBrankPage({pageSize: 100000}).then(r => { getProductBrankPage({pageSize: 100000}).then(r => {
this.brandList = [ this.brandList = r.data.list.map(e => {
{
"titleZh":"",
"titleEn":"",
"id":'0'
},
...r.data.list.map(e => {
if(e.id){ if(e.id){
e.id = e.id.toString() e.id = e.id.toString()
} }
return e return e
}) })
]
}) })
}, },
...@@ -504,7 +497,10 @@ export default { ...@@ -504,7 +497,10 @@ export default {
opened(val) { opened(val) {
if (val) { if (val) {
this.form.material = this.warehousing.material this.form.material = this.warehousing.material
this.form.brand = this.warehousing.brand?.toString() || '' if (this.warehousing.brand && this.warehousing.brand !== 0){
this.form.brand = this.warehousing.brand.toString() || ''
}
t
this.handleBrandChange(this.form.brand) this.handleBrandChange(this.form.brand)
getWarehouseLastUpdateApprovalInfo({ getWarehouseLastUpdateApprovalInfo({
orderItemId: this.warehousing.orderItemId, orderItemId: this.warehousing.orderItemId,
...@@ -773,7 +769,7 @@ export default { ...@@ -773,7 +769,7 @@ export default {
return brand.titleZh return brand.titleZh
} }
} }
return '0' return ''
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment