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 | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index adf7b0c..66477d4 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -24,27 +24,27 @@
icon: '',
elements: [],
elements2: [
- // {
- // title: '缁勬墭鍏ュ簱',
- // name: 'pakin',
- // color: 'orange',
- // cuIcon: 'pullup',
- // url: '/pakin/pakin'
- // },
- // {
- // title: '璁㈠崟缁勬墭',
- // name: 'orderPakin',
- // color: 'blue',
- // cuIcon: 'pullup',
- // url: '/order/orderPakin'
- // },
+ {
+ title: '缁勬墭鍏ュ簱',
+ name: 'pakin',
+ color: 'orange',
+ cuIcon: 'pullup',
+ url: '/pakin/pakin'
+ },
{
title: '璁㈠崟缁勬墭',
- name: 'putOn',
- color: 'cyan',
+ name: 'orderPakin',
+ color: 'blue',
cuIcon: 'pullup',
- url: '/order/orderPutOn2'
+ url: '/order/orderPakin'
},
+ // {
+ // title: '璁㈠崟缁勬墭',
+ // name: 'putOn',
+ // color: 'cyan',
+ // cuIcon: 'pullup',
+ // url: '/order/orderPutOn2'
+ // },
{
title: '缁勬墭涓婃灦',
name: 'putOn',
@@ -66,14 +66,7 @@
// color: 'purple',
// cuIcon: 'text',
// url: '/print/print'
- // },
- {
- title: '鐢熸垚璁㈠崟',
- name: 'orderPutOn',
- color: 'mauve',
- cuIcon: 'pullup',
- url: '/order/createOrder'
- },
+ // },
// {
// title: '璁㈠崟涓婃灦',
// name: 'orderPutOn',
@@ -89,6 +82,13 @@
url: '/order/orderPutDown'
},
{
+ title: '鎷ｈ揣涓嬫灦',
+ name: 'pickOffLines',
+ color: 'pink',
+ cuIcon: 'pulldown',
+ url: '/order/pickOffLines'
+ },
+ {
title: '搴撳瓨鏌ヨ',
name: 'stockQuery',
color: 'brown',
--
Gitblit v1.9.1