From 9382f2c611581996c9b015abeb079891acbddde4 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 17:56:19 +0800
Subject: [PATCH] Merge branch 'jsxswms-app' of http://47.97.1.152:5880/r/wms_app into jsxswms-app
---
pages/pakin/PakinBind.vue | 114 +++++++++++++++++++++++++++++----------------------------
1 files changed, 58 insertions(+), 56 deletions(-)
diff --git a/pages/pakin/PakinBind.vue b/pages/pakin/PakinBind.vue
index cb3fbb5..d2d2a3b 100644
--- a/pages/pakin/PakinBind.vue
+++ b/pages/pakin/PakinBind.vue
@@ -2,17 +2,17 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">璁㈠崟鍙�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus"
- @input="orderNoInput()">
- </view>
- <view class="item">
<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="carBarcode" :focus="orderNoFocus"
+ @input="orderNoInput()">
+ </view>
+ <view class="item">
+ <view class="code-decs">BS鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
<view class="item-right">
<button></button>
@@ -48,21 +48,15 @@
<view class="left-item">{{item.maktx}}</view>
</view>
<view class="list-left-item">
+ <view class="desc">渚涘簲鍟嗭細</view>
+ <view class="left-item">
+ <uni-tag :text="item.suppCode" type="warning"></uni-tag>
+ </view>
+ </view>
+ <view class="list-left-item">
<view class="desc">瑙勬牸锛�</view>
<view class="left-item">{{item.specs}}</view>
</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>
- <!-- <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">{{item.anfme}}</view>
@@ -94,8 +88,8 @@
</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="suppCode"></view>
</view>
<!-- <view class="popup-item">
<view class="popup-item-left">閲嶉噺:</view>
@@ -104,7 +98,8 @@
<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" :step='1' :max="9999999" color="#747474" @change="changeValue" />
+ <uni-number-box :value="count" :step='1' :max="9999999" color="#747474"
+ @change="changeValue" />
</view>
</view>
<view class="btn">
@@ -152,12 +147,14 @@
baseUrl: '',
token: '',
barcode: '',
+ carBarcode: '',
+ bsCode: '',
orderNo: null,
dataList: [],
count: 0,
rowNum: '',
matnr: '',
- batch: '',
+ suppCode: '',
weight: '',
msgType1: 'success',
msgType: 'success',
@@ -186,26 +183,26 @@
// barcode input 浜嬩欢
orderNoInput() {
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- setTimeout(() => {
- var len = this.orderNo.length
- // this.barcodeFocuss()
- }, 200)
+ // setTimeout(() => {
+ // var len = this.orderNo.length
+ // // this.barcodeFocuss()
+ // }, 200)
},
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)
},
// 鎵樼洏鐮佹湁璇噸缃�
barcodeFocuss() {
@@ -228,11 +225,12 @@
findMat() {
let that = this
uni.request({
- url: that.baseUrl + '/mobile/scan/order/mats',
+ url: that.baseUrl + '/mobile/cache/task/list',
method: 'POST',
data: {
- orderNo: that.orderNo,
- matnr: that.matnr
+ barcode: that.barcode,
+ bsCode: that.matnr,
+ carBarcode: that.carBarcode
},
header: {
'token': uni.getStorageSync('token')
@@ -242,7 +240,7 @@
if (result.code === 200 && result.data) {
that.matData = result.data
that.matnr = ''
- that.matData['batch'] = ''
+ that.matData['suppCode'] = ''
uni.navigateTo({
url: "../mat/matSelected",
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
@@ -282,12 +280,12 @@
},
selectMat() {
let that = this
- if (that.orderNo == null || that.orderNo == undefined ) {
+ if (that.orderNo == null || that.orderNo == undefined) {
that.messageText = '璇峰～鍐欒鍗曠紪鍙凤紒锛�'
that.messageToggle('error')
return;
}
-
+
uni.navigateTo({
url: "../mat/matQuery",
success: function(res) {
@@ -308,23 +306,24 @@
},
checkMat(mat) {
var len = this.dataList.length
- var add = true ,sameItem = 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) {
+ if (mat.suppCode == this.dataList[j].suppCode) {
sameItem = true
}
}
// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
- if (mat.batch != this.dataList[i].batch) {
+ if (mat.suppCode != this.dataList[i].suppCode) {
this.$forceUpdate() // 寮哄埗鍒锋柊
if (sameItem) {
add = false
} else {
add = true
}
-
+
} else {
// 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
this.dataList[i].anfme += mat.anfme
@@ -341,7 +340,8 @@
revise(item, i) {
this.matnr = this.dataList[i].matnr
this.count = this.dataList[i].anfme
- this.batch = this.dataList[i].batch
+ this.suppCode = this.dataList[i].suppCode
+ this.bsCode = this.dataList[i].threeCode
this.weight = this.dataList[i].weight
this.rowNum = i
this.eject()
@@ -352,7 +352,7 @@
},
// 鍒楄〃绉婚櫎鎸夐挳
remove(item, i, type) {
- this.removeNum = i
+ this.removeNum = i
this.msgType = type
this.title = '璀﹀憡'
this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
@@ -370,7 +370,7 @@
},
reviseConfirm() {
this.dataList[this.rowNum].anfme = this.count
- this.dataList[this.rowNum].batch = this.batch
+ this.dataList[this.rowNum].suppCode = this.suppCode
this.dataList[this.rowNum].weight = this.weight
this.matnr = ''
this.messageText = "淇敼鎴愬姛"
@@ -413,11 +413,12 @@
}
}
uni.request({
- url: that.baseUrl + '/mobile/comb/auth',
+ url: that.baseUrl + '/mobile/cache/comb/auth',
data: JSON.stringify({
orderNo: that.orderNo,
barcode: that.barcode,
- combMats: that.dataList
+ combMats: that.dataList,
+ type: '0'
}),
method: 'POST',
header: {
@@ -478,8 +479,9 @@
@import url('../../static/css/wms.css/wms.css');
.list:first-child {
- margin-top: 460rpx;
+ margin-top: 420rpx;
}
+
.code {
width: 100%;
position: fixed;
@@ -529,4 +531,4 @@
text-align: center;
box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.1