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 | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/pages/basics/order.vue b/pages/basics/order.vue
index 341e37a..7107ab3 100644
--- a/pages/basics/order.vue
+++ b/pages/basics/order.vue
@@ -1,7 +1,21 @@
<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>
@@ -12,8 +26,23 @@
<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>
@@ -24,8 +53,18 @@
<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">
@@ -93,6 +132,8 @@
data() {
return {
barcode: '',
+ barcodeFocus:true,
+ focus:false,
type: 'center',
searchBox: 'hide',
pick:'hide',
@@ -115,6 +156,9 @@
this.basePORT = UPORT
},
methods: {
+ focuss() {
+ uni.hideKeyboard()
+ },
resst() {
this.orderList = []
this.barcode = ''
@@ -124,10 +168,18 @@
removeBarcode() {
this.barcode = ''
uni.vibrateShort();
+ this.barcodeFocus = false;
+ this.$nextTick(function() {
+ this.barcodeFocus = true;
+ });
},
removeOrder() {
this.order = ''
uni.vibrateShort();
+ this.focus = false;
+ this.$nextTick(function() {
+ this.focus = true;
+ });
},
eject(type) {
this.type = type
--
Gitblit v1.9.1