From 2b94c7e54b5ce6f094b58aa3dc7142fb037f64f7 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 15 九月 2023 11:13:03 +0800
Subject: [PATCH] #

---
 pages/pakin/pakin.vue |   69 +++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index cd83df3..a4fdd2f 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -4,7 +4,7 @@
 			<view class="item">
 				<view class="code-decs">鎵樼洏鐮�:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
-					@confirm="barcodeInput()">
+					@input="barcodeInput()">
 			</view>
 			<view class="item">
 				<view class="code-decs">鐗╂枡鐮�:</view>
@@ -29,16 +29,16 @@
 					<view class="list-left-item">
 						<view class="desc">缂栫爜锛�</view>
 						<view class="left-item">
-							<uni-tag :text="item.matnr" type="primary"></uni-tag>
+							<uni-tag :text="item.matNo" type="primary"></uni-tag>
 						</view>
 					</view>
 					<view class="list-left-item">
 						<view class="desc">鍝佸悕锛�</view>
-						<view class="left-item">{{item.maktx}}</view>
+						<view class="left-item">{{item.matName}}</view>
 					</view>
 					<view class="list-left-item">
 						<view class="desc">瑙勬牸锛�</view>
-						<view class="left-item">{{item.specs}}</view>
+						<view class="left-item">{{item.str2}}</view>
 					</view>
 					<view class="list-left-item">
 						<view class="desc">鎵瑰彿锛�</view>
@@ -46,6 +46,12 @@
 							<uni-tag :text="item.batch" type="warning"></uni-tag>
 						</view>
 					</view>
+					<!-- <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 class="list-left-item">
 						<view class="desc">鏁伴噺锛�</view>
 						<view class="left-item">{{item.anfme}}</view>
@@ -76,14 +82,18 @@
 								style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
 						</view>
 					</view>
-					<view class="popup-item">
-						<view class="popup-item-left">鍚堝悓鍙�:</view>
+					<!-- <view class="popup-item">
+						<view class="popup-item-left">鎵瑰彿:</view>
 						<view class="popup-item-right"><input type="text" v-model="batch"></view>
-					</view>
+					</view> -->
+					<!-- <view class="popup-item">
+						<view class="popup-item-left">閲嶉噺:</view>
+						<view class="popup-item-right"><input type="text" v-model="weight"></view>
+					</view> -->
 					<view class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
-							<uni-number-box :value="count" :max="9999999" color="#747474" @change="changeValue" />
+							<uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
 						</view>
 					</view>
 					<view class="btn">
@@ -98,7 +108,7 @@
 			<!-- 鎻愮ず绐楃ず渚� -->
 			<uni-popup ref="alertDialog" type="dialog">
 				<uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
-					@confirm="removeConfirm" @close="removeClose"></uni-popup-dialog>
+					@confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
 			</uni-popup>
 		</view>
 		<view>
@@ -136,6 +146,7 @@
 				rowNum: '',
 				matnr: '',
 				batch: '',
+				weight: '',
 				msgType1: 'success',
 				msgType: 'success',
 				messageText: '',
@@ -143,8 +154,8 @@
 				content: '',
 				barcodeFocus: true,
 				matFocus: false,
-				matData: ''
-
+				matData: '',
+				removeNum: 0,
 			}
 		},
 		onLoad() {
@@ -187,22 +198,19 @@
 			},
 			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
 			focuss() {
-				// #ifdef APP
-				let that = this;
-				that.focus = false;
+				this.focus = false;
 				setTimeout(() => {
-					that.matnr = '';
-					that.focus = true;
+					this.matnr = '';
+					this.matFocus = true;
 				}, 100);
-				// #endif
 			},
 			// 鎼滅储鐗╂枡
 			findMat() {
 				let that = this
 				uni.request({
-					url: that.baseUrl + '/mat/auth',
+					url: that.baseUrl + '/matCode/list/auth',
 					data: {
-						matnr: that.matnr
+						mat_no: that.matnr
 					},
 					header: {
 						'token': uni.getStorageSync('token')
@@ -218,19 +226,20 @@
 								// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
 								success: function(res) {
 									res.eventChannel.emit('mat', {
-										data: result.data
+										data: result.data.records[0]
 									})
 								},
 								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 								events: {
 									matList: function(data) {
 										that.checkMat(data.data)
+										that.focuss()
 									},
 								},
 							});
-						} else if (res.code == 403) {
+						} else if (result.code == 403) {
 							uni.showToast({
-								title: res.msg,
+								title: result.msg,
 								icon: "none",
 								position: 'top'
 							})
@@ -241,7 +250,7 @@
 							}, 1000);
 						} else {
 							uni.showToast({
-								title: res.msg,
+								title: result.msg,
 								icon: "none",
 								position: 'top'
 							})
@@ -303,13 +312,13 @@
 				if (add) {
 					this.dataList.unshift(mat)
 				}
-				console.log(len);
 			},
 			// 淇敼鎵瑰彿
 			revise(item, i) {
 				this.matnr = this.dataList[i].matnr
 				this.count = this.dataList[i].anfme
 				this.batch = this.dataList[i].batch
+				this.weight = this.dataList[i].weight
 				this.rowNum = i
 				this.eject()
 			},
@@ -319,16 +328,17 @@
 			},
 			// 鍒楄〃绉婚櫎鎸夐挳
 			remove(item, i, type) {
+				this.removeNum  = i
 				this.msgType = type
 				this.title = '璀﹀憡'
 				this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
 				this.$refs.alertDialog.open(i)
 			},
 			// 纭绉婚櫎
-			removeConfirm(i) {
+			removeConfirm() {
 				this.messageText = "绉婚櫎鎴愬姛"
 				this.messageToggle('success')
-				this.dataList.splice(i, 1)
+				this.dataList.splice(this.removeNum, 1)
 			},
 			// 鍙栨秷绉婚櫎
 			removeClose() {
@@ -337,6 +347,8 @@
 			reviseConfirm() {
 				this.dataList[this.rowNum].anfme = this.count
 				this.dataList[this.rowNum].batch = this.batch
+				this.dataList[this.rowNum].weight = this.weight
+				this.matnr = ''
 				this.messageText = "淇敼鎴愬姛"
 				this.messageToggle('success')
 				this.$refs.revise.close()
@@ -392,6 +404,9 @@
 							that.resst();
 							that.messageText = "缁勬墭鎴愬姛"
 							that.messageToggle('success')
+							const innerAudioContext = uni.createInnerAudioContext();
+							innerAudioContext.src = '/static/music/pakinOk.mp3';
+							innerAudioContext.play()
 						} else if (res.code == 403) {
 							that.messageText = res.msg
 							that.messageToggle('error')
@@ -483,6 +498,6 @@
 		z-index: 9;
 		/* border-top: 1px solid #DCDFE6; */
 		text-align: center;
-		box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
+		box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
 	}
 </style>

--
Gitblit v1.9.1