From 166b9c6d7517fbff3a400e07d47d1f33c8634c69 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 05 七月 2025 15:08:47 +0800
Subject: [PATCH] #

---
 pages/basics/pakin.vue |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index e1a916a..da06367 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -22,14 +22,14 @@
 					<view class="title-text"><text>妫�绱㈠晢鍝�</text></view>
 				</view>
 				<view class="square-content">
-					<view class="content-input-btn">
+					<view class="content-input">
 						<input v-model="matnr" type="text" placeholder="鎵爜 / 杈撳叆" @input="findMat()"
 						:focus="focus" placeholder-style="line-height:  85rpx;">
 						<uni-icons type="closeempty" size="20" color="#dadada" @click="removeMatnr()"></uni-icons>
 					</view>
-					<view class="content-btn">
+					<!-- <view class="content-btn">
 						<button class="cu-btn bg-blue pda-btn" @click="selectMat()">+鎻愬彇</button>
-					</view>
+					</view> -->
 				</view>
 			</view>
 			
@@ -52,11 +52,18 @@
 						<!-- <view>
 							<checkbox :value="item.id+''" :checked="item.checked" style="display: block;" />
 						</view> -->
+						<view ><text style="width: 400rpx;">鍗曟嵁锛歿{item.orderNo}}</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.specs}}</text></view>
+					<!-- 	<view><text style="width: 400rpx;">鍨嬪彿锛歿{item.model}}</text></view> -->
+						<view><text style="width: 400rpx;">鎵规锛歿{item.batch}}</text></view>
+						<!-- <view><text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text></view> -->
 						<view>
-							<text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
+							<text style="width: 400rpx;">涓绘暟閲忥細{{item.anfme}}</text>
+						</view>
+						<view>
+							<text style="width: 400rpx;">杈呮暟閲忥細{{item.weight}}</text>
 						</view>
 					</view>
 					<view class="data-list-right">
@@ -91,16 +98,16 @@
 			<view class="revise-box ">
 				<view class="revise-box-top">
 					<view class="color-block-blue"></view>
-					<text class="title">淇敼鎵瑰彿/鏁伴噺</text>
+					<text class="title">淇敼鏁伴噺</text>
 				</view>
-				<view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
-					<text style="display: inline-block;float: left;width: 50px;">鎵瑰彿锛�</text>
+			<!-- 	<view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
+					<text style="display: inline-block;float: left;width: 60px;">鎵规锛�</text>
 					<input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="batch">
-				</view>
+				</view> -->
 				<view class="changeBox">
 					<view class="num-box">
-						<text style="display: inline-block;float: left;width: 50px;">鎵瑰彿锛�</text>
-						<uni-number-box :value="count" :max="9999" color="#747474"  @change="changeValue"/>
+						<text style="display: inline-block;float: left;width: 60px;">涓绘暟閲忥細</text>
+						<uni-number-box :value="count" :max="99999999" color="#747474"  @change="changeValue"/>
 					</view> 
 				</view>
 				<view class="revise-box-buttom">
@@ -238,7 +245,7 @@
 				}
 				uni.showLoading();
 				uni.request({
-				    url: that.commonUrl + '/mobile/comb/auth',
+				    url: that.commonUrl + '/mobile/comb2/auth',
 				    data: JSON.stringify({
 						barcode: that.barcode,
 						combMats: that.matList
@@ -293,7 +300,7 @@
 			findMat() {
 				let that = this
 				uni.request({
-				    url: that.commonUrl + '/mat/auth',
+				    url: that.commonUrl + '/mobile/mat/auth',
 				    data: {
 						matnr:that.matnr
 				    },
@@ -344,7 +351,7 @@
 				var len = this.matList.length
 				var add = true
 				for (var i = 0; i < len; i++) {
-					if (mat.matnr == this.matList[i].matnr) {
+					if (mat.matnr == this.matList[i].matnr && mat.batch == this.matList[i].batch) {
 						this.matList[i].anfme += mat.anfme 
 						this.$forceUpdate() // 寮哄埗鍒锋柊
 						add = false
@@ -576,7 +583,7 @@
 	}
 	.data-list {
 		border-bottom: 1px solid #d8d8d8;
-		height: 180rpx;
+		height: 280rpx;
 		margin: 15rpx;
 		border-radius: 20rpx;
 	}

--
Gitblit v1.9.1