From e191eb91bf837b58e088aef3bfd410d1b55a690e Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 10 二月 2025 08:05:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncPda' into nbncPda
---
pages/home/home.vue | 214 ++++++++++++++++++++++++++++++----------------------
1 files changed, 123 insertions(+), 91 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index cfe7351..76a342f 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,10 +1,24 @@
<template>
<view>
+ <view class="status_bar">
+ <!-- 杩欓噷鏄姸鎬佹爮 -->
+ </view>
+ <uni-nav-bar background-color="#f8f8f8" title="涓� 椤�" @clickLeft="back" :fixed="true"
+ :border="false" rightWidth="160rpx" leftWidth="160rpx"
+ >
+ <block slot="right">
+ <view class="city">
+ <view>
+ <text class="uni-nav-bar-text">{{store}}</text>
+ </view>
+ </view>
+ </block>
+ </uni-nav-bar>
<scroll-view scroll-y class="page">
<view class="nav-list">
<navigator hover-class='none' :url="'/pages' + item.url" class="nav-li" navigateTo
:class="'bg-'+item.color" :style="[{animation: 'show ' + ((index+1)*0.2+1) + 's 1'}]"
- v-for="(item,index) in elements" :key="index">
+ v-for="(item,index) in elements2" :key="index">
<view class="nav-title">{{item.title}}</view>
<view class="nav-name">{{item.name}}</view>
<text :class="'cuIcon-' + item.cuIcon"></text>
@@ -22,6 +36,9 @@
baseUrl: '',
token: '',
icon: '',
+ username: '',
+ storeId: 0,
+ store: '',
elements: [],
elements2: [
{
@@ -30,119 +47,119 @@
color: 'cyan',
cuIcon: 'pullup',
url: '/pakin/pakin'
- },
+ },
+ // {
+ // title: '骞冲簱缁勬墭',
+ // name: 'putOn',
+ // color: 'orange',
+ // cuIcon: 'pullup',
+ // url: '/pakin/putOn'
+ // },
{
- title: '鍐嶆鎷ｆ枡',
- name: 'changePallet',
- color: 'green',
- cuIcon: 'order',
- url: '/pakin/pickAgain'
- },
- {
- title: 'AGV缁勬墭',
- name: 'AGVPakin',
- color: 'blue',
- cuIcon: 'pullup',
- url: '/tzsk/AGV/AGVPakin'
- },
- {
- title: 'AGV涓婃灦缁戝畾',
- name: 'AGVPakinBing',
- color: 'mauve',
- // cuIcon: 'pullup',
- url: '/tzsk/AGV/AGVPakinBing'
- },
- {
- title: 'AGV鍚姩鍏ュ簱',
- name: 'AGVStart',
- color: 'pink',
- // cuIcon: 'pullup',
- url: '/tzsk/AGV/AGVStart'
- },
- {
- title: 'AGV涓婃灦缁勬墭',
- name: 'AGVPakinOn',
- color: 'brown',
- // cuIcon: 'pullup',
- url: '/tzsk/AGV/AGVPakinOn'
- },
- {
- title: '璁㈠崟鍏ュ簱',
- name: 'orderPakin',
- color: 'red',
- cuIcon: 'pullup',
- url: '/order/orderPakin'
- },
- {
- title: '缁勬墭涓婃灦',
- name: 'putOn',
- color: 'orange',
- cuIcon: 'pullup',
- url: '/pakin/putOn'
- },
- {
- title: '鎵撳嵃',
- name: 'print',
+ title: '骞冲簱涓婃灦',
+ name: 'WarehouseIn',
color: 'purple',
cuIcon: 'text',
- url: '/print/print'
+ url: '/pakin/WarehouseIn'
},
{
- title: '璁㈠崟涓婃灦',
+ title: '骞冲簱涓嬫灦',
name: 'orderPutOn',
color: 'yellow',
cuIcon: 'pullup',
- url: '/order/orderPutOn'
+ url: '/warehouse/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/orderPickConfirm2'
},
{
- title: '鐩樼偣',
- name: 'stockCheck',
- color: 'red',
- cuIcon: 'post',
- url: '/stock/stockCheck'
+ title: '骞舵澘閫斾腑鎷ｆ枡',
+ name: 'ParallelBoard',
+ color: 'green',
+ cuIcon: 'pulldown',
+ url: '/order/orderListParallelBoard'
},
{
- title: '鍟嗗搧鎵撳嵃',
- name: 'matList',
+ title: '鎷ｆ枡閫斾腑骞舵澘',
+ name: 'PickBoard',
color: 'orange',
- cuIcon: 'post',
- url: '/mat/matList'
+ cuIcon: 'pulldown',
+ url: '/order/orderListPickBoard'
},
{
- title: '琛ヨ揣',
- name: 'restock',
+ title: '澶氭骞舵澘',
+ name: 'BoardMany',
color: 'yellow',
- cuIcon: 'punch',
- url: '/stock/restock'
+ cuIcon: 'pulldown',
+ url: '/order/mergeBoardManyTimes'
},
{
- title: '杞叏鏉�',
- name: 'piking',
- color: 'olive',
- cuIcon: 'order',
- url: '/pakin/piking'
- },
- {
- title: '鎹㈡澘缁戝畾',
- name: 'changePallet',
+ title: '鍒朵护鍏ュ簱',
+ name: 'pakin',
color: 'green',
- cuIcon: 'order',
- url: '/stock/changePallet'
+ cuIcon: 'pulldown',
+ url: '/order/zlOrderPakin'
},
+ {
+ title: '鍟嗗搧淇℃伅鏌ヨ',
+ name: 'MatInformation',
+ color: 'red',
+ cuIcon: 'pulldown',
+ url: '/mat/matInformation'
+ },
+ // {
+ // 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',
@@ -158,13 +175,21 @@
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
+ this.storeId = uni.getStorageSync('store')
+ if (this.storeId == 1) {
+ this.store = '瀹佹尝浠�'
+ }
+ if (this.storeId == 2) {
+ this.store = '鏂版槍浠�'
+ }
this.getAuth()
},
methods: {
+ back() { uni.navigateBack({}) },
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 +198,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 +216,9 @@
}
that.elements.push({
title: '閫�鍑虹櫥褰�',
- name: 'logOut',
+ name: '',
color: 'grey',
- cuIcon: 'exit',
+ cuIcon: '',
url: '/login/logOut'
})
} else if (res.code === 403) {
@@ -238,6 +263,13 @@
</script>
<style>
+ ::v-deep .uni-nav-bar-text{
+ font-size: 16px;
+ font-weight: 600;
+ }
+ .uni-nav-bar-text {
+ font-size: 12px;
+ }
.page {
height: 100vh;
}
--
Gitblit v1.9.1