Commit af76f0de authored by Marcus's avatar Marcus

只有集运订单长宽高才是0,其他订单仍然是空,让用户自己输入,PDA和后台都是如此

https://zentao.test.jdshangmen.com/bug-view-2401.html
parent 719bd446
...@@ -397,6 +397,10 @@ export default { ...@@ -397,6 +397,10 @@ export default {
type: Boolean, type: Boolean,
default: false default: false
}, },
isJiyun: {
type: Boolean,
default: false
},
// 入仓修改 // 入仓修改
edit: { edit: {
type: Boolean, type: Boolean,
...@@ -699,9 +703,9 @@ export default { ...@@ -699,9 +703,9 @@ export default {
} }
const form = val === 1 ? this.form1 : this.form const form = val === 1 ? this.form1 : this.form
form.orderWarehouseInItemDoList.push({ form.orderWarehouseInItemDoList.push({
"boxGauge1": 0, "boxGauge1": this.isJiyun ? 0 : '',
"boxGauge2": 0, "boxGauge2": this.isJiyun ? 0 : '',
"boxGauge3": 0, "boxGauge3": this.isJiyun ? 0 : '',
"cartonsNum": cartonsNum > 0 ? cartonsNum : '', "cartonsNum": cartonsNum > 0 ? cartonsNum : '',
"expressNo": "", "expressNo": "",
"quantityAll": undefined, "quantityAll": undefined,
...@@ -737,7 +741,7 @@ export default { ...@@ -737,7 +741,7 @@ export default {
const [boxGauge1, boxGauge2, boxGauge3] = boxGaugeList const [boxGauge1, boxGauge2, boxGauge3] = boxGaugeList
return {...e, boxGauge1, boxGauge2, boxGauge3} return {...e, boxGauge1, boxGauge2, boxGauge3}
} }
return {...e, boxGauge1: 0, boxGauge2: 0, boxGauge3: 0} return {...e, boxGauge1: this.isJiyun ? 0 : '', boxGauge2: this.isJiyun ? 0 : '', boxGauge3: this.isJiyun ? 0 : ''}
}) })
}, },
tableData1() { tableData1() {
......
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList" <warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList"
:order-id="orderId" :warehouse-id="warehouseId" :is-editing="isEdit"></warehouse-area-dialog> :order-id="orderId" :warehouse-id="warehouseId" :is-editing="isEdit"></warehouse-area-dialog>
<edit-dialog :title="title" :order-id="order.orderId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="isEdit"></edit-dialog> <edit-dialog :title="title" :order-id="order.orderId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="isEdit" :is-jiyun="order.type.indexOf('1') !== -1"></edit-dialog>
<!-- 完成入仓 --> <!-- 完成入仓 -->
<el-dialog <el-dialog
......
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