From 0732d75ccd82baffb35238949b11dbfb3614d790 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 06 九月 2023 13:45:15 +0800
Subject: [PATCH] Merge branch 'stwms2' of http://47.97.1.152:5880/r/wms_app into stwms2

---
 pages/stock/stockQuery.vue |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pages/stock/stockQuery.vue b/pages/stock/stockQuery.vue
index 2270073..b31bc35 100644
--- a/pages/stock/stockQuery.vue
+++ b/pages/stock/stockQuery.vue
@@ -3,8 +3,12 @@
 		<!-- 鎼滅储妗� -->
 		<view class="code">
 			<view class="item">
-				<view class="code-decs">搴撲綅鍙�:</view>
+				<view class="code-decs">搴撲綅鐮�:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locNo">
+			</view>
+			<view class="item">
+				<view class="code-decs">鎵樼洏鐮�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode">
 			</view>
 			<view class="item">
 				<view class="code-decs">鐗╂枡鍙�:</view>
@@ -88,6 +92,7 @@
 				baseUrl: '',
 				token: '',
 				locNo: null,
+				barcode: null,
 				matnr: null,
 				dataList: [],
 				msgType: '',
@@ -111,17 +116,16 @@
 						curr: 1,
 						limit: 100,
 						loc_no: that.locNo,
+						zpallet: that.barcode,
 						matnr: that.matnr
 					},
 					method:"GET",
 					success(result) {
-						console.log(result)
 						let res = result.data
 						let records = res.data.records
 						if (res.code == 200) {
 							if (records) {
 								that.dataList = records
-								console.log(that.dataList)
 							} else {
 								uni.showToast({
 									title: "鏆傛棤鏇村鏁版嵁",
@@ -153,6 +157,7 @@
 				this.dataList = []
 				this.matnr = ''
 				this.locNo = ''
+				this.barcode = ''
 				this.messageText = "閲嶇疆瀹屾垚"
 				this.messageToggle('success')
 			},
@@ -173,7 +178,7 @@
 	.code {
 		width: 100%;
 		position: fixed;
-		min-height: 200rpx;
+		min-height: 100rpx;
 		background-color: #FFF;
 		z-index: 10;
 	}
@@ -213,7 +218,7 @@
 		width: 100%;
 		background-color: white;
 		position: fixed;
-		margin-top: 200rpx;
+		margin-top: 300rpx;
 		z-index: 9;
 		/* border-top: 1px solid #DCDFE6; */
 		text-align: center;

--
Gitblit v1.9.1