From 67518f027a8bcf444f5d50123825249d49f999ff Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 12 十月 2022 16:46:02 +0800
Subject: [PATCH] #
---
pages/basics/pakin.vue | 123 +++++++++++++++++++++++++++++++++-------
1 files changed, 101 insertions(+), 22 deletions(-)
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 08239b7..7a5ff5a 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -1,19 +1,51 @@
<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="25" color="#a5a5a5" @click="removeBarcode()"></uni-icons>
+ <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-btn">
+ <input v-model="matnr" type="text" placeholder="鎵爜 / 杈撳叆" @input="findMat()"
+ :focus="focus" @focus="focuss">
+ <uni-icons type="closeempty" size="20" color="#dadada" @click="removeMatnr()"></uni-icons>
+ </view>
+ <view class="content-btn">
+ <button class="cu-btn bg-blue pda-btn" @click="selectMat()">+鎻愬彇</button>
</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>
@@ -21,12 +53,23 @@
<view class="box-buttom">
<input v-model="matnr" type="text" placeholder="鎵爜 / 杈撳叆" @input="findMat()">
<view class="search-icon">
- <uni-icons type="closeempty" size="25" color="#a5a5a5" @click="removeMatnr()"></uni-icons>
+ <uni-icons type="closeempty" size="20" color="#a5a5a5" @click="removeMatnr()"></uni-icons>
</view>
</view>
<button class="cu-btn bg-blue" @click="selectMat()">+鎻愬彇</button>
+ </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="matList.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>
@@ -34,14 +77,11 @@
</view>
<view class="pak-data-box" v-show="matList.length === 0">
<view style="text-align: center;">鏆傛棤鏇村鏁版嵁</view>
- </view>
+ </view> -->
<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"><text style="width: 400rpx;">缂栫爜锛歿{item.matnr}}</text></view>
- <view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
- <view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
- <view><text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text></view>
+ <view class="matnr">{{item.barcode}}</view>
</view>
<view class="data-list-right">
<uni-icons type="trash" size="25" color="#a5a5a5" @click="remove(item,index)"></uni-icons>
@@ -51,25 +91,29 @@
</scroll-view>
<view class="footer flex justify-around">
<view>
- <button class="cu-btn" @click="resst()">閲嶇疆</button>
+ <button class="cu-btn lg" @click="resst()">閲嶇疆</button>
</view>
<view>
- <button class="cu-btn pakin-btn bg-blue" @click="comb()">缁勬墭</button>
+ <button class="cu-btn lg pakin-btn bg-blue" @click="comb()">缁勬墭</button>
</view>
</view>
</view>
</template>
<script>
+ import permision from "@/common/permission.js"
export default {
data() {
return {
barcode: '',
+ barcodeFocus:true,
+ focus:false,
type: 'center',
searchBox: 'hide',
pick:'hide',
matnr:'',
matList:[],
+ result: ''
}
},
mounted(){
@@ -79,21 +123,37 @@
this.basePORT = UPORT
},
methods: {
+ focuss() {
+ uni.hideKeyboard()
+ },
resst() {
this.matList = []
this.barcode = ''
this.matnr = ''
+ uni.vibrateShort();
},
removeBarcode() {
this.barcode = ''
+ uni.vibrateShort();
+ this.barcodeFocus = false;
+ this.$nextTick(function() {
+ this.barcodeFocus = true;
+ });
},
removeMatnr() {
this.matnr = ''
+ uni.vibrateShort();
+ this.focus = false;
+ this.$nextTick(function() {
+ this.focus = true;
+ });
},
- remove() {
+ remove(item,index) {
this.matList.splice(index,1)
+ uni.vibrateShort();
},
comb() {
+ uni.vibrateShort();
let that = this;
if (that.barcode === '') {
uni.showToast({title: '璇锋壂鎻忔墭鐩樻潯鐮�', icon: "none", position: 'top'});
@@ -115,7 +175,7 @@
'token':uni.getStorageSync('token')
},
success(result) {
- uni.hideLoading();
+ uni.showLoading();
var res = result.data
if (res.code === 200) {
uni.showToast({
@@ -129,7 +189,7 @@
uni.reLaunch({
url: '../login/login'
});
- }, 500);
+ }, 1000);
} else {
uni.showToast({title: res.msg, icon: "none",position: 'top'})
}
@@ -137,7 +197,24 @@
});
},
selectMat() {
-
+ let that = this
+ uni.vibrateShort();
+ uni.showLoading();
+ uni.navigateTo({
+ url: "matSelect",
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ acceptDataFromOpenedPage: function(data) {
+ that.matnr = data.data
+ that.findMat(that.matnr)
+ },
+ },
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('acceptDataFromOpenerPage', {baseIP:that.baseIP, basePORT:that.basePORT })
+ }
+ });
+ that.matnr = ''
},
findMat() {
let that = this
@@ -150,6 +227,7 @@
'token':uni.getStorageSync('token')
},
success(result) {
+ uni.vibrateShort();
let res = result.data
if (res.code === 200 && res.data) {
that.matData = res.data
@@ -157,13 +235,13 @@
url: "matQuery",
events: {
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- acceptDataFromOpenedPage: function(data) {
+ matList: function(data) {
that.matList.push(data.data)
},
},
success: function(res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', { data: that.matData })
+ res.eventChannel.emit('matData', { data: that.matData })
}
});
}
@@ -243,12 +321,13 @@
.box-buttom {
display: inline-block;
background-color: #ededed;
- width: 70%;
+ width: 65%;
height: 60rpx;
border-radius: 20rpx;
margin: 15rpx 15rpx 0rpx 15rpx;
}
.box-buttom input {
+ width: 75%;
float: left;
margin: 8rpx 10rpx 0rpx 25rpx;
}
@@ -276,7 +355,7 @@
color: #ffffff;
display: inline-block;
float: right;
- width: 150rpx;
+ width: 180rpx;
height: 60rpx;
margin: 15rpx 15rpx 0rpx 15rpx;
line-height: 60rpx;
@@ -339,4 +418,4 @@
line-height: 180rpx;
margin-right: 10%;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.1