From 9a2ebd57f8cd3f664512165248f1680c0bdbb854 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期日, 08 五月 2022 21:26:39 +0800
Subject: [PATCH] #
---
pages/basics/checkout.vue | 131 ++++++++++++++++++++++++++++++++-----------
1 files changed, 96 insertions(+), 35 deletions(-)
diff --git a/pages/basics/checkout.vue b/pages/basics/checkout.vue
index 8b26d47..c16729a 100644
--- a/pages/basics/checkout.vue
+++ b/pages/basics/checkout.vue
@@ -9,7 +9,8 @@
<view class="square-content">
<view class="content-input">
<input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆" maxlength="8"
- @input="findBarcode()" :focus="barcodeFocus" @focus="focuss">
+ @input="findBarcode()" :focus="barcodeFocus" >
+ <!-- @focus="focuss" -->
<uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode()"></uni-icons>
</view>
</view>
@@ -34,11 +35,13 @@
</view>
<view class="square-content">
<view class="content-combox">
- <uni-combox emptyTips="鏆傛棤鏁版嵁" :candidates="staNoList" v-model="staNo" placeholder="绔欏彴鍙�"></uni-combox>
+ <uni-combox emptyTips="鏆傛棤鏁版嵁" :candidates="siteList" v-model="desc" placeholder="绔欏彴鍙�"
+ @input="choseStaNo"></uni-combox>
</view>
<view class="content-input-combox">
<input type="text" v-model="matnr" placeholder="鎵爜 / 杈撳叆" @input="findMat()"
- :focus="focus" @focus="focuss">
+ :focus="focus" >
+ <!-- @focus="focuss" -->
<uni-icons type="closeempty" size="20" color="#dadada" @click="removeMatnr()"></uni-icons>
</view>
</view>
@@ -74,7 +77,7 @@
<checkbox-group @change="checkbox">
<view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
<view class="data-list-left">
- <view class="matnr">{{item.barcode}}</view>
+ <view class="matnr">{{item.matnr}}</view>
</view>
<view class="data-list-right">
<uni-icons type="trash" size="25" color="#a5a5a5" @click="remove(item,index)"></uni-icons>
@@ -105,10 +108,12 @@
searchBox: 'hide',
pick:'hide',
matnr:'',
- matList:[{barcode:'92992929292'}],
+ matList:[],
result: '',
+ siteList:[],
+ desc:'',
staNoList:[],
- staNo:'',
+ satNo:'',
}
},
mounted(){
@@ -119,6 +124,13 @@
this.getOutBound();
},
methods: {
+ choseStaNo() {
+ for (var i = 0;i < this.staNoList.length; i++) {
+ if (this.desc == this.staNoList[i].desc) {
+ this.staNo = this.staNoList[i].siteId
+ }
+ }
+ },
focuss() {
uni.hideKeyboard()
},
@@ -126,11 +138,12 @@
this.matList = []
this.barcode = ''
this.matnr = ''
+ this.desc = ''
uni.vibrateShort();
},
removeBarcode() {
this.barcode = ''
- uni.vibrateShort();
+ uni.vibrateShort();
this.barcodeFocus = false;
this.$nextTick(function() {
this.barcodeFocus = true;
@@ -151,21 +164,18 @@
comb() {
uni.vibrateShort();
let that = this;
- if (that.barcode === '') {
- uni.showToast({title: '璇锋壂鎻忔墭鐩樻潯鐮�', icon: "none", position: 'top'});
- return;
- }
- if (that.matList.length === 0) {
- uni.showToast({title: '璇锋坊鍔犲晢鍝佸垪琛�', icon: "none", position: 'top'});
- return;
- }
+ // if (that.barcode === '') {
+ // uni.showToast({title: '璇锋壂鎻忔墭鐩樻潯鐮�', icon: "none", position: 'top'});
+ // return;
+ // }
+ // if (that.matList.length === 0) {
+ // uni.showToast({title: '璇锋坊鍔犲晢鍝佸垪琛�', icon: "none", position: 'top'});
+ // return;
+ // }
uni.showLoading();
uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/comb/auth',
- data: JSON.stringify({
- barcode: that.barcode,
- combMats: that.matList
- }),
+ url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/pakout/confirm/auth',
+ data: that.matList,
method: 'POST',
header: {
'token':uni.getStorageSync('token')
@@ -224,24 +234,53 @@
'token':uni.getStorageSync('token')
},
success(result) {
- console.log(result)
+ var res = result.data;
+ if(res.data) {
+ let add = true;
+ for(let i = 0;i<that.matList.length;i++) {
+ for (let j = 0;j < that.res.data.length; j++) {
+ if(JSON.stringify(that.matList[i]) === JSON.stringify(res.data[j])) {
+ res.data.splice(i,1)
+ // break;
+ }
+ }
+ // add = false;
+ }
+ that.matList = that.matList.concat(res.data)
+ // if (add) {
+ // that.matList = that.matList.concat(res.data)
+ // }
+ }
+
+ // that.addMatList(res.data)
+ // that.matList = res.data
}
});
},
addMatList(mat) {
- let barcode = this.mat.barcode
- let toUnshift = true
- for (var i = 0; i < this.matList.length; i++) {
- if (barcode === this.matList[i].barcode) {
- this.messageToggle('warn')
- this.messageText = barcode + '宸茬粡鎵弿锛岃鍕块噸澶嶆壂鎻�'
- toUnshift = false
+ console.log(mat)
+ if (this.matList.length == 0){
+
+ // this.matList.push(mat[0])
+ // this.matList.prototype.push.apply(mat)
+ } else {
+
+ let toUnshift = true
+ for (var i = 0; i < this.matList.length; i++) {
+ let matnr = this.matList[i].matnr
+ if (matnr == this.matList[i].matnr) {
+ // this.messageToggle('warn')
+ // this.messageText = matnr + '宸茬粡鎵弿锛岃鍕块噸澶嶆壂鎻�'
+ toUnshift = false
+ }
}
+ if (toUnshift) {
+ this.matList.unshift(mat[0])
+ }
+
}
- if (toUnshift) {
- this.matList.unshift(mat)
- }
+ console.log(this.matList)
},
findBarcode() {
let that = this
@@ -251,10 +290,30 @@
barcode:that.barcode
},
header: {
- 'token':uni.getStorageSync('token')
+ 'token':uni.getStorageSync('token'),
+
},
success(result) {
- console.log(result)
+ var res = result.data;
+ if(res.data) {
+ let add = true;
+ for(let i = 0;i<that.matList.length;i++) {
+ for (let j = 0;j < that.res.data.length; j++) {
+ if(JSON.stringify(that.matList[i]) === JSON.stringify(res.data[j])) {
+ res.data.splice(i,1)
+ // break;
+ }
+ }
+ // if(JSON.stringify(that.matList[i]) === JSON.stringify(res.data[0])) {
+ // add = false;
+ // break;
+ // }
+ }
+ that.matList = that.matList.concat(res.data)
+ // if (add) {
+ // that.matList = that.matList.concat(res.data)
+ // }
+ }
}
});
@@ -263,7 +322,7 @@
getOutBound() { // 鑾峰彇鍑哄簱鍙�
let that = this
uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/available/take/check/site',
+ url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/available/take/site',
method: 'POST',
header: {
'token':uni.getStorageSync('token')
@@ -271,6 +330,9 @@
success(result) {
var res = result.data
if (res.code === 200) {
+ for (var i = 0; i < res.data.length; i++){
+ that.siteList.push(res.data[i].desc)
+ }
that.staNoList = res.data
} else if (res.code == 403) {
uni.showToast({title: res.msg, icon: "none", position: 'top'})
@@ -290,7 +352,6 @@
}, // getCheckDetl
change(e) {
- console.log('褰撳墠妯″紡锛�' + e.type + ',鐘舵�侊細' + e.show);
},
toggle(type) {
this.type = type
--
Gitblit v1.9.1