From a5c4bc3c248380d4c4a1f9edaff314f365acfaf5 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 13 三月 2024 08:25:33 +0800
Subject: [PATCH] #
---
pages/home/home.vue | 4 +-
pages/pakin/pakin.vue | 102 ++++++++++++--------------------------------------
static/css/wms.css/wms.css | 1
3 files changed, 28 insertions(+), 79 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 93ba3aa..8df69e7 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -38,7 +38,7 @@
// cuIcon: 'order',
// url: '/pakin/pickAgain'
// },
- {
+ /* {
title: '璁㈠崟鍏ュ簱',
name: 'orderPakin',
color: 'red',
@@ -114,7 +114,7 @@
color: 'green',
cuIcon: 'order',
url: '/stock/changePallet'
- },
+ }, */
{
title: '閫�鍑虹櫥褰�',
name: 'logOut',
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 8af03fd..3dfc74b 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -2,18 +2,13 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">鎵樼洏鐮�:</view>
+ <view class="code-decs">绠辩爜:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
</view>
<view class="item">
- <view class="code-decs">鐗╂枡鐮�:</view>
+ <view class="code-decs">鍝佺暘浜岀淮鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
- <view class="item-right">
- <button></button>
- <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
- <uni-icons type="right" color="#c1c1c1"></uni-icons>
- </view>
</view>
</view>
<view class="mat-list-title">
@@ -29,10 +24,10 @@
<view class="list-left-item">
<view class="desc">缂栫爜锛�</view>
<view class="left-item">
- <uni-tag :text="item.matnr" type="primary"></uni-tag>
+ <uni-tag :text="item.threeCode" type="primary"></uni-tag>
</view>
</view>
- <view class="list-left-item">
+ <!-- <view class="list-left-item">
<view class="desc">鍝佸悕锛�</view>
<view class="left-item">{{item.maktx}}</view>
</view>
@@ -45,17 +40,17 @@
<view class="left-item">
<uni-tag :text="item.batch" type="warning"></uni-tag>
</view>
- </view>
+ </view> -->
<!-- <view class="list-left-item">
<view class="desc">閲嶉噺锛�</view>
<view class="left-item">
<uni-tag :text="item.weight" type="warning"></uni-tag>
</view>
</view> -->
- <view class="list-left-item">
+ <!-- <view class="list-left-item">
<view class="desc">鏁伴噺锛�</view>
<view class="left-item">{{item.anfme}}</view>
- </view>
+ </view> -->
</view>
<view class="list-right">
<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
@@ -173,19 +168,20 @@
// barcode input 浜嬩欢
barcodeInput() {
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- setTimeout(() => {
- var len = this.barcode.length
- if (len != 8) {
- uni.showToast({
- title: '鎵樼洏鐮佹湁璇閲嶈瘯',
- icon: "none",
- position: 'top'
- });
- this.barcodeFocuss()
- return;
- }
- this.focuss()
- }, 200)
+ // setTimeout(() => {
+ // var len = this.barcode.length
+ // if (len != 8) {
+ // uni.showToast({
+ // title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ // icon: "none",
+ // position: 'top'
+ // });
+ // this.barcodeFocuss()
+ // return;
+ // }
+ // this.focuss()
+ // }, 200)
+ this.focuss()
},
// 鎵樼洏鐮佹湁璇噸缃�
barcodeFocuss() {
@@ -207,58 +203,10 @@
// 鎼滅储鐗╂枡
findMat() {
let that = this
- uni.request({
- url: that.baseUrl + '/mat/auth',
- data: {
- matnr: that.matnr
- },
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- result = result.data
- if (result.code === 200 && result.data) {
- that.matData = result.data
- that.matnr = ''
- that.matData['batch'] = ''
- uni.navigateTo({
- url: "../mat/matSelected",
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- success: function(res) {
- res.eventChannel.emit('mat', {
- data: result.data
- })
- },
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- events: {
- matList: function(data) {
- that.checkMat(data.data)
- that.focuss()
- },
- },
- });
- } else if (result.code == 403) {
- uni.showToast({
- title: result.msg,
- icon: "none",
- position: 'top'
- })
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- uni.showToast({
- title: result.msg,
- icon: "none",
- position: 'top'
- })
- }
-
- }
- });
-
+ let item = {}
+ item['threeCode'] = that.matnr
+ this.dataList.unshift(item)
+ this.focuss()
},
selectMat() {
let that = this
diff --git a/static/css/wms.css/wms.css b/static/css/wms.css/wms.css
index 34210d6..29e952f 100644
--- a/static/css/wms.css/wms.css
+++ b/static/css/wms.css/wms.css
@@ -22,6 +22,7 @@
min-height: 40rpx;
line-height: 40rpx;
display: flex;
+ word-break: break-word;
}
.desc {
min-height: 40rpx;
--
Gitblit v1.9.1