From 60d0fc6639903a606274a07dbad8205a804456d0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 25 九月 2024 16:11:10 +0800
Subject: [PATCH] #
---
pages/pakin/pakin.vue | 397 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 319 insertions(+), 78 deletions(-)
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 73ce360..0b06525 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -3,7 +3,13 @@
<view class="code">
<view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus" @confirm="barcodeInput()">
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
+ @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>
@@ -13,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">
@@ -27,7 +53,9 @@
</view>
<view class="list-left-item">
<view class="desc">缂栫爜锛�</view>
- <view class="left-item"><uni-tag :text="item.matnr" type="primary"></uni-tag></view>
+ <view class="left-item">
+ <uni-tag :text="item.matnr" type="primary"></uni-tag>
+ </view>
</view>
<view class="list-left-item">
<view class="desc">鍝佸悕锛�</view>
@@ -39,11 +67,19 @@
</view>
<view class="list-left-item">
<view class="desc">鎵瑰彿锛�</view>
- <view class="left-item"><uni-tag :text="item.batch" type="warning"></uni-tag></view>
+ <view class="left-item">
+ <uni-tag :text="item.model" type="warning"></uni-tag>
+ </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="desc">鏁伴噺锛�</view>
- <view class="left-item"><uni-tag :text="item.anfme"></uni-tag></view>
+ <view class="left-item">{{item.anfme}}</view>
</view>
</view>
<view class="list-right">
@@ -67,17 +103,22 @@
<view class="popup-item">
<view class="popup-item-left">缂栫爜:</view>
<view class="popup-item-right">
- <input type="text" v-model="matnr" disabled="true" style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
+ <input type="text" v-model="matnr" disabled="true"
+ style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</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">鎵瑰彿:</view>
+ <view class="popup-item-right"><input type="text" v-model="model"></view>
</view>
+ <!-- <view class="popup-item">
+ <view class="popup-item-left">閲嶉噺:</view>
+ <view class="popup-item-right"><input type="text" v-model="weight"></view>
+ </view> -->
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
- <uni-number-box :value="count" :max="9999999" color="#747474" @change="changeValue"/>
+ <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
</view>
</view>
<view class="btn">
@@ -91,8 +132,8 @@
<view>
<!-- 鎻愮ず绐楃ず渚� -->
<uni-popup ref="alertDialog" type="dialog">
- <uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content" @confirm="removeConfirm"
- @close="removeClose"></uni-popup-dialog>
+ <uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
+ @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
</uni-popup>
</view>
<view>
@@ -125,24 +166,35 @@
baseUrl: '',
token: '',
barcode: '',
+ asBarcode: '',
+ barcode1: '',
+ barcode2: '',
+ barcode3: '',
+ barcode4: '',
dataList: [],
count: 0,
rowNum: '',
matnr: '',
- batch: '',
+ model: '',
+ weight: '',
msgType1: 'success',
msgType: 'success',
messageText: '',
title: '',
content: '',
barcodeFocus: true,
+ asBarcodeFocus: false,
+ barcode1Focus: false,
+ barcode2Focus: false,
+ barcode3Focus: false,
+ barcode4Focus: false,
matFocus: false,
- matData: ''
-
+ matData: '',
+ removeNum: 0,
}
},
onLoad() {
-
+
},
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
@@ -156,112 +208,209 @@
// barcode input 浜嬩欢
barcodeInput() {
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- setTimeout(()=>{
+ setTimeout(() => {
var len = this.barcode.length
if (len != 8) {
- uni.showToast({title: '鎵樼洏鐮佹湁璇閲嶈瘯', icon: "none", position: 'top'});
+ uni.showToast({
+ title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ icon: "none",
+ position: 'top'
+ });
this.barcodeFocuss()
return;
}
+ this.asBarcodeFocuss()
+ }, 200)
+ },
+ asBarcodeInput() {
+ // this.asBarcode = this.asBarcode.replace(/\s+/g, '')
+ setTimeout(() => {
+ var len = this.asBarcode.length
+ if (this.checkCode(this.asBarcode)) {
+ // && this.asBarcode.length != 8
+
+ uni.showToast({
+ title: 'AS400鏈夎璇烽噸璇�',
+ icon: "none",
+ position: 'top'
+ });
+ this.asBarcodeFocuss()
+ return;
+ }
this.focuss()
- },200)
+ }, 200)
+ },
+ checkCode(code) {
+ // console.log(this.isNum(code.substring(0, 1)))
+ // console.log(!this.isNum(code.substring(1, 2)))
+ // console.log(code.length == 8,code.length)
+ let flag = true
+ if (code.substring(0, 2) == 'PM' ) {
+ flag = false
+ } else if (
+ this.isNum(code.substring(0, 1))
+ && !this.isNum(code.substring(1, 2))
+ && code.length == 8 ) {
+ flag = false
+ }
+ return flag
+ },
+ isNum(value) {
+ return typeof value === 'string' ? /^\d+$/.test(value) : typeof value === 'number' && !isNaN(value);
},
// 鎵樼洏鐮佹湁璇噸缃�
barcodeFocuss() {
let that = this;
that.barcodeFocus = false;
- setTimeout(()=>{
+ setTimeout(() => {
that.barcode = '';
that.barcodeFocus = true;
}, 100);
},
+ // 鎵樼洏鐮佹湁璇噸缃�
+ asBarcodeFocuss() {
+ let that = this;
+ that.asBarcodeFocus = false;
+ setTimeout(() => {
+ that.asBarcode = '';
+ that.asBarcodeFocus = true;
+ }, 100);
+ },
// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
focuss() {
- // #ifdef APP
- let that = this;
- that.focus = false;
- setTimeout(()=>{
- that.matnr = '';
- that.focus = true;
- }, 100);
- // #endif
+ this.matFocus = false;
+ setTimeout(() => {
+ this.matnr = '';
+ this.matFocus = true;
+ }, 200);
+ },
+ 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;
+ break;
+ }
},
// 鎼滅储鐗╂枡
findMat() {
let that = this
uni.request({
- url: that.baseUrl + '/mat/auth',
- data: {
- matnr:that.matnr
- },
- header: {
- 'token':uni.getStorageSync('token')
- },
+ 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 })
+ res.eventChannel.emit('mat', {
+ data: result.data
+ })
},
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
events: {
- dataList: function(data) {
+ matList: function(data) {
that.checkMat(data.data)
- // that.matList.push(data.data)
+ that.focuss()
},
},
});
- } else if (res.code == 403) {
- uni.showToast({title: res.msg, icon: "none", position: 'top'})
+ } else if (result.code == 403) {
+ uni.showToast({
+ title: result.msg,
+ icon: "none",
+ position: 'top'
+ })
setTimeout(() => {
uni.reLaunch({
url: '../login/login'
});
}, 1000);
} else {
- console.log(res);
- uni.showToast({title: res.msg, icon: "none",position: 'top'})
+ uni.showToast({
+ title: result.msg,
+ icon: "none",
+ position: 'top'
+ })
}
-
+
}
});
-
+
},
selectMat() {
let that = this
- uni.vibrateShort();
uni.navigateTo({
url: "../mat/matQuery",
success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('commonUrl', {commonUrl:that.commonUrl })
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('commonUrl', {
+ commonUrl: ''
+ })
},
events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
that.matnr = data.data
that.findMat(that.matnr)
- },
+ },
},
-
-
+
+
});
that.matnr = ''
},
checkMat(mat) {
var len = this.dataList.length
- var add = true
+ var add = true ,sameItem = false
for (var i = 0; i < len; i++) {
if (mat.matnr == this.dataList[i].matnr) {
- this.dataList[i].anfme += mat.anfme
- this.$forceUpdate() // 寮哄埗鍒锋柊
- add = false
+ for (var j = 0; j < len; j++) {
+ if (mat.model == this.dataList[j].model) {
+ sameItem = true
+ }
+ }
+ // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
+ if (mat.model != this.dataList[i].model) {
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ if (sameItem) {
+ add = false
+ } else {
+ add = true
+ }
+
+ } else {
+ // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+ this.dataList[i].anfme += mat.anfme
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ add = false
+ }
}
}
if (add) {
@@ -269,10 +418,11 @@
}
},
// 淇敼鎵瑰彿
- revise(item,i) {
+ 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()
},
@@ -281,17 +431,18 @@
this.$refs.revise.open(type)
},
// 鍒楄〃绉婚櫎鎸夐挳
- remove(item,i,type) {
+ remove(item, i, type) {
+ this.removeNum = i
this.msgType = type
this.title = '璀﹀憡'
this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
this.$refs.alertDialog.open(i)
},
// 纭绉婚櫎
- removeConfirm(i) {
+ removeConfirm() {
this.messageText = "绉婚櫎鎴愬姛"
this.messageToggle('success')
- this.dataList.splice(i,1)
+ this.dataList.splice(this.removeNum, 1)
},
// 鍙栨秷绉婚櫎
removeClose() {
@@ -299,7 +450,9 @@
},
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 = "淇敼鎴愬姛"
this.messageToggle('success')
this.$refs.revise.close()
@@ -315,13 +468,73 @@
this.title = '璀﹀憡'
this.content = '鏄惁鐜板湪缁勬墭!'
this.$refs.combConfirm.open()
- },
+ },
combClose() {
this.$refs.combConfirm.close()
},
comb() {
- this.messageText = "缁勬墭鎴愬姛"
- this.messageToggle('success')
+ uni.vibrateShort();
+ let that = this;
+ if (that.barcode === '') {
+ this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+ this.messageToggle('error')
+ return;
+ }
+ if (that.asBarcode === '') {
+ this.messageText = "璇锋壂鎻廇S400鏉＄爜"
+ this.messageToggle('error')
+ return;
+ }
+ if (that.dataList.length === 0) {
+ this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
+ this.messageToggle('error')
+ return;
+ }
+ for (var i = 0; i < that.dataList.length; i++) {
+ if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
+ this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
+ this.messageToggle('error')
+ return;
+ }
+ }
+ uni.request({
+ url: that.baseUrl + '/mobile/comb/auth',
+ data: JSON.stringify({
+ barcode: that.barcode,
+ asBarcode: that.asBarcode,
+ combMats: that.dataList,
+ code1: that.barcode1,
+ code2: that.barcode2,
+ code3: that.barcode3,
+ code4: that.barcode4
+ }),
+ method: 'POST',
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ that.resst();
+ that.messageText = "缁勬墭鎴愬姛"
+ that.messageToggle('success')
+ const innerAudioContext = uni.createInnerAudioContext();
+ innerAudioContext.src = '/static/music/pakinOk.mp3';
+ innerAudioContext.play()
+ } else if (res.code == 403) {
+ that.messageText = res.msg
+ that.messageToggle('error')
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ that.messageText = res.msg
+ that.messageToggle('error')
+ }
+ }
+ });
},
reset(type) {
this.msgType = type
@@ -331,62 +544,90 @@
},
// 纭閲嶇疆
resetConfirm() {
- this.dataList = ''
+ this.dataList = []
+ this.asBarcode = ''
+ this.barcode1 = ''
+ this.barcode2 = ''
+ this.barcode3 = ''
+ this.barcode4 = ''
this.messageText = "閲嶇疆瀹屾垚"
+ this.barcodeFocuss()
this.messageToggle('success')
},
// 鍙栨秷閲嶇疆
resetClose() {
-
- }
+
+ },
+ // 娓呯┖
+ resst() {
+ this.dataList = []
+ this.barcode = ''
+ this.asBarcode = ''
+ this.barcode1 = ''
+ this.barcode2 = ''
+ this.barcode3 = ''
+ this.barcode4 = ''
+ this.barcodeFocuss()
+ },
}
}
</script>
<style>
@import url('../../static/css/wms.css/wms.css');
+
.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;
-
+
}
+
.code-decs {
- width: 20vw;
- font-size: 18px;
+ /* width: 20vw; */
+ font-size: 14px;
color: #303133;
}
+
.item-right {
margin-left: auto;
margin-right: 20rpx;
}
+
.mat-list-title {
height: 80rpx;
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 30px 0px rgba(0,0,0,0.5);
+ box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.2);
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1