修改需求
This commit is contained in:
@@ -110,7 +110,7 @@
|
|||||||
<el-row class="filter-wraper" type="flex" justify="space-between">
|
<el-row class="filter-wraper" type="flex" justify="space-between">
|
||||||
<el-col :span="2" class="p-label">目的地</el-col>
|
<el-col :span="2" class="p-label">目的地</el-col>
|
||||||
<el-col :span="8" class="select-wraper">
|
<el-col :span="8" class="select-wraper">
|
||||||
<el-select v-model="value1" placeholder="请选择" @change="selectChange">
|
<el-select v-model="value1" placeholder="请选择">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in options1"
|
v-for="item in options1"
|
||||||
:key="item.value"
|
:key="item.value"
|
||||||
@@ -281,6 +281,7 @@ export default {
|
|||||||
crudProduceScreen.getPointVehicle({ device_code: this.popData.device_code }).then(res => {
|
crudProduceScreen.getPointVehicle({ device_code: this.popData.device_code }).then(res => {
|
||||||
this.vcode = res
|
this.vcode = res
|
||||||
})
|
})
|
||||||
|
this.popList.push({ order_code: '', material_qty: '' })
|
||||||
this.show = true
|
this.show = true
|
||||||
} else if (type === 'BACK') {
|
} else if (type === 'BACK') {
|
||||||
crudProduceScreen.fabOrders({ device_code: this.popData.device_code }).then(res => {
|
crudProduceScreen.fabOrders({ device_code: this.popData.device_code }).then(res => {
|
||||||
@@ -321,7 +322,7 @@ export default {
|
|||||||
this.disabled = false
|
this.disabled = false
|
||||||
})
|
})
|
||||||
} else if (this.type === 'SCANER') {
|
} 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.disabled = false
|
||||||
this.$message(res.msg)
|
this.$message(res.msg)
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
@@ -337,15 +338,7 @@ export default {
|
|||||||
this.show = false
|
this.show = false
|
||||||
},
|
},
|
||||||
addRow() {
|
addRow() {
|
||||||
if (this.value1 === '1') {
|
this.popList.push({ order_code: '', material_qty: '' })
|
||||||
this.popList.push({ order_code: '', material_qty: '' })
|
|
||||||
}
|
|
||||||
},
|
|
||||||
selectChange(e) {
|
|
||||||
this.popList = []
|
|
||||||
if (e === '1') {
|
|
||||||
this.popList.push({ order_code: '', material_qty: '' })
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,6 +92,13 @@ export default {
|
|||||||
}
|
}
|
||||||
crudProduceScreen.deviceInLogin({ device_code: this.value }).then(res => {
|
crudProduceScreen.deviceInLogin({ device_code: this.value }).then(res => {
|
||||||
res.username = this.username
|
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.$store.dispatch('addScreenData', JSON.stringify(res))
|
||||||
this.show = false
|
this.show = false
|
||||||
this.disabled = false
|
this.disabled = false
|
||||||
|
|||||||
Reference in New Issue
Block a user