From a817c1c191aec850a6a7794bc6e2ff3db4134eaa Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 26 六月 2024 11:06:40 +0800
Subject: [PATCH] #
---
pages/pakin/pakin.vue | 79 +++++++++++++++++++++++++++++----------
1 files changed, 59 insertions(+), 20 deletions(-)
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index a4fdd2f..b329e9c 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -4,11 +4,11 @@
<view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
- @input="barcodeInput()">
+ @input="checkedBarcode()">
</view>
<view class="item">
<view class="code-decs">鐗╂枡鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matNo" :focus="matFocus" @input="findMat()">
<view class="item-right">
<button></button>
<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
@@ -46,6 +46,12 @@
<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.appeTime$" type="warning"></uni-tag>
+ </view>
+ </view>
<!-- <view class="list-left-item">
<view class="desc">閲嶉噺锛�</view>
<view class="left-item">
@@ -78,7 +84,7 @@
<view class="popup-item">
<view class="popup-item-left">缂栫爜:</view>
<view class="popup-item-right">
- <input type="text" v-model="matnr" disabled="true"
+ <input type="text" v-model="matNo" disabled="true"
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
@@ -86,10 +92,12 @@
<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">
+ <uni-datetime-picker type="datetime" v-model="appeTime$" />
+ </view>
+ </view>
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
@@ -144,7 +152,7 @@
dataList: [],
count: 0,
rowNum: '',
- matnr: '',
+ matNo: '',
batch: '',
weight: '',
msgType1: 'success',
@@ -156,6 +164,7 @@
matFocus: false,
matData: '',
removeNum: 0,
+ appeTime$: ''
}
},
onLoad() {
@@ -166,6 +175,28 @@
this.token = uni.getStorageSync('token');
},
methods: {
+ checkedBarcode() {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/barcode/auth',
+ data: {
+ barcode: that.barcode,
+ },
+ header: {
+ 'token':uni.getStorageSync('token')
+ },
+ success(result) {
+ console.log(result);
+ var res = result.data
+ if (res.code === 500) {
+ that.barcodeFocuss()
+ uni.showToast({title: res.msg, icon: "none", position: 'top'});
+ } else if(res.code === 200) {
+ that.barcodeInput()
+ }
+ }
+ })
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -200,7 +231,7 @@
focuss() {
this.focus = false;
setTimeout(() => {
- this.matnr = '';
+ this.matNo = '';
this.matFocus = true;
}, 100);
},
@@ -208,9 +239,9 @@
findMat() {
let that = this
uni.request({
- url: that.baseUrl + '/matCode/list/auth',
+ url: that.baseUrl + '/matCode/list/auth2',
data: {
- mat_no: that.matnr
+ condition: that.matNo
},
header: {
'token': uni.getStorageSync('token')
@@ -219,7 +250,7 @@
result = result.data
if (result.code === 200 && result.data) {
that.matData = result.data
- that.matnr = ''
+ that.matNo = ''
that.matData['batch'] = ''
uni.navigateTo({
url: "../mat/matSelected",
@@ -273,20 +304,23 @@
events: {
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
acceptDataFromOpenedPage: function(data) {
- that.matnr = data.data
- that.findMat(that.matnr)
+ that.matNo = data.data
+ that.findMat(that.matNo)
},
},
});
- that.matnr = ''
+ that.matNo = ''
},
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) {
+ console.log(i);
+ console.log(mat);
+ console.log(this.dataList[i].matNo);
+ if (mat.matNo == this.dataList[i].matNo) {
for (var j = 0; j < len; j++) {
if (mat.batch == this.dataList[j].batch) {
sameItem = true
@@ -315,10 +349,11 @@
},
// 淇敼鎵瑰彿
revise(item, i) {
- this.matnr = this.dataList[i].matnr
+ this.matNo = this.dataList[i].matNo
this.count = this.dataList[i].anfme
this.batch = this.dataList[i].batch
this.weight = this.dataList[i].weight
+ this.appeTime$ = this.dataList[i].appeTime$
this.rowNum = i
this.eject()
},
@@ -348,7 +383,8 @@
this.dataList[this.rowNum].anfme = this.count
this.dataList[this.rowNum].batch = this.batch
this.dataList[this.rowNum].weight = this.weight
- this.matnr = ''
+ this.dataList[this.rowNum].appeTime$ = this.appeTime$
+ this.matNo = ''
this.messageText = "淇敼鎴愬姛"
this.messageToggle('success')
this.$refs.revise.close()
@@ -383,10 +419,11 @@
}
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.messageText = that.dataList[i].matNo + '缁勬墭鏁伴噺涓嶈兘涓�0'
this.messageToggle('error')
return;
}
+ this.dataList[i].count = that.dataList[i].anfme
}
uni.request({
url: that.baseUrl + '/mobile/comb/auth',
@@ -450,7 +487,9 @@
<style>
@import url('../../static/css/wms.css/wms.css');
-
+ .list:first-child {
+ margin-top: 320rpx;
+ }
.code {
width: 100%;
position: fixed;
--
Gitblit v1.9.1