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 | 202 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 161 insertions(+), 41 deletions(-)
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 6d7f53c..7a5ff5a 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -1,68 +1,119 @@
<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-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>
</view>
<view class="box-buttom">
<input v-model="matnr" type="text" placeholder="鎵爜 / 杈撳叆" @input="findMat()">
- <button class="cu-btn bg-blue" @click="selectMat()">+鎻愬彇</button>
+ <view class="search-icon">
+ <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>
- <text v-show="matList.length === 0">鏃犳暟鎹�</text>
</view>
-
</view>
+ <view class="pak-data-box" v-show="matList.length === 0">
+ <view style="text-align: center;">鏆傛棤鏇村鏁版嵁</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">
- <checkbox :value="item.id+''" :checked="item.checked" style="display: block;" />
+ <view class="matnr">{{item.barcode}}</view>
</view>
<view class="data-list-right">
- <view><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>
+ <uni-icons type="trash" size="25" color="#a5a5a5" @click="remove(item,index)"></uni-icons>
</view>
</view>
</checkbox-group>
</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:[]
+ matList:[],
+ result: ''
}
},
mounted(){
@@ -71,23 +122,38 @@
const UPORT = uni.getStorageSync('UPORT');
this.basePORT = UPORT
},
- onShow() {
- let that = this;
- uni.$on('matData', function(data) {
- console.log(that.matList)
- console.log(data)
- // that.matList.push(data)
- })
-
-
- },
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(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'});
@@ -109,7 +175,7 @@
'token':uni.getStorageSync('token')
},
success(result) {
- uni.hideLoading();
+ uni.showLoading();
var res = result.data
if (res.code === 200) {
uni.showToast({
@@ -123,7 +189,7 @@
uni.reLaunch({
url: '../login/login'
});
- }, 500);
+ }, 1000);
} else {
uni.showToast({title: res.msg, icon: "none",position: 'top'})
}
@@ -131,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
@@ -144,11 +227,23 @@
'token':uni.getStorageSync('token')
},
success(result) {
+ uni.vibrateShort();
let res = result.data
if (res.code === 200 && res.data) {
+ that.matData = res.data
uni.navigateTo({
- url:"matQuery?matnr=" + that.matnr + "&baseIP=" + that.baseIP + "&basePORT=" + that.basePORT
- })
+ url: "matQuery",
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ matList: function(data) {
+ that.matList.push(data.data)
+ },
+ },
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('matData', { data: that.matData })
+ }
+ });
}
}
@@ -224,11 +319,26 @@
margin-top: 10rpx;
}
.box-buttom {
- display: block;
- width: 720rpx;
- height: 80rpx;
+ display: inline-block;
+ background-color: #ededed;
+ width: 65%;
+ height: 60rpx;
+ border-radius: 20rpx;
+ margin: 15rpx 15rpx 0rpx 15rpx;
}
- .pak-seach-box input {
+ .box-buttom input {
+ width: 75%;
+ float: left;
+ margin: 8rpx 10rpx 0rpx 25rpx;
+ }
+ .box-buttom .search-icon{
+ width: 60rpx;
+ height: 60rpx;
+ float: right;
+ margin-top: 5rpx;
+ margin-right: 10rpx;
+ }
+ /* .pak-seach-box input {
background-color: #ededed;
border: 1rpx solid #d8d8d8;
display: inline-block;
@@ -239,13 +349,13 @@
line-height: 60rpx;
margin: 15rpx 15rpx 0rpx 15rpx;
padding-left: 20rpx;
- }
+ } */
.pak-seach-box button {
background-color: #1E9FFF;
color: #ffffff;
display: inline-block;
float: right;
- width: 150rpx;
+ width: 180rpx;
height: 60rpx;
margin: 15rpx 15rpx 0rpx 15rpx;
line-height: 60rpx;
@@ -283,19 +393,29 @@
.data-list:last-child {
margin-bottom: 120rpx;
}
- .data-list-left {
+ /* .data-list-left {
display: inline-block;
float: left;
text-align: center;
width: 100rpx;
height: 180rpx;
line-height: 180rpx;
+ } */
+ .data-list-left {
+ display: inline-block;
+ float: left;
+ margin-left: 6%;
+ height: 180rpx;
+ color: #676767;
+ }
+ .matnr {
+ padding-top: 10rpx;
}
.data-list-right {
display: inline-block;
- float: left;
+ float: right;
height: 180rpx;
- color: #828282;
+ line-height: 180rpx;
+ margin-right: 10%;
}
-
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.1