From 61981ca4bf1fa2153114a082e258b06977cd8808 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 24 五月 2025 21:23:23 +0800
Subject: [PATCH] 123
---
pages/pakin/pakin.vue | 335 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 257 insertions(+), 78 deletions(-)
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 6a83b6d..fce68bf 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -2,18 +2,35 @@
<view>
<view class="code">
<view class="item">
+ <view class="code-decs">鍗曟嵁缂栧彿:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo"
+ @input="barcodeInput()">
+ </view>
+ <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">鐗╂枡鐮�:</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;">鎻愬彇+</text>
+ <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>
+ <radio-group @change="isFrozen">
+ <label>
+ <radio :checked="ck1" style="margin-left: 10rpx;"/><text>鏄�</text>
+ </label>
+ <label>
+ <radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
+ </label>
+ </radio-group>
+ </view> -->
</view>
<view class="mat-list-title">
鍟嗗搧鍒楄〃
@@ -27,11 +44,13 @@
</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>
- <view class="left-item">{{item.maktx}}</view>
+ <view class="left-item" style="word-break: break-all;">{{item.maktx}}</view>
</view>
<view class="list-left-item">
<view class="desc">瑙勬牸锛�</view>
@@ -39,15 +58,27 @@
</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.batch" 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 class="list-left-item">
+ <view class="desc">鏉＄爜锛�</view>
+ <view class="left-item">{{item.threeCode}}</view>
</view>
</view>
<view class="list-right">
- <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
+ <!-- <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons> -->
<uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
</view>
</view>
@@ -67,17 +98,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-left">鎵瑰彿:</view>
<view class="popup-item-right"><input type="text" v-model="batch"></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 +127,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>
@@ -130,25 +166,34 @@
rowNum: '',
matnr: '',
batch: '',
+ weight: '',
msgType1: 'success',
msgType: 'success',
messageText: '',
title: '',
content: '',
- barcodeFocus: true,
+ orderNoFocus: true,
+ barcodeFocus: false,
matFocus: false,
- matData: ''
-
+ matData: '',
+ removeNum: 0,
+ ck1: true,
+ ck2: false,
+ isFull: true
}
},
onLoad() {
-
+
},
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
},
methods: {
+ isFrozen() {
+ this.isFull = !this.isFull
+ console.log(this.isFull);
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -156,102 +201,162 @@
// barcode input 浜嬩欢
barcodeInput() {
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- setTimeout(()=>{
+ setTimeout(() => {
var len = this.barcode.length
- if (len != 8) {
- uni.showToast({title: '鎵樼洏鐮佹湁璇閲嶈瘯', icon: "none", position: 'top'});
+ if (len >= 9 && len <=8) {
+ uni.showToast({
+ title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ icon: "none",
+ position: 'top'
+ });
this.barcodeFocuss()
return;
}
this.focuss()
- },200)
+ }, 200)
},
// 鎵樼洏鐮佹湁璇噸缃�
barcodeFocuss() {
let that = this;
that.barcodeFocus = false;
- setTimeout(()=>{
+ setTimeout(() => {
that.barcode = '';
that.barcodeFocus = true;
}, 100);
},
// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
focuss() {
- // #ifdef APP
- let that = this;
- that.focus = false;
- setTimeout(()=>{
- that.matnr = '';
- that.focus = true;
+ this.focus = false;
+ setTimeout(() => {
+ this.matnr = '';
+ this.matFocus = true;
}, 100);
- // #endif
},
+
// 鎼滅储鐗╂枡
findMat() {
- let that = this
+ let that = this
+ let matnr1 = that.matnr
+ // let m = that.matnr.split(";")
+ // let matnr1 = m[0].slice(3)
+ // let batch1 = m[1].slice(3)
uni.request({
- url: that.baseUrl + '/mat/auth',
- data: {
- matnr:that.matnr
- },
- header: {
- 'token':uni.getStorageSync('token')
- },
+ url: that.baseUrl + '/mat/tiaoma/auth',
+ data: {
+ matnr: matnr1
+ },
+ 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: {
- dataList: function(data) {
- that.checkMat(data.data)
- // that.matList.push(data.data)
- },
- },
- });
- } else if (res.code == 403) {
- uni.showToast({title: res.msg, icon: "none", position: 'top'})
+ that.matData['batch'] = result.data.unit
+ that.matData['anfme'] = result.data.safeQty
+ that.matData['threeCode'] = result.data.memo
+
+ that.checkMat(that.matData)
+ that.focuss()
+ // 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 {
- 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.navigateTo({
+ url: "../mat/matQuery",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('commonUrl', {
+ commonUrl: ''
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ that.matnr = data.data
+ that.findMat(that.matnr)
+ },
+ },
+
+
+ });
+ that.matnr = ''
},
checkMat(mat) {
var len = this.dataList.length
- var add = true
- for (var i = 0; i < len; i++) {
- if (mat.matnr == this.dataList[i].matnr) {
- this.dataList[i].anfme += mat.anfme
- this.$forceUpdate() // 寮哄埗鍒锋柊
- add = false
- }
- }
+ var add = true ,sameItem = false
+ // 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) {
+ // sameItem = true
+ // }
+ // }
+ // // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
+ // if (mat.batch != this.dataList[i].batch) {
+ // this.$forceUpdate() // 寮哄埗鍒锋柊
+ // if (sameItem) {
+ // add = false
+ // } else {
+ // add = true
+ // }
+
+ // } else {
+ // // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+ // this.dataList[i].anfme += mat.anfme
+ // this.$forceUpdate() // 寮哄埗鍒锋柊
+ // add = false
+ // }
+ // }
+ // }
if (add) {
this.dataList.unshift(mat)
}
},
// 淇敼鎵瑰彿
- 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.weight = this.dataList[i].weight
this.rowNum = i
this.eject()
},
@@ -260,17 +365,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() {
@@ -279,6 +385,8 @@
reviseConfirm() {
this.dataList[this.rowNum].anfme = this.count
this.dataList[this.rowNum].batch = this.batch
+ this.dataList[this.rowNum].weight = this.weight
+ this.matnr = ''
this.messageText = "淇敼鎴愬姛"
this.messageToggle('success')
this.$refs.revise.close()
@@ -294,13 +402,69 @@
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.orderNo === '') {
+ this.messageText = "璇锋壂鎻忚鍗曠紪鍙�"
+ this.messageToggle('error')
+ return;
+ }
+ if (that.barcode === '') {
+ this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+ 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,
+ orderNo: that.orderNo,
+ combMats: that.dataList
+ }),
+ 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
@@ -310,20 +474,27 @@
},
// 纭閲嶇疆
resetConfirm() {
- this.dataList = ''
+ this.dataList = []
this.messageText = "閲嶇疆瀹屾垚"
this.messageToggle('success')
},
// 鍙栨秷閲嶇疆
resetClose() {
-
- }
+
+ },
+ // 娓呯┖
+ resst() {
+ this.dataList = []
+ this.barcode = ''
+ this.barcodeFocuss()
+ },
}
}
</script>
<style>
@import url('../../static/css/wms.css/wms.css');
+
.code {
width: 100%;
position: fixed;
@@ -331,6 +502,7 @@
background-color: #FFF;
z-index: 10;
}
+
.item {
display: flex;
align-items: center;
@@ -338,6 +510,7 @@
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
+
.item input {
height: 50rpx;
line-height: 50rpx;
@@ -345,17 +518,20 @@
font-size: 36upx;
font-family: PingFang SC;
width: 55vw;
-
+
}
+
.code-decs {
width: 20vw;
font-size: 18px;
color: #303133;
}
+
.item-right {
margin-left: auto;
margin-right: 20rpx;
}
+
.mat-list-title {
height: 80rpx;
line-height: 80rpx;
@@ -366,6 +542,9 @@
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 0px 30px 0px rgba(0, 0, 0, 0.5);
}
-</style>
\ No newline at end of file
+ .list:first-child {
+ margin-top: 350rpx;
+ }
+</style>
--
Gitblit v1.9.1