From 5eec8667dd53348173e3d06534aa418e64a49d19 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期日, 29 九月 2024 10:01:25 +0800
Subject: [PATCH] #
---
pages/home/home.vue | 212 ++++++++++++++++++++++++++--------------------------
pages/mat/matSelected.vue | 2
pages/pakin/pakin.vue | 17 +++-
static/css/wms.css/wms.css | 2
4 files changed, 121 insertions(+), 112 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 154a33f..1f9f2c9 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -4,7 +4,7 @@
<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>
@@ -31,111 +31,111 @@
cuIcon: 'pullup',
url: '/pakin/pakin'
},
- {
- title: '鍐嶆鎷ｆ枡',
- name: 'changePallet',
- color: 'green',
- cuIcon: 'order',
- url: '/pakin/pickAgain'
- },
- {
- title: '璁㈠崟鍏ュ簱',
- name: 'orderPakin',
- color: 'red',
- cuIcon: 'pullup',
- url: '/order/orderPakin'
- },
- {
- title: '閿�鍞崟鍏ュ簱',
- name: 'orderIn',
- color: 'blue',
- cuIcon: 'pullup',
- url: '/order/orderIn'
- },
- {
- title: 'Bom鍏ュ簱鍗�',
- name: 'orderBomPakin',
- color: 'red',
- cuIcon: 'pullup',
- url: '/order/orderBomPakin'
- },
- {
- title: '缁勬墭涓婃灦',
- name: 'putOn',
- color: 'orange',
- cuIcon: 'pullup',
- url: '/pakin/putOn'
- },
- {
- title: '鎵撳嵃',
- name: 'print',
- color: 'purple',
- cuIcon: 'text',
- url: '/print/print'
- },
- {
- title: '璁㈠崟涓婃灦',
- name: 'orderPutOn',
- color: 'yellow',
- cuIcon: 'pullup',
- url: '/order/orderPutOn'
- },
- {
- title: '璁㈠崟涓嬫灦',
- name: 'orderPutDown',
- color: 'olive',
- cuIcon: 'pulldown',
- url: '/order/orderPutDown'
- },
- {
- 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: 'mergeStore',
- color: 'olive',
- cuIcon: 'order',
- url: '/pakin/mergeStore'
- },
- {
- title: '鎹㈡澘缁戝畾',
- name: 'changePallet',
- color: 'green',
- cuIcon: 'order',
- url: '/stock/changePallet'
- },
+ // {
+ // title: '鍐嶆鎷ｆ枡',
+ // name: 'changePallet',
+ // color: 'green',
+ // cuIcon: 'order',
+ // url: '/pakin/pickAgain'
+ // },
+ // {
+ // title: '璁㈠崟鍏ュ簱',
+ // name: 'orderPakin',
+ // color: 'red',
+ // cuIcon: 'pullup',
+ // url: '/order/orderPakin'
+ // },
+ // {
+ // title: '閿�鍞崟鍏ュ簱',
+ // name: 'orderIn',
+ // color: 'blue',
+ // cuIcon: 'pullup',
+ // url: '/order/orderIn'
+ // },
+ // {
+ // title: 'Bom鍏ュ簱鍗�',
+ // name: 'orderBomPakin',
+ // color: 'red',
+ // cuIcon: 'pullup',
+ // url: '/order/orderBomPakin'
+ // },
+ // {
+ // title: '缁勬墭涓婃灦',
+ // name: 'putOn',
+ // color: 'orange',
+ // cuIcon: 'pullup',
+ // url: '/pakin/putOn'
+ // },
+ // {
+ // title: '鎵撳嵃',
+ // name: 'print',
+ // color: 'purple',
+ // cuIcon: 'text',
+ // url: '/print/print'
+ // },
+ // {
+ // title: '璁㈠崟涓婃灦',
+ // name: 'orderPutOn',
+ // color: 'yellow',
+ // cuIcon: 'pullup',
+ // url: '/order/orderPutOn'
+ // },
+ // {
+ // title: '璁㈠崟涓嬫灦',
+ // name: 'orderPutDown',
+ // color: 'olive',
+ // cuIcon: 'pulldown',
+ // url: '/order/orderPutDown'
+ // },
+ // {
+ // 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: 'mergeStore',
+ // color: 'olive',
+ // cuIcon: 'order',
+ // url: '/pakin/mergeStore'
+ // },
+ // {
+ // title: '鎹㈡澘缁戝畾',
+ // name: 'changePallet',
+ // color: 'green',
+ // cuIcon: 'order',
+ // url: '/stock/changePallet'
+ // },
{
title: '閫�鍑虹櫥褰�',
name: 'logOut',
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index 38a0300..743d8ea 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -14,7 +14,7 @@
<view class="form-item-content"><text>{{mat.specs}}</text></view>
</view>
<view class="form-item">
- <view class="form-item-desc"><text>鎵瑰彿</text></view>
+ <view class="form-item-desc"><text>鎯呭喌璇存槑</text></view>
<view class="form-item-content">
<view class="form-input">
<input type="text" v-model="mat.batch">
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index e185d06..1e1d3d6 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -41,7 +41,7 @@
<view class="left-item">{{item.specs}}</view>
</view>
<view class="list-left-item">
- <view class="desc">鎵瑰彿锛�</view>
+ <view class="desc" style="width: 38%;">鎯呭喌璇存槑锛�</view>
<view class="left-item">
<uni-tag :text="item.batch" type="warning"></uni-tag>
</view>
@@ -83,8 +83,8 @@
</view>
</view>
<view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
+ <view class="popup-item-left" style="width: 20vw;">鎯呭喌璇存槑:</view>
+ <view class="popup-item-right" style="width: 46vw;"><input type="text" v-model="batch"></view>
</view>
<!-- <view class="popup-item">
<view class="popup-item-left">閲嶉噺:</view>
@@ -208,10 +208,19 @@
// 鎼滅储鐗╂枡
findMat() {
let that = this
+ var mat = that.matnr
+ let submitMat
+ let newMatnr
+ if (mat.includes(';')) {
+ newMatnr = mat.split(';')
+ submitMat = newMatnr[1]
+ } else {
+ submitMat = mat
+ }
uni.request({
url: that.baseUrl + '/mat/auth',
data: {
- matnr: that.matnr
+ matnr: submitMat
},
header: {
'token': uni.getStorageSync('token')
diff --git a/static/css/wms.css/wms.css b/static/css/wms.css/wms.css
index 5071b25..fe87c16 100644
--- a/static/css/wms.css/wms.css
+++ b/static/css/wms.css/wms.css
@@ -28,7 +28,7 @@
min-height: 40rpx;
display: flex;
align-items: center;
- width: 25%;
+ width: 20%;
}
.left-item {
display: flex;
--
Gitblit v1.9.1