Browse Source

新需求

master
蔡玲 3 months ago
parent
commit
da63376e81
  1. 5
      lms/nladmin-ui/src/views/wms/produceScreen/index.vue
  2. 12
      lms/nladmin-ui/src/views/wms/produceScreen/mork.js
  3. 13
      lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js

5
lms/nladmin-ui/src/views/wms/produceScreen/index.vue

@ -136,7 +136,7 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="select-wraper"> <div class="select-wraper">
<el-select v-model="scope.row.order_code" placeholder="请选择"> <el-select v-model="scope.row.order_code" filterable placeholder="请选择">
<el-option <el-option
v-for="item in options2" v-for="item in options2"
:key="item.order_code" :key="item.order_code"
@ -272,6 +272,9 @@ export default {
crudProduceScreen.fabOrders({ device_code: this.popData.device_code }).then(res => { crudProduceScreen.fabOrders({ device_code: this.popData.device_code }).then(res => {
this.options2 = [...res] this.options2 = [...res]
}) })
crudProduceScreen.getPointVehicle({ device_code: this.popData.device_code }).then(res => {
this.vcode = res.vehicle_code
})
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 => {

12
lms/nladmin-ui/src/views/wms/produceScreen/mork.js

@ -95,7 +95,15 @@ export function sendVehicle(data) {
}) })
} }
// 11.用户登出 // 11.获取点位的载具号
export function getPointVehicle() {
const res = { vehicle_code: '123' }
return new Promise((resolve, reject) => {
resolve(res)
})
}
// 12.用户登出
export function loginOut() { export function loginOut() {
const res = {} const res = {}
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -104,5 +112,5 @@ export function loginOut() {
} }
export default { export default {
authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, loginOut authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, getPointVehicle, loginOut
} }

13
lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js

@ -89,7 +89,16 @@ export function sendVehicle(data) {
}) })
} }
// 11.用户登出 // 11.获取点位的载具号
export function getPointVehicle(data) {
return request({
url: 'api/handheld/getPointVehicle',
method: 'post',
data
})
}
// 12.用户登出
export function loginOut(data) { export function loginOut(data) {
return request({ return request({
url: 'mobile/auth/loginOut', url: 'mobile/auth/loginOut',
@ -99,5 +108,5 @@ export function loginOut(data) {
} }
export default { export default {
authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, loginOut authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, getPointVehicle, loginOut
} }

Loading…
Cancel
Save