From 59c46888d53c7e79022dd9a50262d4a3a10ae8dc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 九月 2024 12:35:19 +0800
Subject: [PATCH] #
---
pages/pakin/pakin.vue | 68 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 9c3458a..f8808aa 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -6,6 +6,7 @@
<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()">
@@ -16,15 +17,9 @@
</view>
</view>
<view class="item">
- <view class="code-decs">婊℃墭:</view>
- <radio-group @change="floor">
- <label>
- <radio :checked="ck1"/><text>鏄�</text>
- </label>
- <label>
- <radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
- </label>
- </radio-group>
+ <view class="code-decs">澶囨敞:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locname" :focus="barcodeFocus"
+ >
</view>
</view>
<view class="mat-list-title">
@@ -57,6 +52,10 @@
<uni-tag :text="item.batch" type="warning"></uni-tag>
</view>
</view>
+ <view class="list-left-item">
+ <view class="desc">鍖呰鍙凤細</view>
+ <view class="left-item">{{item.itemNum}}</view>
+ </view>
<!-- <view class="list-left-item">
<view class="desc">閲嶉噺锛�</view>
<view class="left-item">
@@ -97,6 +96,11 @@
<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="itemNum"></view>
+ </view>
+
<!-- <view class="popup-item">
<view class="popup-item-left">閲嶉噺:</view>
<view class="popup-item-right"><input type="text" v-model="weight"></view>
@@ -167,9 +171,8 @@
matFocus: false,
matData: '',
removeNum: 0,
- ck1: true,
- ck2: false,
- isFull: true
+ locname:'',
+ itemNum:''
}
},
onLoad() {
@@ -180,12 +183,6 @@
this.token = uni.getStorageSync('token');
},
methods: {
- floor() {
- var temp = this.ck1
- this.ck1 = this.ck2
- this.ck2 = temp
- this.isFull = !temp
- },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -307,13 +304,13 @@
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
- }
- }
+ // for (var j = 0; j < len; j++) {
+ // if (mat.batch == this.dataList[j].batch) {
+ // sameItem = true
+ // }
+ // }
// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
- if (mat.batch != this.dataList[i].batch) {
+ if (mat.batch != this.dataList[i].batch || mat.itemNum != this.dataList[i].itemNum) {
this.$forceUpdate() // 寮哄埗鍒锋柊
if (sameItem) {
add = false
@@ -337,7 +334,8 @@
revise(item, i) {
this.matnr = this.dataList[i].matnr
this.count = this.dataList[i].anfme
- this.batch = this.dataList[i].batch
+ this.batch = this.dataList[i].batch
+ this.itemNum = this.dataList[i].itemNum
this.weight = this.dataList[i].weight
this.rowNum = i
this.eject()
@@ -367,6 +365,8 @@
reviseConfirm() {
this.dataList[this.rowNum].anfme = this.count
this.dataList[this.rowNum].batch = this.batch
+ this.dataList[this.rowNum].units = this.units
+ this.dataList[this.rowNum].memo = this.memo
this.dataList[this.rowNum].weight = this.weight
this.matnr = ''
this.messageText = "淇敼鎴愬姛"
@@ -412,7 +412,7 @@
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
barcode: that.barcode,
- isFull: that.isFull,
+ locname: that.locname,
combMats: that.dataList
}),
method: 'POST',
@@ -452,6 +452,9 @@
// 纭閲嶇疆
resetConfirm() {
this.dataList = []
+ this.barcode = ''
+ this.locname = ''
+ this.matnr = ''
this.messageText = "閲嶇疆瀹屾垚"
this.messageToggle('success')
},
@@ -463,6 +466,7 @@
resst() {
this.dataList = []
this.barcode = ''
+ this.locname = ''
this.barcodeFocuss()
},
}
@@ -471,11 +475,15 @@
<style>
@import url('../../static/css/wms.css/wms.css');
+
+ .list:first-child {
+ margin-top: 300rpx;
+ }
.code {
width: 100%;
position: fixed;
- min-height: 210rpx;
+ min-height: 200rpx;
background-color: #FFF;
z-index: 10;
}
@@ -510,12 +518,12 @@
}
.mat-list-title {
- height: 80rpx;
- line-height: 80rpx;
+ height: 60rpx;
+ line-height: 60rpx;
width: 100%;
background-color: white;
position: fixed;
- margin-top: 200rpx;
+ margin-top: 210rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
--
Gitblit v1.9.1