From 34e81b3d0fe9ae1e9edd4fd8bcdaf7ec69b7f239 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 27 六月 2025 09:00:45 +0800
Subject: [PATCH] 12
---
pages/pakin/pakin.vue | 196 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 138 insertions(+), 58 deletions(-)
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 456e187..cfa05dd 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -2,6 +2,16 @@
<view>
<view class="code">
<view class="item">
+ <view class="code-decs">鍗曟嵁缂栧彿:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo"
+ @input="barcodeInput()">
+ <view class="item-right">
+ <button></button>
+ <text style="text-align: right;color: #409EFF;" @click="selectOrder()">鎻愬彇+</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="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
@@ -11,10 +21,21 @@
<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>
+ <!-- <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">
鍟嗗搧鍒楄〃
@@ -34,7 +55,7 @@
</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>
@@ -46,19 +67,23 @@
<uni-tag :text="item.batch" type="warning"></uni-tag>
</view>
</view>
- <view class="list-left-item">
+ <!-- <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> -->
<view class="list-left-item">
<view class="desc">鏁伴噺锛�</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>
@@ -82,14 +107,14 @@
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
- <!-- <view class="popup-item">
+ <view class="popup-item">
<view class="popup-item-left">鎵瑰彿:</view>
<view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view> -->
- <view class="popup-item">
+ </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> -->
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
@@ -144,6 +169,8 @@
dataList: [],
count: 0,
rowNum: '',
+ orderNo: '',
+ matnr: '',
matnr: '',
batch: '',
weight: '',
@@ -152,10 +179,14 @@
messageText: '',
title: '',
content: '',
- barcodeFocus: true,
+ orderNoFocus: true,
+ barcodeFocus: false,
matFocus: false,
matData: '',
removeNum: 0,
+ ck1: true,
+ ck2: false,
+ isFull: true
}
},
onLoad() {
@@ -166,6 +197,10 @@
this.token = uni.getStorageSync('token');
},
methods: {
+ isFrozen() {
+ this.isFull = !this.isFull
+ console.log(this.isFull);
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -175,7 +210,7 @@
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
setTimeout(() => {
var len = this.barcode.length
- if (len != 8) {
+ if (len >= 9 && len <=8) {
uni.showToast({
title: '鎵樼洏鐮佹湁璇閲嶈瘯',
icon: "none",
@@ -204,13 +239,19 @@
this.matFocus = true;
}, 100);
},
+
// 鎼滅储鐗╂枡
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',
+ url: that.baseUrl + '/mat/tiaoma/auth',
data: {
- matnr: that.matnr
+ matnr: matnr1,
+ orderNo: that.orderNo
},
header: {
'token': uni.getStorageSync('token')
@@ -220,26 +261,31 @@
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 (res.code == 403) {
+ 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: res.msg,
+ title: result.msg,
icon: "none",
position: 'top'
})
@@ -250,7 +296,7 @@
}, 1000);
} else {
uni.showToast({
- title: res.msg,
+ title: result.msg,
icon: "none",
position: 'top'
})
@@ -282,33 +328,55 @@
});
that.matnr = ''
},
+ selectOrder() {
+ let that = this
+ uni.navigateTo({
+ url: "../order/orderList",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('commonUrl', {
+ commonUrl: ''
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ that.orderNo = data.data
+ //that.findMat(that.matnr)
+ },
+ },
+
+
+ });
+ that.orderNo = ''
+ },
checkMat(mat) {
var len = this.dataList.length
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
- }
+ // 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
- }
- }
- }
+ // } else {
+ // // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+ // this.dataList[i].anfme += mat.anfme
+ // this.$forceUpdate() // 寮哄埗鍒锋柊
+ // add = false
+ // }
+ // }
+ // }
if (add) {
this.dataList.unshift(mat)
}
@@ -371,6 +439,11 @@
comb() {
uni.vibrateShort();
let that = this;
+ if (that.orderNo === '') {
+ this.messageText = "璇锋壂鎻忚鍗曠紪鍙�"
+ this.messageToggle('error')
+ return;
+ }
if (that.barcode === '') {
this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
this.messageToggle('error')
@@ -392,6 +465,7 @@
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
barcode: that.barcode,
+ orderNo: that.orderNo,
combMats: that.dataList
}),
method: 'POST',
@@ -404,6 +478,9 @@
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')
@@ -497,4 +574,7 @@
text-align: center;
box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
}
+ .list:first-child {
+ margin-top: 350rpx;
+ }
</style>
--
Gitblit v1.9.1