From 38b42e381f083e51c86c665f44ea2033b00ea5e0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 17 五月 2024 08:38:46 +0800
Subject: [PATCH] #
---
pages/home/home.vue | 154 +++++++++++++++++++-------------------
manifest.json | 4
pages/pakin/pakin.vue | 29 +++++--
3 files changed, 100 insertions(+), 87 deletions(-)
diff --git a/manifest.json b/manifest.json
index b67a802..ab54271 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "涓壃WMS",
"appid" : "__UNI__DA5854D",
"description" : "",
- "versionName" : "2023063001",
- "versionCode" : "100",
+ "versionName" : "240516A",
+ "versionCode" : 101,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 93ba3aa..34dc1ee 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -38,83 +38,83 @@
// cuIcon: 'order',
// url: '/pakin/pickAgain'
// },
- {
- title: '璁㈠崟鍏ュ簱',
- name: 'orderPakin',
- color: 'red',
- cuIcon: 'pullup',
- url: '/order/orderPakin'
- },
- {
- 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: 'changePallet',
- color: 'green',
- cuIcon: 'order',
- url: '/stock/changePallet'
- },
+ // {
+ // title: '璁㈠崟鍏ュ簱',
+ // name: 'orderPakin',
+ // color: 'red',
+ // cuIcon: 'pullup',
+ // url: '/order/orderPakin'
+ // },
+ // {
+ // 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: 'changePallet',
+ // color: 'green',
+ // cuIcon: 'order',
+ // url: '/stock/changePallet'
+ // },
{
title: '閫�鍑虹櫥褰�',
name: 'logOut',
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 8635bf2..a3625b9 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -223,11 +223,12 @@
}, 200)
},
asBarcodeInput() {
+ this.asBarcode = this.asBarcode.replace(/\s+/g, '')
setTimeout(() => {
var len = this.asBarcode.length
if (len != 12) {
uni.showToast({
- title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ title: 'AS400鏈夎璇烽噸璇�',
icon: "none",
position: 'top'
});
@@ -285,9 +286,6 @@
break;
case "barcode4":
this.barcode4Focus = false;
- setTimeout(() => {
- this.barcode4Focus = true;
- }, 100);
break;
}
},
@@ -307,7 +305,6 @@
if (result.code === 200 && result.data) {
that.matData = result.data
that.matnr = ''
- that.matData['model'] = ''
uni.navigateTo({
url: "../mat/matSelected",
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
@@ -464,7 +461,7 @@
return;
}
if (that.asBarcode === '') {
- this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+ this.messageText = "璇锋壂鎻廇S400鏉＄爜"
this.messageToggle('error')
return;
}
@@ -484,7 +481,12 @@
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
barcode: that.barcode,
- combMats: that.dataList
+ asBarcode: that.asBarcode,
+ combMats: that.dataList,
+ code1: that.barcode1,
+ code2: that.barcode2,
+ code3: that.barcode3,
+ code4: that.barcode4
}),
method: 'POST',
header: {
@@ -523,7 +525,13 @@
// 纭閲嶇疆
resetConfirm() {
this.dataList = []
+ this.asBarcode = ''
+ this.barcode1 = ''
+ this.barcode2 = ''
+ this.barcode3 = ''
+ this.barcode4 = ''
this.messageText = "閲嶇疆瀹屾垚"
+ this.barcodeFocuss()
this.messageToggle('success')
},
// 鍙栨秷閲嶇疆
@@ -534,6 +542,11 @@
resst() {
this.dataList = []
this.barcode = ''
+ this.asBarcode = ''
+ this.barcode1 = ''
+ this.barcode2 = ''
+ this.barcode3 = ''
+ this.barcode4 = ''
this.barcodeFocuss()
},
}
@@ -575,7 +588,7 @@
}
.code-decs {
- width: 20vw;
+ /* width: 20vw; */
font-size: 14px;
color: #303133;
}
--
Gitblit v1.9.1