Skip to content

J
jiedao-app-operator-master
Commit c4a74a13 authored by 邓春圆's avatar 邓春圆
Browse files
Options

Merge remote-tracking branch 'origin/dev1.6' into dev1.6

parents 62dd98d1 27ca8d80
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
src/views/ecw/order/warehousing/components/Warehouse.vue
View file @ c4a74a13
...@@ -518,7 +518,8 @@ export default { ...@@ -518,7 +518,8 @@ export default {
prodTitleZh: undefined, prodTitleZh: undefined,
prodType: undefined, prodType: undefined,
type: undefined, type: undefined,
feeType: undefined feeType: undefined,
recordMode: undefined
}, },
form1: { form1: {
table: [], table: [],
...@@ -535,7 +536,8 @@ export default { ...@@ -535,7 +536,8 @@ export default {
prodTitleZh: undefined, prodTitleZh: undefined,
prodType: undefined, prodType: undefined,
type: 1, type: 1,
feeType: undefined feeType: undefined,
recordMode: undefined
}, },
brandList: [], brandList: [],
formRules: { formRules: {
...@@ -768,7 +770,6 @@ export default { ...@@ -768,7 +770,6 @@ export default {
hasCartonsNum += e.cartonsNum hasCartonsNum += e.cartonsNum
}) })
cartonsNum = this.warehousing.num - hasCartonsNum cartonsNum = this.warehousing.num - hasCartonsNum
} }
const form = val === 1 ? this.form1 : this.form const form = val === 1 ? this.form1 : this.form
......
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