diff --git a/pages/manage/empty-material-racks-back.vue b/pages/manage/empty-material-racks-back.vue
index 239d03a..4b316e2 100644
--- a/pages/manage/empty-material-racks-back.vue
+++ b/pages/manage/empty-material-racks-back.vue
@@ -1,19 +1,84 @@
-
-
+
+
+
+
+
+
+ 当前点位
+
+
+
+
+
+
+
+ 载具号
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/manage/empty-tray-back.vue b/pages/manage/empty-tray-back.vue
index d7b54bd..e519258 100644
--- a/pages/manage/empty-tray-back.vue
+++ b/pages/manage/empty-tray-back.vue
@@ -25,7 +25,7 @@
-
+
@@ -34,7 +34,7 @@
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import LinkScan from '@/components/LinkScan.vue'
- import {getVehicleType, callEmptyVehicle} from '@/utils/getData2.js'
+ import {handheldCageFrame} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -56,22 +56,14 @@
getScanlist (e) {
this.val2 = e.join()
},
- /** 载具类型下拉框 */
- async _getVehicleType () {
- let res = await getVehicleType()
- this.options1 = [...res]
- },
- pickerChange (e) {
- this.index1 = e.detail.value
- },
- async _callEmptyVehicle () {
+ async _handheldCageFrame () {
this.disabled = true
- if (!this.val1) {
+ if (!this.val1 || !this.val2) {
this.disabled = false
return
}
try {
- let res = await callEmptyVehicle(this.val1)
+ let res = await handheldCageFrame(this.val1, this.val2)
this.clearUp()
uni.showToast({
title: res.message,
diff --git a/pages/manage/fill-tray.vue b/pages/manage/fill-tray.vue
index 248f341..c00dc01 100644
--- a/pages/manage/fill-tray.vue
+++ b/pages/manage/fill-tray.vue
@@ -4,6 +4,16 @@
+
+ 当前点位
+
+
+
+
+
+
载具类型
@@ -14,22 +24,11 @@
-
-
- 当前点位
-
-
-
-
-
-
-
+
@@ -37,7 +36,7 @@
diff --git a/utils/getData2.js b/utils/getData2.js
index 4e6d6ad..31ca2fd 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -30,6 +30,37 @@ export const handheldLock = (code, status) => request({
url:'api/handheld/lock',
data: {region_code: code, status: status}
})
+// 外协区空料架送回
+export const handheldRack = (code, vcode) => request({
+ url:'api/handheld/rack',
+ data: {device_code: code, vehicle_code: vcode}
+})
+// 外协区空笼框送回
+export const handheldCageFrame = (code, list) => request({
+ url:'api/handheld/cageFrame',
+ data: {device_code: code, vehicle_list: list}
+})
+// 物料转运
+export const handheldTranshipment = (code, vcode) => request({
+ url:'api/handheld/transhipment',
+ data: {device_code: code, vehicle_code: vcode}
+})
+// 载具类型列表
+// export const vehicleType = () => request({
+// url:'api/fab/vehicleType',
+// data: {}
+// })
+export const vehicleType = () => {
+ let res = {
+ content: [{ label: 'aa', value: '11'}, { label: 'bb', value: '22'}]
+ }
+ return res
+}
+// 补空框
+export const handheldStorehouse = (code, type) => request({
+ url:'api/handheld/storehouse',
+ data: {device_code: code, vehicle_type: type}
+})
/**
* 空托盘出库