From e39d47402ab026d591a2e4f3c62521589a6de151 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 30 七月 2025 14:20:10 +0800
Subject: [PATCH] 修复并板功能
---
pages/home/home.vue | 310 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 235 insertions(+), 75 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 7f03271..76a342f 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,9 +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">
+ <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 elements2" :key="index">
<view class="nav-title">{{item.title}}</view>
<view class="nav-name">{{item.name}}</view>
<text :class="'cuIcon-' + item.cuIcon"></text>
@@ -18,84 +33,133 @@
export default {
data() {
return {
- elements: [
+ baseUrl: '',
+ token: '',
+ icon: '',
+ username: '',
+ storeId: 0,
+ store: '',
+ elements: [],
+ elements2: [
{
title: '缁勬墭鍏ュ簱',
name: 'pakin',
color: 'cyan',
cuIcon: 'pullup',
url: '/pakin/pakin'
- },
+ },
+ // {
+ // title: '骞冲簱缁勬墭',
+ // name: 'putOn',
+ // color: 'orange',
+ // cuIcon: 'pullup',
+ // url: '/pakin/putOn'
+ // },
{
- title: '璁㈠崟鍏ュ簱',
- name: 'orderPakin',
- color: 'blue',
- cuIcon: 'pullup',
- url: '/order/orderPakin'
- },
- {
- title: '鎵撳嵃',
- name: 'print',
+ title: '骞冲簱涓婃灦',
+ name: 'WarehouseIn',
color: 'purple',
cuIcon: 'text',
- url: '/print/print'
+ url: '/pakin/WarehouseIn'
},
{
- title: '璁㈠崟涓婃灦',
+ title: '骞冲簱涓嬫灦',
name: 'orderPutOn',
- color: 'mauve',
- cuIcon: 'pullup',
- url: '/order/orderPutOn'
- },
- {
- title: '璁㈠崟涓嬫灦',
- name: 'orderPutDown',
- color: 'pink',
- cuIcon: 'pulldown',
- url: '/order/orderPutDown'
- },
- {
- title: '搴撳瓨鏌ヨ',
- name: 'stockQuery',
- color: 'brown',
- 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'
+ cuIcon: 'pullup',
+ url: '/warehouse/orderList'
},
{
- title: '杞叏鏉�',
- name: 'piking',
+ title: '璁㈠崟缁勬墭',
+ name: 'orderComb',
color: 'olive',
- cuIcon: 'order',
- url: '/pakin/piking'
+ cuIcon: 'pulldown',
+ url: '/order/orderComb'
},
{
- title: '鎹㈡澘缁戝畾',
- name: 'changePallet',
+ title: '骞舵澘鍏ュ簱',
+ name: 'orderPickConfirm',
color: 'green',
- cuIcon: 'order',
- url: '/stock/changePallet'
+ cuIcon: 'pulldown',
+ url: '/order/orderPickConfirm2'
},
+ {
+ title: '骞舵澘閫斾腑鎷ｆ枡',
+ name: 'ParallelBoard',
+ color: 'green',
+ cuIcon: 'pulldown',
+ url: '/order/orderListParallelBoard'
+ },
+ {
+ title: '鎷ｆ枡閫斾腑骞舵澘',
+ name: 'PickBoard',
+ color: 'orange',
+ cuIcon: 'pulldown',
+ url: '/order/orderListPickBoard'
+ },
+ {
+ title: '澶氭骞舵澘',
+ name: 'BoardMany',
+ color: 'yellow',
+ cuIcon: 'pulldown',
+ url: '/order/mergeBoardManyTimes'
+ },
+ {
+ title: '鍒朵护鍏ュ簱',
+ name: 'pakin',
+ color: 'green',
+ 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',
@@ -103,87 +167,183 @@
cuIcon: 'exit',
url: '/login/logOut'
},
-
+
],
+ colorList: ['cyan','blue','mauve','pink','brown','red','orange','yellow','olive','olive','green','grey' ]
};
+ },
+ 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 + '/mobile/menu/pda/auth',
+ data: {},
+ header: { 'token': uni.getStorageSync('token') },
+ method: 'POST',
+ success(res) {
+ res = res.data
+ that.elements = []
+ if (res.code === 200) {
+ if (res.data == undefined || res.data == null || res.data == "") {
+ that.elements = that.elements2
+ return
+ }
+ for (var i = 0; i < res.data.length; i++) {
+ if (res.data.length < 0) {
+ break;
+ }
+ that.getIcon(res.data[i].title)
+ that.elements.unshift({
+ title: res.data[i].name,
+ name: res.data[i].title,
+ color: that.colorList[i],
+ cuIcon: that.icon,
+ url: res.data[i].action
+ })
+ }
+ that.elements.push({
+ title: '閫�鍑虹櫥褰�',
+ name: '',
+ color: 'grey',
+ cuIcon: '',
+ url: '/login/logOut'
+ })
+ } else if (res.code === 403) {
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ position: 'top'
+ })
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else if(res.status === 404) {
+ that.elements = that.elements2
+ // uni.showToast({
+ // title: '榛樿涓婚〉',
+ // icon: "none",
+ // position: 'top'
+ // })
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ position: 'top'
+ })
+ }
+ },
+ fail(err) {
+ console.log(err);
+ }
+ })
+ },
+ getIcon(e) {
+ const ways = ['pakin','orderPakin','orderPutOn']
+ if (ways.includes(e)) {
+ this.icon = 'pullup'
+ }
+ }
}
}
</script>
<style>
+ ::v-deep .uni-nav-bar-text{
+ font-size: 16px;
+ font-weight: 600;
+ }
+ .uni-nav-bar-text {
+ font-size: 12px;
+ }
.page {
height: 100vh;
}
+
.bg-red {
background-color: #e54d42;
color: #ffffff;
}
-
+
.bg-orange {
background-color: #f37b1d;
color: #ffffff;
}
-
+
.bg-yellow {
background-color: #fbbd08;
color: #333333;
}
-
+
.bg-olive {
background-color: #8dc63f;
color: #ffffff;
}
-
+
.bg-green {
background-color: #39b54a;
color: #ffffff;
}
-
+
.bg-cyan {
background-color: #1cbbb4;
color: #ffffff;
}
-
+
.bg-blue {
background-color: #0081ff;
color: #ffffff;
}
-
+
.bg-purple {
background-color: #6739b6;
color: #ffffff;
}
-
+
.bg-mauve {
background-color: #9c26b0;
color: #ffffff;
}
-
+
.bg-pink {
background-color: #e03997;
color: #ffffff;
}
-
+
.bg-brown {
background-color: #a5673f;
color: #ffffff;
}
-
+
.bg-grey {
background-color: #8799a3;
color: #ffffff;
}
-
+
.bg-gray {
background-color: #f0f0f0;
color: #333333;
}
-
+
.bg-black {
background-color: #333333;
color: #ffffff;
}
-
+
.bg-white {
background-color: #ffffff;
color: #666666;
--
Gitblit v1.9.1