From e7c423f807a03b2e4f61afd43124992acb28f06d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 03 九月 2024 09:06:35 +0800
Subject: [PATCH] #
---
pages/mat/matSelected.vue | 14 ++-----
pages/pakin/pakin.vue | 47 +++++++++++++----------
2 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index 4e762c6..6bade45 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -22,18 +22,10 @@
</view>
</view>
<view class="form-item">
- <view class="form-item-desc"><text>琚嬪彿</text></view>
+ <view class="form-item-desc"><text>鍖呰鍙�</text></view>
<view class="form-item-content">
<view class="form-input">
- <input type="text" v-model="mat.units">
- </view>
- </view>
- </view>
- <view class="form-item">
- <view class="form-item-desc"><text>閲嶉噺澶囨敞</text></view>
- <view class="form-item-content">
- <view class="form-input">
- <input type="text" v-model="mat.memo">
+ <input type="text" v-model="mat.itemNum">
</view>
</view>
</view>
@@ -63,6 +55,7 @@
units: null,
memo: null,
anfme: 0,
+ itemNum:''
},
baseIP:'',
basePORT:'',
@@ -81,6 +74,7 @@
eventChannel.on('mat', function(data) {
that.mat = data.data
that.mat.anfme = 0
+ that.mat.itemNum = ""
})
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 13b6f6e..2f2d2e9 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()">
@@ -14,6 +15,11 @@
<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="locname" :focus="barcodeFocus"
+ >
</view>
</view>
<view class="mat-list-title">
@@ -47,13 +53,9 @@
</view>
</view>
<view class="list-left-item">
- <view class="desc">琚嬪彿锛�</view>
- <view class="left-item">{{item.units}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">閲嶉噺澶囨敞锛�</view>
- <view class="left-item">{{item.memo}}</view>
- </view>
+ <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">
@@ -95,13 +97,10 @@
<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="units"></view>
+ <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="memo"></view>
- </view>
+
<!-- <view class="popup-item">
<view class="popup-item-left">閲嶉噺:</view>
<view class="popup-item-right"><input type="text" v-model="weight"></view>
@@ -172,6 +171,8 @@
matFocus: false,
matData: '',
removeNum: 0,
+ locname:'',
+ itemNum:''
}
},
onLoad() {
@@ -333,9 +334,8 @@
revise(item, i) {
this.matnr = this.dataList[i].matnr
this.count = this.dataList[i].anfme
- this.batch = this.dataList[i].batch
- this.units = this.dataList[i].units
- this.memo = this.dataList[i].memo
+ this.batch = this.dataList[i].batch
+ this.itemNum = this.dataList[i].itemNum
this.weight = this.dataList[i].weight
this.rowNum = i
this.eject()
@@ -412,6 +412,7 @@
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
barcode: that.barcode,
+ locname: that.locname,
combMats: that.dataList
}),
method: 'POST',
@@ -451,6 +452,9 @@
// 纭閲嶇疆
resetConfirm() {
this.dataList = []
+ this.barcode = ''
+ this.locname = ''
+ this.matnr = ''
this.messageText = "閲嶇疆瀹屾垚"
this.messageToggle('success')
},
@@ -462,6 +466,7 @@
resst() {
this.dataList = []
this.barcode = ''
+ this.locname = ''
this.barcodeFocuss()
},
}
@@ -472,13 +477,13 @@
@import url('../../static/css/wms.css/wms.css');
.list:first-child {
- margin-top: 280rpx;
+ margin-top: 300rpx;
}
.code {
width: 100%;
position: fixed;
- min-height: 140rpx;
+ min-height: 200rpx;
background-color: #FFF;
z-index: 10;
}
@@ -513,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: 140rpx;
+ margin-top: 210rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
--
Gitblit v1.9.1