From f314d9b1b05d96c1a1e443470064eeeed8917f93 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 30 六月 2025 14:07:07 +0800
Subject: [PATCH] Changes
---
pages/order/orderPutOn.vue | 74 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 17 deletions(-)
diff --git a/pages/order/orderPutOn.vue b/pages/order/orderPutOn.vue
index e08133a..61f280a 100644
--- a/pages/order/orderPutOn.vue
+++ b/pages/order/orderPutOn.vue
@@ -2,16 +2,16 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">搴撲綅鍙�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
- @input="barcodeInput()">
- </view>
- <view class="item">
<view class="code-decs">鐗╂枡鍙�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
<view class="item-right">
<button></button>
</view>
+ </view>
+ <view class="item">
+ <view class="code-decs">搴撲綅鍙�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus">
+ <button v-show="recommendLocs.length" size="mini" type="primary" @click="toggle('right')">鎺ㄨ崘</button>
</view>
</view>
<view class="mat-list-title">
@@ -50,12 +50,12 @@
<uni-tag :text="item.batch" type="warning"></uni-tag>
</view>
</view>
- <view class="list-left-item">
+ <!-- <view class="list-left-item">
<view class="desc">閲嶉噺锛�</view>
<view class="left-item">
<uni-tag :text="item.weight" type="warning"></uni-tag>
</view>
- </view>
+ </view> -->
<view class="list-left-item">
<view class="desc">鏁伴噺锛�</view>
<view class="left-item">{{item.anfme}}</view>
@@ -90,10 +90,10 @@
<view class="popup-item-left">鎵瑰彿:</view>
<view class="popup-item-right"><input type="text" v-model="batch"></view>
</view> -->
- <view class="popup-item">
+ <!-- <view class="popup-item">
<view class="popup-item-left">閲嶉噺:</view>
<view class="popup-item-right"><input type="text" v-model="weight"></view>
- </view>
+ </view> -->
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
@@ -141,6 +141,14 @@
<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
</uni-popup>
</view>
+ <view>
+ <!-- 鏅�氬脊绐� -->
+ <uni-popup ref="popup" background-color="#fff">
+ <scroll-view scroll-y="true" class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
+ <view class="recommend" v-for="item in recommendLocs" @click="chose(item)"> {{ item }}</view>
+ </scroll-view>
+ </uni-popup>
+ </view>
</view>
</template>
@@ -165,10 +173,12 @@
messageText: '',
title: '',
content: '',
- barcodeFocus: true,
- matFocus: false,
+ barcodeFocus: false,
+ matFocus: true,
matData: '',
- removeNum: 0
+ removeNum: 0,
+ type: 'center',
+ recommendLocs: []
}
},
onShow() {
@@ -208,8 +218,15 @@
findMat() {
let that = this
var matnr = that.matnr.split(";")
- that.order = matnr[0]
- that.matnr = matnr[1]
+ if (matnr[1]) {
+ that.order = matnr[0]
+ that.matnr = matnr[1]
+ if (matnr[2] === null) {
+ that.batch = ''
+ matnr[2] = ''
+ }
+ that.anfme = matnr[3]
+ }
uni.request({
url: that.baseUrl + '/mat/auth',
data: {
@@ -224,7 +241,11 @@
that.matData = result.data
that.matnr = ''
that.matData['batch'] = ''
- result.data.batch = matnr[2]
+ that.matData['anfme'] = ''
+ if (matnr[2] === null) {
+ result.data.batch = ''
+ }
+ result.data.anfme = matnr[3]
uni.navigateTo({
url: "../mat/matSelected",
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
@@ -236,6 +257,7 @@
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
events: {
matList: function(data) {
+ that.recommendLoc()
that.checkMat(data.data)
that.focuss()
},
@@ -263,6 +285,23 @@
}
});
+ },
+ // 鎺ㄨ崘搴撲綅
+ recommendLoc() {
+ let that = this
+ that.recommendLocs = []
+ uni.request({
+ url: that.baseUrl + '/node/recommendLoc',
+ data: {matnr: that.matnr},
+ header: {'token': uni.getStorageSync('token')},
+ success(res) {
+ res = res.data
+ if (res.code == 200 && res.data) {
+ that.recommendLocs = res.data
+ }
+ }
+
+ })
},
checkMat(mat) {
mat['orderNo'] = this.order
@@ -442,12 +481,13 @@
display: flex;
min-height: 80rpx;
background-color: #FFF;
- margin: auto 20rpx;
+ margin: 30rpx 20rpx;
+ padding: 10rpx;
border-radius: 20rpx;
box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
}
.list:first-child {
- margin-top: 410rpx;
+ margin-top: 340rpx;
}
.list:last-child {
margin-bottom: 120rpx;
--
Gitblit v1.9.1