From 0e9b215cbc05b20d4f9a677b4c9623388ba7f3f7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 02 十一月 2023 10:31:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mtmmwms' into mtmmwms
---
pages/home/home.vue | 112 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 45 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index c8474e8..66477d4 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -24,13 +24,13 @@
icon: '',
elements: [],
elements2: [
- // {
- // title: '缁勬墭鍏ュ簱',
- // name: 'pakin',
- // color: 'cyan',
- // cuIcon: 'pullup',
- // url: '/pakin/pakin'
- // },
+ {
+ title: '缁勬墭鍏ュ簱',
+ name: 'pakin',
+ color: 'orange',
+ cuIcon: 'pullup',
+ url: '/pakin/pakin'
+ },
{
title: '璁㈠崟缁勬墭',
name: 'orderPakin',
@@ -38,6 +38,13 @@
cuIcon: 'pullup',
url: '/order/orderPakin'
},
+ // {
+ // title: '璁㈠崟缁勬墭',
+ // name: 'putOn',
+ // color: 'cyan',
+ // cuIcon: 'pullup',
+ // url: '/order/orderPutOn2'
+ // },
{
title: '缁勬墭涓婃灦',
name: 'putOn',
@@ -45,33 +52,41 @@
cuIcon: 'pullup',
url: '/pakin/putOn'
},
- {
- title: '璁㈠崟涓婃灦2',
- name: 'putOn',
- color: 'cyan',
- cuIcon: 'pullup',
- url: '/order/orderPutOn2'
- },
+
+ // {
+ // title: '璁㈠崟缁勬墭3',
+ // name: 'putOn',
+ // color: 'cyan',
+ // cuIcon: 'pullup',
+ // url: '/order/orderPutOn3'
+ // },
// {
// title: '鎵撳嵃',
// name: 'print',
// color: 'purple',
// cuIcon: 'text',
// url: '/print/print'
+ // },
+ // {
+ // title: '璁㈠崟涓婃灦',
+ // name: 'orderPutOn',
+ // color: 'mauve',
+ // cuIcon: 'pullup',
+ // url: '/order/orderPutOn'
// },
- {
- title: '璁㈠崟涓婃灦',
- name: 'orderPutOn',
- color: 'mauve',
- cuIcon: 'pullup',
- url: '/order/orderPutOn'
- },
{
title: '璁㈠崟涓嬫灦',
name: 'orderPutDown',
color: 'pink',
cuIcon: 'pulldown',
url: '/order/orderPutDown'
+ },
+ {
+ title: '鎷ｈ揣涓嬫灦',
+ name: 'pickOffLines',
+ color: 'pink',
+ cuIcon: 'pulldown',
+ url: '/order/pickOffLines'
},
{
title: '搴撳瓨鏌ヨ',
@@ -88,33 +103,40 @@
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',
+ title: '搴撲綅杞Щ',
+ name: 'locMove',
color: 'olive',
cuIcon: 'order',
- url: '/pakin/piking'
+ url: '/loc/locMove'
},
- {
- title: '鎹㈡澘缁戝畾',
- name: 'changePallet',
- color: 'green',
- cuIcon: 'order',
- url: '/stock/changePallet'
- },
+ // {
+ // 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',
--
Gitblit v1.9.1