From 1e40a94e41a811a30b49150b5feabe9b7797948a Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 08:23:06 +0800
Subject: [PATCH] #
---
pages/phyz/AGV/AGVPakin2.vue | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/pages/phyz/AGV/AGVPakin2.vue b/pages/phyz/AGV/AGVPakin2.vue
index bb5f8b1..5dd4e47 100644
--- a/pages/phyz/AGV/AGVPakin2.vue
+++ b/pages/phyz/AGV/AGVPakin2.vue
@@ -3,20 +3,20 @@
<view class="code">
<view class="item">
<input type="text" placeholder=" 鎵爜 / 杈撳叆 璁㈠崟鍙�" v-model="orderNo" :focus="orderNoFocus"
- @input="findOrder()">
+ @input="findOrder()" disabled>
</view>
<view class="item">
<input type="text" placeholder=" 鎵爜 / 杈撳叆 璐ф灦鐮�" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
</view>
- <view class="item">
+ <!-- <view class="item">
<input type="text" placeholder=" 鎵爜 / 杈撳叆 鐗╂枡鐮�" v-model="matnr" :focus="matFocus" @input="findMat()">
<view class="item-right">
<button></button>
<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
<uni-icons type="right" color="#c1c1c1"></uni-icons>
</view>
- </view>
+ </view> -->
</view>
<view class="mat-list-title">
鍟嗗搧鍒楄〃
@@ -181,8 +181,8 @@
messageText: '',
title: '',
content: '',
- orderNoFocus: true,
- barcodeFocus: false,
+ orderNoFocus: false,
+ barcodeFocus: true,
matFocus: false,
matData: '',
removeNum: 0,
@@ -201,6 +201,16 @@
}
},20)
// #endif
+ let that = this
+ // const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+ const eventChannel = this.getOpenerEventChannel();
+
+ // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ eventChannel.on('mats', function(data) {
+ console.log(data);
+ that.orderNo = data.mats[0].orderNo
+ that.dataList = data.mats
+ })
},
onBackPress() {
this.hide = false
@@ -513,10 +523,6 @@
return;
}
}
- console.log(that.dataList);
- console.log(that.barcode);
- console.log(that.orderNo);
- // return
uni.request({
url: that.baseUrl + '/agvMobile/comb/auth',
data: JSON.stringify({
@@ -532,14 +538,12 @@
var res = result.data
if (res.code === 200) {
that.dataList = []
- that.findOrder()
- // that.resst();
that.barcode = ''
that.messageText = "缁勬墭鎴愬姛"
that.messageToggle('success')
- const innerAudioContext = uni.createInnerAudioContext();
- innerAudioContext.src = '/static/music/pakinOk.mp3';
- innerAudioContext.play()
+ uni.navigateBack({
+ delta: 2
+ });
} else if (res.code == 403) {
that.messageText = res.msg
that.messageToggle('error')
@@ -600,12 +604,12 @@
}
.list:first-child {
- margin-top: 340rpx;
+ margin-top: 270rpx;
}
.code {
width: 100%;
position: fixed;
- min-height: 200rpx;
+ min-height: 100rpx;
background-color: #FFF;
z-index: 10;
}
@@ -638,7 +642,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 210rpx;
+ margin-top: 140rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
--
Gitblit v1.9.1