From 5ae5d39dfbaaaca5162cfe1e5c552426233d1488 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期五, 08 四月 2022 17:01:56 +0800
Subject: [PATCH] #
---
pages/basics/pakin.vue | 99 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 70 insertions(+), 29 deletions(-)
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 6d7f53c..3d547c3 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -8,6 +8,9 @@
</view>
<view class="box-buttom">
<input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆">
+ <view class="search-icon">
+ <uni-icons type="closeempty" size="25" color="#a5a5a5" @click="removeBarcode()"></uni-icons>
+ </view>
</view>
</view>
<view class="pak-seach-box">
@@ -17,27 +20,31 @@
</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="25" color="#a5a5a5" @click="removeMatnr()"></uni-icons>
+ </view>
</view>
+ <button class="cu-btn bg-blue" @click="selectMat()">+鎻愬彇</button>
</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>
- <view class="data-list-right">
- <view><text style="width: 400rpx;">缂栫爜锛歿{item.matnr}}</text></view>
+ <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>
+ <view class="data-list-right">
+ <uni-icons type="trash" size="25" color="#a5a5a5" @click="remove(item,index)"></uni-icons>
</view>
</view>
</checkbox-group>
@@ -62,7 +69,7 @@
searchBox: 'hide',
pick:'hide',
matnr:'',
- matList:[]
+ matList:[],
}
},
mounted(){
@@ -71,21 +78,20 @@
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: {
resst() {
this.matList = []
this.barcode = ''
this.matnr = ''
+ },
+ removeBarcode() {
+ this.barcode = ''
+ },
+ removeMatnr() {
+ this.matnr = ''
+ },
+ remove(item,index) {
+ this.matList.splice(index,1)
},
comb() {
let that = this;
@@ -146,9 +152,20 @@
success(result) {
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: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ acceptDataFromOpenedPage: function(data) {
+ that.matList.push(data.data)
+ },
+ },
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('acceptDataFromOpenerPage', { data: that.matData })
+ }
+ });
}
}
@@ -224,11 +241,25 @@
margin-top: 10rpx;
}
.box-buttom {
- display: block;
- width: 720rpx;
- height: 80rpx;
+ display: inline-block;
+ background-color: #ededed;
+ width: 70%;
+ height: 60rpx;
+ border-radius: 20rpx;
+ margin: 15rpx 15rpx 0rpx 15rpx;
}
- .pak-seach-box input {
+ .box-buttom input {
+ 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,7 +270,7 @@
line-height: 60rpx;
margin: 15rpx 15rpx 0rpx 15rpx;
padding-left: 20rpx;
- }
+ } */
.pak-seach-box button {
background-color: #1E9FFF;
color: #ffffff;
@@ -283,19 +314,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>
--
Gitblit v1.9.1