From b46cfec8918773693cb8831bc521f4da0ae3afef Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 15 五月 2024 15:44:45 +0800
Subject: [PATCH] #
---
pages/mat/matSelected.vue | 10 +-
pages/pakin/pakin.vue | 131 ++++++++++++++++++++++++++++++++++++++-----
static/css/wms.css/wms.css | 1
3 files changed, 120 insertions(+), 22 deletions(-)
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index a0d2b69..8080a69 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -17,7 +17,7 @@
<view class="form-item-desc"><text>鎵瑰彿</text></view>
<view class="form-item-content">
<view class="form-input">
- <input type="text" v-model="mat.batch">
+ <input type="text" v-model="mat.model">
</view>
</view>
</view>
@@ -44,7 +44,7 @@
maktx: null,
specs: null,
batch: null,
- anfme: 0,
+ anfme: 1,
},
baseIP:'',
basePORT:'',
@@ -62,7 +62,7 @@
// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
eventChannel.on('mat', function(data) {
that.mat = data.data
- that.mat.anfme = 0
+ that.mat.anfme = 1
})
@@ -101,8 +101,8 @@
box-shadow: 0px 0px 50px 0px rgba(0,0,0,0.2) ;
}
.form-item {
- height: 100rpx;
- line-height: 100rpx;
+ min-height: 100rpx;
+ /* line-height: 100rpx; */
border-bottom: 1px solid #DCDFE6;
margin-left: 40rpx;
display: flex;
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 8af03fd..8635bf2 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -7,6 +7,11 @@
@input="barcodeInput()">
</view>
<view class="item">
+ <view class="code-decs">AS400:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="asBarcode" :focus="asBarcodeFocus"
+ @input="asBarcodeInput()">
+ </view>
+ <view class="item">
<view class="code-decs">鐗╂枡鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
<view class="item-right">
@@ -14,6 +19,26 @@
<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
<uni-icons type="right" color="#c1c1c1"></uni-icons>
</view>
+ </view>
+ <view class="item">
+ <view class="code-decs">瀹㈡埛鏍囩鏉＄爜:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode1" :focus="barcode1Focus"
+ @input="codeInput('barcode1')">
+ </view>
+ <view class="item">
+ <view class="code-decs">瀹㈡埛鏍囩璧锋鐮�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode2" :focus="barcode2Focus"
+ @input="codeInput('barcode2')">
+ </view>
+ <view class="item">
+ <view class="code-decs">鐗瑰埆鏉＄爜:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode3" :focus="barcode3Focus"
+ @input="codeInput('barcode3')">
+ </view>
+ <view class="item">
+ <view class="code-decs">鍏朵粬鏉＄爜:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode4" :focus="barcode4Focus"
+ @input="codeInput('barcode4')">
</view>
</view>
<view class="mat-list-title">
@@ -43,7 +68,7 @@
<view class="list-left-item">
<view class="desc">鎵瑰彿锛�</view>
<view class="left-item">
- <uni-tag :text="item.batch" type="warning"></uni-tag>
+ <uni-tag :text="item.model" type="warning"></uni-tag>
</view>
</view>
<!-- <view class="list-left-item">
@@ -84,7 +109,7 @@
</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-right"><input type="text" v-model="model"></view>
</view>
<!-- <view class="popup-item">
<view class="popup-item-left">閲嶉噺:</view>
@@ -141,11 +166,16 @@
baseUrl: '',
token: '',
barcode: '',
+ asBarcode: '',
+ barcode1: '',
+ barcode2: '',
+ barcode3: '',
+ barcode4: '',
dataList: [],
count: 0,
rowNum: '',
matnr: '',
- batch: '',
+ model: '',
weight: '',
msgType1: 'success',
msgType: 'success',
@@ -153,6 +183,11 @@
title: '',
content: '',
barcodeFocus: true,
+ asBarcodeFocus: false,
+ barcode1Focus: false,
+ barcode2Focus: false,
+ barcode3Focus: false,
+ barcode4Focus: false,
matFocus: false,
matData: '',
removeNum: 0,
@@ -184,6 +219,21 @@
this.barcodeFocuss()
return;
}
+ this.asBarcodeFocuss()
+ }, 200)
+ },
+ asBarcodeInput() {
+ setTimeout(() => {
+ var len = this.asBarcode.length
+ if (len != 12) {
+ uni.showToast({
+ title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ icon: "none",
+ position: 'top'
+ });
+ this.asBarcodeFocuss()
+ return;
+ }
this.focuss()
}, 200)
},
@@ -196,6 +246,15 @@
that.barcodeFocus = true;
}, 100);
},
+ // 鎵樼洏鐮佹湁璇噸缃�
+ asBarcodeFocuss() {
+ let that = this;
+ that.asBarcodeFocus = false;
+ setTimeout(() => {
+ that.asBarcode = '';
+ that.asBarcodeFocus = true;
+ }, 100);
+ },
// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
focuss() {
this.focus = false;
@@ -203,6 +262,34 @@
this.matnr = '';
this.matFocus = true;
}, 100);
+ },
+ codeInput(code) {
+ switch (code) {
+ case "barcode1":
+ this.barcode1Focus = false;
+ setTimeout(() => {
+ this.barcode2Focus = true;
+ }, 100);
+ break;
+ case "barcode2":
+ this.barcode2Focus = false;
+ setTimeout(() => {
+ this.barcode3Focus = true;
+ }, 100);
+ break;
+ case "barcode3":
+ this.barcode3Focus = false;
+ setTimeout(() => {
+ this.barcode4Focus = true;
+ }, 100);
+ break;
+ case "barcode4":
+ this.barcode4Focus = false;
+ setTimeout(() => {
+ this.barcode4Focus = true;
+ }, 100);
+ break;
+ }
},
// 鎼滅储鐗╂枡
findMat() {
@@ -220,7 +307,7 @@
if (result.code === 200 && result.data) {
that.matData = result.data
that.matnr = ''
- that.matData['batch'] = ''
+ that.matData['model'] = ''
uni.navigateTo({
url: "../mat/matSelected",
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
@@ -288,12 +375,12 @@
for (var i = 0; i < len; i++) {
if (mat.matnr == this.dataList[i].matnr) {
for (var j = 0; j < len; j++) {
- if (mat.batch == this.dataList[j].batch) {
+ if (mat.model == this.dataList[j].model) {
sameItem = true
}
}
// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
- if (mat.batch != this.dataList[i].batch) {
+ if (mat.model != this.dataList[i].model) {
this.$forceUpdate() // 寮哄埗鍒锋柊
if (sameItem) {
add = false
@@ -317,7 +404,7 @@
revise(item, i) {
this.matnr = this.dataList[i].matnr
this.count = this.dataList[i].anfme
- this.batch = this.dataList[i].batch
+ this.model = this.dataList[i].model
this.weight = this.dataList[i].weight
this.rowNum = i
this.eject()
@@ -346,7 +433,7 @@
},
reviseConfirm() {
this.dataList[this.rowNum].anfme = this.count
- this.dataList[this.rowNum].batch = this.batch
+ this.dataList[this.rowNum].model = this.model
this.dataList[this.rowNum].weight = this.weight
this.matnr = ''
this.messageText = "淇敼鎴愬姛"
@@ -372,6 +459,11 @@
uni.vibrateShort();
let that = this;
if (that.barcode === '') {
+ this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+ this.messageToggle('error')
+ return;
+ }
+ if (that.asBarcode === '') {
this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
this.messageToggle('error')
return;
@@ -453,25 +545,30 @@
.code {
width: 100%;
- position: fixed;
+ /* position: fixed; */
min-height: 200rpx;
background-color: #FFF;
- z-index: 10;
+ z-index: 99;
}
-
+ .list:first-child {
+ margin-top: 20rpx;
+ }
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
+ }
+ .item:last-child {
+ border: none;
}
.item input {
height: 50rpx;
line-height: 50rpx;
/* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
- font-size: 36upx;
+ font-size: 28upx;
font-family: PingFang SC;
width: 55vw;
@@ -479,7 +576,7 @@
.code-decs {
width: 20vw;
- font-size: 18px;
+ font-size: 14px;
color: #303133;
}
@@ -493,11 +590,11 @@
line-height: 80rpx;
width: 100%;
background-color: white;
- position: fixed;
- margin-top: 200rpx;
+ /* position: fixed; */
+ /* margin-top: 500rpx; */
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
- box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
+ box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.2);
}
</style>
diff --git a/static/css/wms.css/wms.css b/static/css/wms.css/wms.css
index 34210d6..687fa5d 100644
--- a/static/css/wms.css/wms.css
+++ b/static/css/wms.css/wms.css
@@ -11,6 +11,7 @@
}
.list:last-child {
margin-bottom: 120rpx;
+ /* border: none; */
}
.list-left {
display: flex;
--
Gitblit v1.9.1