From ad1e4e950a4e961a41344e5847d47f91dabd0c29 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 08 十二月 2025 15:58:22 +0800
Subject: [PATCH] Merge branch 'jsxswms-app' of http://47.97.1.152:5880/r/wms_app into jsxswms-app

---
 pages/mat/matQuery.vue |   72 +++++++++++++++++++++---------------
 1 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index e3713f5..557ea98 100644
--- a/pages/mat/matQuery.vue
+++ b/pages/mat/matQuery.vue
@@ -1,30 +1,36 @@
 <template>
 	<view>
-		<!-- 鎼滅储妗� -->
-		<view class="search-bar">
-			<uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" />
+		<view class="form">
+			<view class="form-item">
+				<view class="form-item-desc"><text>鍟嗗搧缂栫爜</text></view>
+				<view class="form-item-content"><text>{{mat.matnr}}</text></view>
+			</view>
+			<view class="form-item">
+				<view class="form-item-desc"><text>鍟嗗搧鍚嶇О</text></view>
+				<view class="form-item-content" style="word-break: break-all;line-height: 1.5;"><text>{{mat.maktx}}</text></view>
+			</view>
+			<view class="form-item">
+				<view class="form-item-desc"><text>瑙勬牸</text></view>
+				<view class="form-item-content"><text>{{mat.specs}}</text></view>
+			</view>
+			<view class="form-item">
+				<view class="form-item-desc"><text>鎵瑰彿</text></view>
+				<view class="form-item-content">
+					<view class="form-input">
+						<input type="text" v-model="mat.batch">
+					</view>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="form-item-desc"><text>鏁伴噺</text></view>
+				<view class="form-item-content">
+					<uni-number-box :value="mat.anfme" :max="99999999" :step='1' color="#747474" @change="changeValue" />
+				</view>
+			</view>
 		</view>
-		<scroll-view>
-			<view class="tag-list" v-for="(item,i) in tagList" :key="i" @click="showTag(item.id)">
-				<view class="tag">
-					<view style="display: flex;">
-						<view class="wms-tag" :style="baColor" >鍒嗙被</view>
-					</view>
-				</view>
-				<view class="tag-item">{{item.name}}</view>
-			</view>
-		</scroll-view>
-		<view>
-			<view class="tag-list" v-for="(item,i) in matList" :key="i" @click="findBySelect(item.matnr)">
-				<view class="tag">
-					<view style="display: flex;">
-						<view class="wms-tag" :style="baColor" >鍟嗗搧</view>
-					</view>
-				</view>
-				<view class="tag-item">鍟嗗搧缂栧彿锛� {{item.matnr}}</view>
-				<view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.maktx  ? item.maktx : '--'}}</view>
-				<view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.specs  ? item.specs : '--'}}</view>
-			</view>
+		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+		<view class="buttom">
+			<button size="mini" type="primary" @click="back()">鎻愬彇</button>
 		</view>
 		<uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
 	</view>
@@ -43,6 +49,7 @@
 				baColor: "background-color: #0081ff;",
 				desc: '鍟嗗搧缂栧彿:',
 				baseUrl: '',
+				orderNo: '',
 				token: '',
 				status: 'more',
 				contentText: {
@@ -60,21 +67,24 @@
 				this.showMat(this.tagIdNow);
 			}
 		},
-		onLoad() {
+		onLoad(option) {
 			// 娌″暐鐢ㄤ簡
 			let that = this
-			// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+			// #ifdef APP-NVUE
+			const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+			// #endif
+			// #ifndef APP-NVUE
 			const eventChannel = this.getOpenerEventChannel();
-			
+			// #endif
 			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
-			eventChannel.on('commonUrl', function(data) {
-				that.commonUrl = data.commonUrl
+			eventChannel.on('orderNo', function(data) {
+				that.orderNo = data.orderNo
+				that.showTag(data.orderNo)
 			})
 		},
 		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
-			this.showTag(1)
 		},
 		methods: {
 			search() {
@@ -124,6 +134,7 @@
 						'token':uni.getStorageSync('token'),
 					},
 					success(result) {
+						console.log(result);
 						that.tagList = null
 						that.matList = []
 						var res = result.data
@@ -165,6 +176,7 @@
 						'token':uni.getStorageSync('token'),
 				    },
 					success(result) {
+						console.log(result);
 						that.tagList = null
 						var res = result.data
 						if (res.code === 200) {

--
Gitblit v1.9.1