From c69b2a0ccd8ed4fe8f11b7bad34bc00b0aa2aaf7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 08 七月 2024 15:39:38 +0800
Subject: [PATCH] #
---
pages/order/orderComb.vue | 32 +++++
pages/pakin/WarehouseIn.vue | 24 ++++
pages/home/home.vue | 36 ++++++
pages/pakin/putOn.vue | 24 ++++
pages/order/orderList.vue | 25 +++++
pages.json | 32 ++++--
pages/pakin/pakin.vue | 24 ++++
pages/order/orderPickConfirm.vue | 24 ++++
pages/order/zlOrderPakin.vue | 31 +++++-
static/css/wms.css/wms.css | 7 +
10 files changed, 236 insertions(+), 23 deletions(-)
diff --git a/pages.json b/pages.json
index 2da232e..ffd5a80 100644
--- a/pages.json
+++ b/pages.json
@@ -9,7 +9,8 @@
{
"path": "pages/home/home",
"style": {
- "navigationBarTitleText": "涓� 椤�"
+ // "navigationBarTitleText": "涓� 椤�"
+ "navigationStyle": "custom"
}
},
{
@@ -33,7 +34,8 @@
{
"path": "pages/pakin/pakin",
"style": {
- "navigationBarTitleText": "缁� 鎵�"
+ // "navigationBarTitleText": "缁� 鎵�"
+ "navigationStyle": "custom"
}
},
{
@@ -141,7 +143,8 @@
{
"path": "pages/pakin/putOn",
"style": {
- "navigationBarTitleText": "缁勬墭涓婃灦"
+ // "navigationBarTitleText": "缁勬墭涓婃灦"
+ "navigationStyle": "custom"
}
},
{
@@ -196,8 +199,9 @@
"path" : "pages/pakin/WarehouseIn",
"style" :
{
- "navigationBarTitleText" : "骞冲簱涓婃灦",
- "enablePullDownRefresh" : false
+ // "navigationBarTitleText" : "骞冲簱涓婃灦",
+ // "enablePullDownRefresh" : false
+ "navigationStyle": "custom"
}
},
{
@@ -212,24 +216,27 @@
"path" : "pages/order/orderComb",
"style" :
{
- "navigationBarTitleText" : "璁㈠崟缁勬墭",
- "enablePullDownRefresh" : false
+ // "navigationBarTitleText" : "璁㈠崟缁勬墭",
+ // "enablePullDownRefresh" : false
+ "navigationStyle": "custom"
}
},
{
"path" : "pages/order/orderPickConfirm",
"style" :
{
- "navigationBarTitleText" : "骞舵澘鍏ュ簱",
- "enablePullDownRefresh" : false
+ // "navigationBarTitleText" : "骞舵澘鍏ュ簱",
+ // "enablePullDownRefresh" : false
+ "navigationStyle": "custom"
}
},
{
"path" : "pages/order/orderList",
"style" :
{
- "navigationBarTitleText" : "骞冲簱涓嬫灦",
- "enablePullDownRefresh" : false
+ // "navigationBarTitleText" : "骞冲簱涓嬫灦",
+ // "enablePullDownRefresh" : false
+ "navigationStyle": "custom"
}
},
{
@@ -244,7 +251,8 @@
"path" : "pages/order/zlOrderPakin",
"style" :
{
- "navigationBarTitleText" : "鍒朵护鍏ュ簱"
+ // "navigationBarTitleText" : "鍒朵护鍏ュ簱"
+ "navigationStyle": "custom"
}
}
],
diff --git a/pages/home/home.vue b/pages/home/home.vue
index d30e828..abf2670 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,5 +1,19 @@
<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
@@ -22,6 +36,9 @@
baseUrl: '',
token: '',
icon: '',
+ username: '',
+ storeId: 0,
+ store: '',
elements: [],
elements2: [
{
@@ -40,10 +57,10 @@
},
{
title: '骞冲簱涓婃灦',
- name: 'print',
+ name: 'WarehouseIn',
color: 'purple',
cuIcon: 'text',
- url: '/print/print'
+ url: '/pakin/WarehouseIn'
},
{
title: '骞冲簱涓嬫灦',
@@ -130,9 +147,17 @@
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({
@@ -210,6 +235,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;
}
diff --git a/pages/order/orderComb.vue b/pages/order/orderComb.vue
index 8677d24..682f1ac 100644
--- a/pages/order/orderComb.vue
+++ b/pages/order/orderComb.vue
@@ -1,5 +1,19 @@
<template>
<view>
+ <view class="status_bar">
+ <!-- 杩欓噷鏄姸鎬佹爮 -->
+ </view>
+ <uni-nav-bar left-icon="left" 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>
<view class="code">
<view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
@@ -153,6 +167,8 @@
return {
baseUrl: '',
token: '',
+ storeId: 0,
+ store: '',
order: '',
barcode: '',
barcodeFocus: '',
@@ -178,11 +194,19 @@
}
},
onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.getOrderNoList()
- },
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ this.getOrderNoList()
+ this.storeId = uni.getStorageSync('store')
+ if (this.storeId == 1) {
+ this.store = '瀹佹尝浠�'
+ }
+ if (this.storeId == 2) {
+ this.store = '鏂版槍浠�'
+ }
+ },
methods: {
+ back() { uni.navigateBack({}) },
set(e) {
var ck = this.dataList[e].checked
this.dataList[e].checked = ck ? false:true
diff --git a/pages/order/orderList.vue b/pages/order/orderList.vue
index 8c40407..a81772d 100644
--- a/pages/order/orderList.vue
+++ b/pages/order/orderList.vue
@@ -1,5 +1,19 @@
<template>
<view>
+ <view class="status_bar">
+ <!-- 杩欓噷鏄姸鎬佹爮 -->
+ </view>
+ <uni-nav-bar left-icon="left" 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>
<view class="card" v-for="item in menuList" @click="chose(item)">
{{item}}
</view>
@@ -12,15 +26,25 @@
return {
baseUrl: '',
token: '',
+ storeId: 0,
+ store: '',
menuList: []
}
},
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.getOrderNoList()
},
methods: {
+ back() { uni.navigateBack({}) },
getOrderNoList() {
let that = this
uni.request({
@@ -61,6 +85,7 @@
</script>
<style>
+ @import url('../../static/css/wms.css/wms.css');
.card {
margin: 20rpx;
padding: 30rpx;
diff --git a/pages/order/orderPickConfirm.vue b/pages/order/orderPickConfirm.vue
index 099592f..e97cb95 100644
--- a/pages/order/orderPickConfirm.vue
+++ b/pages/order/orderPickConfirm.vue
@@ -1,5 +1,19 @@
<template>
<view>
+ <view class="status_bar">
+ <!-- 杩欓噷鏄姸鎬佹爮 -->
+ </view>
+ <uni-nav-bar left-icon="left" 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>
<view class="code">
<view class="item">
<view class="code-decs">搴撲綅鍙�:</view>
@@ -152,6 +166,8 @@
return {
baseUrl: '',
token: '',
+ storeId: 0,
+ store: '',
locNo: '',
locNoList: [],
sta: '',
@@ -182,8 +198,16 @@
this.token = uni.getStorageSync('token');
this.getPickStaList()
this.getMatList()
+ this.storeId = uni.getStorageSync('store')
+ if (this.storeId == 1) {
+ this.store = '瀹佹尝浠�'
+ }
+ if (this.storeId == 2) {
+ this.store = '鏂版槍浠�'
+ }
},
methods: {
+ back() { uni.navigateBack({}) },
set(e) {
var ck = this.dataList[e].checked
this.dataList[e].checked = ck ? false : true
diff --git a/pages/order/zlOrderPakin.vue b/pages/order/zlOrderPakin.vue
index e5f5e7a..67c56be 100644
--- a/pages/order/zlOrderPakin.vue
+++ b/pages/order/zlOrderPakin.vue
@@ -1,5 +1,19 @@
<template>
<view>
+ <view class="status_bar">
+ <!-- 杩欓噷鏄姸鎬佹爮 -->
+ </view>
+ <uni-nav-bar left-icon="left" 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>
<view class="code">
<view class="item">
<view class="code-decs">鍒朵护鍙�:</view>
@@ -160,6 +174,8 @@
return {
baseUrl: '',
token: '',
+ storeId: 0,
+ store: '',
barcode: '',
dataList: [],
count: 0,
@@ -179,8 +195,8 @@
bomCode: '',
bomCodeFocus: true,
maxAn: 0,
- ck1: true,
- ck2: false,
+ ck1: false,
+ ck2: true,
fullPlt: 'N',
decrees_a: {
locNo: '',
@@ -196,11 +212,16 @@
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
- // setTimeout(()=>{
- // this.$refs.decrees.open('center')
- // },300)
+ this.storeId = uni.getStorageSync('store')
+ if (this.storeId == 1) {
+ this.store = '瀹佹尝浠�'
+ }
+ if (this.storeId == 2) {
+ this.store = '鏂版槍浠�'
+ }
},
methods: {
+ back() { uni.navigateBack({}) },
// 鏄惁婊℃澘
isFullPlt() {
var temp = this.ck1
diff --git a/pages/pakin/WarehouseIn.vue b/pages/pakin/WarehouseIn.vue
index 5f4c2c6..fba7b8c 100644
--- a/pages/pakin/WarehouseIn.vue
+++ b/pages/pakin/WarehouseIn.vue
@@ -1,5 +1,19 @@
<template>
<view>
+ <view class="status_bar">
+ <!-- 杩欓噷鏄姸鎬佹爮 -->
+ </view>
+ <uni-nav-bar left-icon="left" 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>
<view class="code">
<view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
@@ -134,6 +148,8 @@
return {
baseUrl: '',
token: '',
+ storeId: 0,
+ store: '',
barcode: '',
dataList: [],
count: 0,
@@ -159,8 +175,16 @@
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 = '鏂版槍浠�'
+ }
},
methods: {
+ back() { uni.navigateBack({}) },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 8af03fd..220ce7a 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -1,5 +1,19 @@
<template>
<view>
+ <view class="status_bar">
+ <!-- 杩欓噷鏄姸鎬佹爮 -->
+ </view>
+ <uni-nav-bar left-icon="left" 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>
<view class="code">
<view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
@@ -140,6 +154,8 @@
return {
baseUrl: '',
token: '',
+ storeId: 0,
+ store: '',
barcode: '',
dataList: [],
count: 0,
@@ -164,8 +180,16 @@
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 = '鏂版槍浠�'
+ }
},
methods: {
+ back() { uni.navigateBack({}) },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
diff --git a/pages/pakin/putOn.vue b/pages/pakin/putOn.vue
index 66c6801..e61bf19 100644
--- a/pages/pakin/putOn.vue
+++ b/pages/pakin/putOn.vue
@@ -1,5 +1,19 @@
<template>
<view>
+ <view class="status_bar">
+ <!-- 杩欓噷鏄姸鎬佹爮 -->
+ </view>
+ <uni-nav-bar left-icon="left" 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>
<view class="code">
<view class="item">
<view class="code-decs">搴撲綅鍙�:</view>
@@ -150,6 +164,8 @@
return {
baseUrl: '',
token: '',
+ storeId: 0,
+ store: '',
order: '',
locno: '',
barcode: '',
@@ -175,8 +191,16 @@
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 = '鏂版槍浠�'
+ }
},
methods: {
+ back() { uni.navigateBack({}) },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
diff --git a/static/css/wms.css/wms.css b/static/css/wms.css/wms.css
index 8fe0f6c..57e65af 100644
--- a/static/css/wms.css/wms.css
+++ b/static/css/wms.css/wms.css
@@ -1,3 +1,10 @@
+::v-deep .uni-nav-bar-text{
+ font-size: 16px;
+ font-weight: 600;
+}
+.uni-nav-bar-text {
+ font-size: 12px;
+}
.list {
display: flex;
min-height: 80rpx;
--
Gitblit v1.9.1