Commit 2595f2dc authored by Marcus's avatar Marcus

【2.0-空运备货订单】NA2300081L修改入仓商品特性后,备货-打包商品特性仍显示修改前的

https://zentao.test.jdshangmen.com/bug-view-4297.html
parent f487091b
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<el-form-item :label="$t('入仓特性')" style="margin-top: 20px"> <el-form-item :label="$t('入仓特性')" style="margin-top: 20px">
<el-checkbox-group v-model="form.prodAttrIds" disabled> <el-checkbox-group v-model="form.warehouseInProdAttrIds" disabled>
<el-checkbox v-for="item in attrList" :key="item.id" :label="item.id">{{ item.attrName }}</el-checkbox> <el-checkbox v-for="item in attrList" :key="item.id" :label="item.id">{{ item.attrName }}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
...@@ -360,7 +360,7 @@ export default { ...@@ -360,7 +360,7 @@ export default {
inTime: undefined, inTime: undefined,
material: undefined, material: undefined,
orderItemId: undefined, orderItemId: undefined,
prodAttrIds: [], warehouseInProdAttrIds: [],
prodId: undefined, prodId: undefined,
prodTitleEn: undefined, prodTitleEn: undefined,
prodTitleZh: undefined, prodTitleZh: undefined,
...@@ -432,7 +432,7 @@ export default { ...@@ -432,7 +432,7 @@ export default {
this.form.orderId = this.warehousing.orderId this.form.orderId = this.warehousing.orderId
this.form.orderItemId = this.warehousing.orderItemId this.form.orderItemId = this.warehousing.orderItemId
this.form.orderNo = this.warehousing.orderNo this.form.orderNo = this.warehousing.orderNo
this.form.prodAttrIds = this.warehousing.prodAttrIds?.split(',').map(e => +e) || [] this.form.warehouseInProdAttrIds = this.warehousing.warehouseInProdAttrIds?.split(',').map(e => +e) || []
this.form.prodId = this.warehousing.prodId this.form.prodId = this.warehousing.prodId
this.form.prodTitleEn = this.warehousing.prodTitleEn this.form.prodTitleEn = this.warehousing.prodTitleEn
this.form.prodTitleZh = this.warehousing.prodTitleZh this.form.prodTitleZh = this.warehousing.prodTitleZh
...@@ -485,7 +485,7 @@ export default { ...@@ -485,7 +485,7 @@ export default {
}, 0) }, 0)
}, },
handleSubmit() { handleSubmit() {
if (this.form.prodAttrIds.indexOf(4) !== -1) { if (this.form.warehouseInProdAttrIds.indexOf(4) !== -1) {
return this.$notify({ return this.$notify({
title: this.$t('提示'), title: this.$t('提示'),
message: this.$t("订单包含不接受货物,请检查"), message: this.$t("订单包含不接受货物,请检查"),
...@@ -538,13 +538,13 @@ export default { ...@@ -538,13 +538,13 @@ export default {
this.form.prodTitleZh = product.titleZh this.form.prodTitleZh = product.titleZh
this.form.prodTitleEn = product.titleEn this.form.prodTitleEn = product.titleEn
this.handleBrandChange(parseInt(this.form.brand)) this.handleBrandChange(parseInt(this.form.brand))
this.form.prodAttrIds = product.attrId ? product.attrId.split(',').map(e => +e) : [] this.form.warehouseInProdAttrIds = product.attrId ? product.attrId.split(',').map(e => +e) : []
}, },
onProductChange1(product){ onProductChange1(product){
this.form1.prodTitleZh = product.titleZh this.form1.prodTitleZh = product.titleZh
this.form1.prodTitleEn = product.titleEn this.form1.prodTitleEn = product.titleEn
this.handleBrandChange(parseInt(this.form1.brand)) this.handleBrandChange(parseInt(this.form1.brand))
this.form1.prodAttrIds = product.attrId ? product.attrId.split(',').map(e => +e) : [] this.form1.warehouseInProdAttrIds = product.attrId ? product.attrId.split(',').map(e => +e) : []
}, },
getProductBrandPage(titleZh = undefined) { getProductBrandPage(titleZh = undefined) {
getProductBrankPage({pageSize: 20, titleZh}).then(r => { getProductBrankPage({pageSize: 20, titleZh}).then(r => {
...@@ -638,10 +638,10 @@ export default { ...@@ -638,10 +638,10 @@ export default {
this.$modal.msgSuccess(this.$t("新增成功")) this.$modal.msgSuccess(this.$t("新增成功"))
if (this.activeName === 'first') { if (this.activeName === 'first') {
this.form.prodId = response.data this.form.prodId = response.data
this.form.prodAttrIds = this.productForm.attrArray this.form.warehouseInProdAttrIds = this.productForm.attrArray
} else { } else {
this.form1.prodId = response.data this.form1.prodId = response.data
this.form1.prodAttrIds = this.productForm.attrArray this.form1.warehouseInProdAttrIds = this.productForm.attrArray
} }
this.productCancel() this.productCancel()
}) })
......
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