diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue index d6a2f03..ec5a204 100644 --- a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue +++ b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue @@ -110,7 +110,7 @@ 目的地 - + { this.vcode = res }) + this.popList.push({ order_code: '', material_qty: '' }) this.show = true } else if (type === 'BACK') { crudProduceScreen.fabOrders({ device_code: this.popData.device_code }).then(res => { @@ -321,7 +322,7 @@ export default { this.disabled = false }) } else if (this.type === 'SCANER') { - crudProduceScreen.sendMater({ device_code: this.popData.device_code, mater: this.popList, point_code: this.value1 }).then(res => { + crudProduceScreen.sendMater({ device_code: this.screenData.in_code, mater: this.popList, point_code: this.value1 }).then(res => { this.disabled = false this.$message(res.msg) }).catch(() => { @@ -337,15 +338,7 @@ export default { this.show = false }, addRow() { - if (this.value1 === '1') { - this.popList.push({ order_code: '', material_qty: '' }) - } - }, - selectChange(e) { - this.popList = [] - if (e === '1') { - this.popList.push({ order_code: '', material_qty: '' }) - } + this.popList.push({ order_code: '', material_qty: '' }) } } } diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue b/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue index e7a6623..08bc6b2 100644 --- a/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue +++ b/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue @@ -92,6 +92,13 @@ export default { } crudProduceScreen.deviceInLogin({ device_code: this.value }).then(res => { res.username = this.username + let in_code = '' + res.region_points.map(el => { + if (el.type === '0') { + in_code = el.device_code + } + }) + res.in_code = in_code this.$store.dispatch('addScreenData', JSON.stringify(res)) this.show = false this.disabled = false