From 83a303c2ad11a1b7ea1982cc873794f0d1088041 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 05 七月 2024 18:59:57 +0800
Subject: [PATCH] # 登录选仓库
---
pages/home/home.vue | 163 +++++++++++++++++++++---------------------------------
1 files changed, 64 insertions(+), 99 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 2ad9a04..58d6e5b 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -30,119 +30,84 @@
color: 'cyan',
cuIcon: 'pullup',
url: '/pakin/pakin'
- },
+ },
{
- title: '鍐嶆鎷ｆ枡',
- name: 'changePallet',
- color: 'green',
- cuIcon: 'order',
- url: '/pakin/pickAgain'
- },
- {
- title: 'AGV缁勬墭',
- name: 'AGVPakin',
- color: 'blue',
- cuIcon: 'pullup',
- url: '/AGV/AGVPakin'
- },
- {
- title: 'AGV涓婃灦缁戝畾',
- name: 'AGVPakinBing',
- color: 'mauve',
- // cuIcon: 'pullup',
- url: '/AGV/AGVPakinBing'
- },
- {
- title: 'AGV鍚姩鍏ュ簱',
- name: 'AGVStart',
- color: 'pink',
- // cuIcon: 'pullup',
- url: '/AGV/AGVStart'
- },
- {
- title: 'AGV涓婃灦缁勬墭',
- name: 'AGVPakinOn',
- color: 'brown',
- // cuIcon: 'pullup',
- url: '/AGV/AGVPakinOn'
- },
- {
- title: '璁㈠崟缁勬墭',
- name: 'orderPakin',
- color: 'red',
- cuIcon: 'pullup',
- url: '/order/orderPakin'
- },
- {
- title: '缁勬墭涓婃灦',
+ title: '骞冲簱缁勬墭',
name: 'putOn',
color: 'orange',
cuIcon: 'pullup',
url: '/pakin/putOn'
},
- // {
- // title: '鎵撳嵃',
- // name: 'print',
- // color: 'purple',
- // cuIcon: 'text',
- // url: '/print/print'
- // },
{
- title: '璁㈠崟涓婃灦',
+ title: '骞冲簱涓婃灦',
+ name: 'print',
+ color: 'purple',
+ cuIcon: 'text',
+ url: '/print/print'
+ },
+ {
+ title: '骞冲簱涓嬫灦',
name: 'orderPutOn',
color: 'yellow',
cuIcon: 'pullup',
- url: '/order/orderPutOn'
+ url: '/order/orderList'
},
{
- title: '璁㈠崟涓嬫灦',
- name: 'orderPutDown',
+ title: '璁㈠崟缁勬墭',
+ name: 'orderComb',
color: 'olive',
cuIcon: 'pulldown',
- url: '/order/orderPutDown'
+ url: '/order/orderComb'
},
{
- title: '搴撳瓨鏌ヨ',
- name: 'stockQuery',
+ title: '骞舵澘鍏ュ簱',
+ name: 'orderPickConfirm',
color: 'green',
- cuIcon: 'check',
- url: '/stock/stockQuery'
+ cuIcon: 'pulldown',
+ url: '/order/orderPickConfirm'
},
- {
- title: '鐩樼偣',
- name: 'stockCheck',
- color: 'red',
- cuIcon: 'post',
- url: '/stock/stockCheck'
- },
- {
- title: '鍟嗗搧鎵撳嵃',
- name: 'matList',
- color: 'orange',
- cuIcon: 'post',
- url: '/mat/matList'
- },
- {
- title: '琛ヨ揣',
- name: 'restock',
- color: 'yellow',
- cuIcon: 'punch',
- url: '/stock/restock'
- },
- {
- title: '杞叏鏉�',
- name: 'piking',
- color: 'olive',
- cuIcon: 'order',
- url: '/pakin/piking'
- },
- {
- title: '鎹㈡澘缁戝畾',
- name: 'changePallet',
- color: 'green',
- cuIcon: 'order',
- url: '/stock/changePallet'
- },
+ // {
+ // title: '搴撳瓨鏌ヨ',
+ // name: 'stockQuery',
+ // color: 'green',
+ // cuIcon: 'check',
+ // url: '/stock/stockQuery'
+ // },
+ // {
+ // title: '鐩樼偣',
+ // name: 'stockCheck',
+ // color: 'red',
+ // cuIcon: 'post',
+ // url: '/stock/stockCheck'
+ // },
+ // {
+ // title: '鍟嗗搧鎵撳嵃',
+ // name: 'matList',
+ // color: 'orange',
+ // cuIcon: 'post',
+ // url: '/mat/matList'
+ // },
+ // {
+ // title: '琛ヨ揣',
+ // name: 'restock',
+ // color: 'yellow',
+ // cuIcon: 'punch',
+ // url: '/stock/restock'
+ // },
+ // {
+ // title: '杞叏鏉�',
+ // name: 'piking',
+ // color: 'olive',
+ // cuIcon: 'order',
+ // url: '/pakin/piking'
+ // },
+ // {
+ // title: '鎹㈡澘缁戝畾',
+ // name: 'changePallet',
+ // color: 'green',
+ // cuIcon: 'order',
+ // url: '/stock/changePallet'
+ // },
{
title: '閫�鍑虹櫥褰�',
name: 'logOut',
@@ -164,7 +129,7 @@
getAuth() {
let that = this
uni.request({
- url: that.baseUrl + '/menu/pda/auth',
+ url: that.baseUrl + '/mobile/menu/pda/auth',
data: {},
header: { 'token': uni.getStorageSync('token') },
method: 'POST',
@@ -173,7 +138,7 @@
that.elements = []
if (res.code === 200) {
if (res.data == undefined || res.data == null || res.data == "") {
- that.elements = that.elements2
+ that.elements = that.elements2
return
}
for (var i = 0; i < res.data.length; i++) {
@@ -191,9 +156,9 @@
}
that.elements.push({
title: '閫�鍑虹櫥褰�',
- name: 'logOut',
+ name: '',
color: 'grey',
- cuIcon: 'exit',
+ cuIcon: '',
url: '/login/logOut'
})
} else if (res.code === 403) {
--
Gitblit v1.9.1