From c86b4ccf132c985e86fb47110ed76ee2b155bbb3 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 19 五月 2022 10:12:21 +0800
Subject: [PATCH] Merge branch 'jkwms' of http://47.97.1.152:5880/r/~whycq/wms-app into jkwms
---
pages/basics/order.vue | 140 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 119 insertions(+), 21 deletions(-)
diff --git a/pages/basics/order.vue b/pages/basics/order.vue
index 88e0b2e..7107ab3 100644
--- a/pages/basics/order.vue
+++ b/pages/basics/order.vue
@@ -1,31 +1,70 @@
<template>
<view >
<scroll-view scroll-y catch:touchmove="touchmove">
- <view class="pak-seach-box">
+ <view class="square-2">
+ <view class="square-title">
+ <view class="title-sign"><view class="sign"></view></view>
+ <view class="title-text"><text>鎵樼洏鏉＄爜</text></view>
+ </view>
+ <view class="square-content">
+ <view class="content-input">
+ <input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆" maxlength="8"
+ :focus="barcodeFocus" @focus="focuss">
+ <uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode()"></uni-icons>
+ </view>
+ </view>
+ </view>
+
+ <!-- <view class="pak-seach-box">
<view class="box-top">
<view class="color-block-blue"></view>
<text class="title">鎵樼洏鏉＄爜</text>
</view>
<view class="box-buttom">
- <input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆">
+ <input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆" maxlength="8">
<view class="search-icon">
<uni-icons type="closeempty" size="20" color="#a5a5a5" @click="removeBarcode()"></uni-icons>
</view>
</view>
+ </view> -->
+
+ <view class="square-2">
+ <view class="square-title">
+ <view class="title-sign"><view class="sign"></view></view>
+ <view class="title-text"><text>鍗曟嵁缂栧彿</text></view>
+ </view>
+ <view class="square-content">
+ <view class="content-input">
+ <input v-model="order" type="text" placeholder="鎵爜 / 杈撳叆" @input="findOrder()"
+ :focus="focus" @focus="focuss">
+ <uni-icons type="closeempty" size="20" color="#dadada" @click="removeOrder()"></uni-icons>
+ </view>
+ </view>
</view>
- <view class="pak-seach-box">
+
+ <!-- <view class="pak-seach-box">
<view class="box-top">
<view class="color-block-blue"></view>
<text class="title">鍗曟嵁缂栧彿</text>
</view>
<view class="box-buttom">
- <input v-model="orderNo" type="text" placeholder="鎵爜 / 杈撳叆" @input="findOrder()">
+ <input v-model="order" type="text" placeholder="鎵爜 / 杈撳叆" @input="findOrder()">
<view class="search-icon">
- <uni-icons type="closeempty" size="20" color="#a5a5a5" @click="removeOrderNo()"></uni-icons>
+ <uni-icons type="closeempty" size="20" color="#a5a5a5" @click="removeOrder()"></uni-icons>
</view>
</view>
+ </view> -->
+ <view class="square-1">
+ <view class="square-title">
+ <view class="title-sign"><view class="sign"></view></view>
+ <view class="title-text"><text>鍟嗗搧鍒楄〃</text></view>
+ </view>
</view>
- <view class="pak-data-box">
+ <view class="square-none" v-show="orderList.length === 0">
+ <view class="v-show">鏆傛棤鏇村鏁版嵁...</view>
+ </view>
+
+ <!-- <view class="pak-data-box">
<view class="box-top">
<view class="color-block-blue"></view>
<text class="title">鍟嗗搧鍒楄〃</text>
@@ -33,7 +72,7 @@
</view>
<view class="pak-data-box" v-show="orderList.length === 0">
<view style="text-align: center;">鏆傛棤鏇村鏁版嵁</view>
- </view>
+ </view> -->
<checkbox-group>
<view v-for="(item,index) in orderList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
<view class="data-list-left">
@@ -61,11 +100,14 @@
</view>
<view>
<!-- 淇敼鏁伴噺 -->
- <uni-popup ref="revise" background-color="#F1F1F1" @change="change">
+ <uni-popup ref="revise" background-color="#fff" @change="change">
<view class="revise-box">
<view class="revise-box-top">
<view class="color-block-blue"></view>
<text class="title">缁勬墭鏁伴噺</text>
+ </view>
+ <view class="text-box">
+ <text>鍙粍鏁伴噺锛歿{enableQty}}</text>
</view>
<view class="changeBox">
<view class="num-box">
@@ -90,9 +132,12 @@
data() {
return {
barcode: '',
+ barcodeFocus:true,
+ focus:false,
type: 'center',
searchBox: 'hide',
pick:'hide',
+ order:null,
orderNo:null,
orderList:[],
result: '',
@@ -100,6 +145,8 @@
minCount:0,
maxCount:'',
rowNum:'',
+ enableQty:'',
+
}
},
mounted(){
@@ -109,30 +156,49 @@
this.basePORT = UPORT
},
methods: {
+ focuss() {
+ uni.hideKeyboard()
+ },
resst() {
this.orderList = []
this.barcode = ''
- this.orderNo = ''
+ this.order = ''
uni.vibrateShort();
},
removeBarcode() {
this.barcode = ''
uni.vibrateShort();
+ this.barcodeFocus = false;
+ this.$nextTick(function() {
+ this.barcodeFocus = true;
+ });
},
- removeOrderNo() {
- this.orderNo = ''
+ removeOrder() {
+ this.order = ''
uni.vibrateShort();
+ this.focus = false;
+ this.$nextTick(function() {
+ this.focus = true;
+ });
},
eject(type) {
this.type = type
// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦� uni-popup 缁勪欢涓婄粦瀹� type灞炴��
this.$refs.revise.open(type)
},
+ initAnfme() {
+
+ for (var i = 0; i < this.orderList.length; i++) {
+ this.orderList[i].anfme = 0
+ }
+ uni.hideLoading();
+ },
revise(item,index) {
var maxCount = this.orderList[index].maxCount
if (maxCount == undefined ) {
- this.orderList[index]["maxCount"] = item.anfme
+ this.orderList[index]["maxCount"] = item.enableQty
}
+ this.enableQty = item.enableQty
this.count = this.minCount
this.maxCount = item.maxCount
this.rowNum = index
@@ -156,14 +222,25 @@
uni.showToast({title: '璇锋壂鎻忔墭鐩樻潯鐮�', icon: "none", position: 'top'});
return;
}
+ if (that.barcode.length !== 8) {
+ uni.showToast({title: '鎵樼洏鐮佸繀椤讳负8浣�', icon: "none", position: 'top'});
+ return;
+ }
if (that.orderList.length === 0) {
uni.showToast({title: '璇锋坊鍔犲晢鍝佸垪琛�', icon: "none", position: 'top'});
return;
+ }
+ for (var i = 0; i < that.orderList.length; i++) {
+ if (that.orderList[i].anfme === 0) {
+ uni.showToast({title: '鍟嗗搧缁勬墭鏁伴噺涓�0涓嶈兘缁勬墭', icon: "none", position: 'top'});
+ return;
+ }
}
uni.showLoading();
uni.request({
url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
+ orderNo: that.orderNo,
barcode: that.barcode,
combMats: that.orderList
}),
@@ -180,6 +257,10 @@
position: 'bottom',
duration: 1000
});
+ that.barcode = ''
+ that.orderNo = ''
+ that.order = ''
+ that.orderList = []
} else if (res.code == 403) {
uni.showToast({title: res.msg, icon: "none", position: 'top'})
setTimeout(() => {
@@ -198,15 +279,21 @@
uni.request({
url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/order/search/orderNo/auth',
data: {
- orderNo: that.orderNo
+ orderNo: that.order
},
header: {
'token':uni.getStorageSync('token')
},
success(result) {
let res = result.data
- if (res.code === 200 && res.data) {
- that.orderList = res.data
+ if (res.code === 200) {
+ if(res.data) {
+ uni.showLoading();
+ that.orderList = res.data;
+ that.orderNo = that.order
+ that.initAnfme()
+ console.log(that.orderList)
+ }
} else if (res.code == 403) {
uni.showToast({title: res.msg, icon: "none", position: 'top'})
setTimeout(() => {
@@ -328,7 +415,7 @@
margin-top: 20rpx;
}
.data-list:last-child {
- margin-bottom: 120rpx;
+ margin-bottom: 160rpx;
}
/* .data-list-left {
display: inline-block;
@@ -363,7 +450,7 @@
}
.revise-box {
width: 500rpx;
- height: 360rpx;
+ height: 500rpx;
}
.revise-box-top {
width: 100%;
@@ -373,14 +460,25 @@
}
.changeBox {
width: 100%;
- height: 120rpx;
- line-height: 150rpx;
+ height: 100rpx;
+ line-height: 120rpx;
text-align: center;
- background-color: #FFFFFF;
+ background-color: #FFF;
margin-top: 20rpx;
+ border-bottom: 1px solid #e3e3e3;
+ }
+ .text-box {
+ width: 100%;
+ height: 100rpx;
+ line-height: 120rpx;
+ text-align: center;
+ /* padding-left: 120rpx; */
+ background-color: #FFF;
+ margin-top: 20rpx;
+ border-bottom: 1px solid #e3e3e3;
}
.changeBox .num-box {
- display: inline-block;
+ display: inline-block;
}
.revise-box-buttom {
position: absolute;
--
Gitblit v1.9.1