From 4de94b855e88ab9574e2ee75b867adae0be5a2b0 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期六, 14 五月 2022 00:17:42 +0800
Subject: [PATCH] #
---
pages/basics/checkout.vue | 116 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 71 insertions(+), 45 deletions(-)
diff --git a/pages/basics/checkout.vue b/pages/basics/checkout.vue
index 6fa26c5..32ecde1 100644
--- a/pages/basics/checkout.vue
+++ b/pages/basics/checkout.vue
@@ -1,6 +1,6 @@
<template>
<view >
- <scroll-view scroll-y catch:touchmove="touchmove">
+ <scroll-view scroll-y class="scroll-Y">
<view class="square-2">
<view class="square-title">
<view class="title-sign"><view class="sign"></view></view>
@@ -33,10 +33,11 @@
<view class="square-title">
<view class="title-sign"><view class="sign"></view></view>
<view class="title-text"><text>鍟嗗搧鍒楄〃</text></view>
+ <view v-show="matCount > 0" style="display: inline-block;float: right;height: 100rpx;line-height: 100rpx;margin-right: 50rpx;">璇锋壂鐮侀�夊彇 {{matCount}} 浠跺晢鍝�</view>
</view>
</view>
<view class="square-none" v-show="matList.length === 0">
- <view class="v-show">璇锋壂鐮侀�夊彇 {{matCount}} 浠跺晢鍝�</view>
+ <view class="v-show">鏆傛棤鏇村鏁版嵁. . . </view>
</view>
<checkbox-group @change="checkbox">
<view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
@@ -83,14 +84,14 @@
matList:[],
result: '',
siteList:[],
- desc:'',
staNoList:[],
satNo:'',
listLen:0,
msgType: 'success',
messageText: '杩欐槸涓�鏉℃垚鍔熸彁绀�',
fontColor:{color:'red'},
- matCount:'0'
+ matCount:'',
+ wrkNo:'',
}
},
onReady() {
@@ -107,17 +108,17 @@
},
methods: {
+ huanghang() {
+ this.focus = false;
+ this.$nextTick(function() {
+ this.focus = true;
+ });
+ this.matnr = ''
+ },
messageToggle(type) {
this.msgType = type
this.messageText = `杩欐槸涓�鏉�${type}娑堟伅鎻愮ず`
this.$refs.message.open()
- },
- choseStaNo() {
- for (var i = 0;i < this.staNoList.length; i++) {
- if (this.desc == this.staNoList[i].desc) {
- this.staNo = this.staNoList[i].siteId
- }
- }
},
getMatListLen() {
// this.listLen = this.matList.length;
@@ -129,7 +130,6 @@
this.matList = []
this.barcode = ''
this.matnr = ''
- this.desc = ''
uni.vibrateShort();
},
removeBarcode() {
@@ -179,7 +179,7 @@
findBarcode() {
let that = this
uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/pakout/query/auth/v2',
+ url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/pakout/confirm/barcode/auth',
data: {
barcode:that.barcode
},
@@ -187,11 +187,22 @@
'token':uni.getStorageSync('token'),
},
success(result) {
+ console.log(result)
let res = result.data;
if (res.code === 200) {
- if (res.data) {
- that.matCount = res.data.length
+ if (res.data.ioType === 101) {
+ that.matList = res.data.list.concat(that.matList)
+ that.listLen = that.matList.length;
+ return;
}
+ if (res.data.ioType === 103) {
+ that.matCount = res.data.list.length
+ that.wrkNo = res.data.list[0].wrkNo
+ return;
+ }
+ // if (res.data) {
+ // that.matCount = res.data.length
+ // }
} else if (res.code === 403) {
uni.showToast({title: res.msg, icon: "none", position: 'top'})
setTimeout(() => {
@@ -210,38 +221,45 @@
findMat() {
let that = this
uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/pakout/query/auth/v2',
+ url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/pakout/confirm/pick/auth',
data: {
- staNo:that.staNo,
+ wrkNo:that.wrkNo,
matnr:that.matnr
},
header: {
'token':uni.getStorageSync('token')
},
success(result) {
+ console.log(result)
var res = result.data;
if(res.code === 200 ) {
if(res.data) {
+ if (that.matList.length == 0) {
+ that.matList.push(res.data)
+ that.listLen = that.matList.length;
+ that.huanghang();
+ return;
+ }
for(let i = 0;i<that.matList.length;i++) {
- for (let j = 0;j < res.data.length; j++) {
- if(JSON.stringify(that.matList[i]) === JSON.stringify(res.data[j])) {
- res.data.splice(j,1)
+ if (that.matList.length < that.matCount){
+ if(JSON.stringify(that.matList[i]) === JSON.stringify(res.data)) {
+ that.messageToggle('warn');
+ that.messageText = '璇ュ晢鍝佸凡娣诲姞';
+ that.huanghang();
+ return;
+ } else {
+ that.matList.unshift(res.data);
+ that.listLen = that.matList.length;
+ that.huanghang();
+ return;
}
+ } else {
+ that.messageToggle('warn');
+ that.messageText = '宸插嚭鍏ㄩ儴鍟嗗搧锛岃纭鍑哄簱';
+ that.huanghang();
+ return;
}
}
- if (that.matList.length < that.matCount) {
- that.matList = res.data.concat(that.matList)
- that.listLen = that.matList.length;
- that.focus = false;
- that.$nextTick(function() {
- that.focus = true;
- });
- that.matnr = ''
- } else {
- that.messageToggle('warn')
- that.messageText = '鍟嗗搧宸插叏閮ㄦ坊鍔�'
- }
-
}
} else if (res.code == 403) {
uni.showToast({title: res.msg, icon: "none", position: 'top'})
@@ -258,15 +276,30 @@
});
},
comb() {
- uni.vibrateShort();
let that = this;
- uni.showLoading();
+ if (that.barcode === '') {
+ this.messageToggle('error')
+ this.messageText = '璇锋壂鎻忔墭鐩樼爜'
+ return;
+ }
+ if (that.barcode.length !== 8) {
+ this.messageToggle('error')
+ this.messageText = '鎵樼洏鐮佸繀椤讳负8浣�'
+ return;
+ }
+ if (that.matList.length === 0) {
+ this.messageToggle('error')
+ this.messageText = '璇锋坊鍔犲晢鍝佸垪琛�'
+ return;
+ }
+
if (that.matList.length < that.matCount) {
var len = that.matCount - that.matList.length
that.messageToggle('error')
that.messageText = '杩樺墿' + len + '浠舵湭鎵弿'
return;
}
+ uni.showLoading();
uni.request({
url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/pakout/confirm/auth',
data: that.matList,
@@ -278,15 +311,8 @@
uni.showLoading();
var res = result.data
if (res.code === 200) {
- uni.showToast({
- title: res.msg,
- position: 'bottom',
- duration: 1000
- });
- that.matList = []
- that.barcode = ''
- that.matnr = ''
- that.desc = ''
+ uni.showToast({ title: res.msg,position: 'bottom',duration: 1000});
+ that.resst();
} else if (res.code == 403) {
uni.showToast({title: res.msg, icon: "none", position: 'top'})
setTimeout(() => {
@@ -339,7 +365,7 @@
<style>
/* @import "../../colorui/main.css";
@import "../../colorui/icon.css"; */
-
+
.pak-seach-box {
background-color: #FFFFFF;
margin: 15rpx 15rpx 0rpx 15rpx;
--
Gitblit v1.9.1