From b4416d1e1c0c292875820a3a510a1bc3488cb1f7 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 10 十一月 2022 12:37:41 +0800
Subject: [PATCH] #

---
 pages/basics/orderPakin.vue |   50 +++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/pages/basics/orderPakin.vue b/pages/basics/orderPakin.vue
index 95aa25e..dff88a9 100644
--- a/pages/basics/orderPakin.vue
+++ b/pages/basics/orderPakin.vue
@@ -57,11 +57,7 @@
 			<view class="revise-box">
 				<view class="revise-box-top">
 					<view class="color-block-blue"></view>
-					<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>
-					<input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="batch">
+					<text class="title">淇敼</text>
 				</view>
 				<view class="changeBox">
 					<view class="num-box">
@@ -91,6 +87,12 @@
 				<button class="cu-btn bg-blue " @click="comb()">涓婃灦</button>
 			</label>
 		</view>
+		<view>
+			<!-- 鎻愮ず淇℃伅寮圭獥 -->
+			<uni-popup ref="message" type="message">
+				<uni-popup-message :type="msgType" :message="messageText" :duration="2000"></uni-popup-message>
+			</uni-popup>
+		</view>
 	</view>
 </template>
 
@@ -105,9 +107,8 @@
 				barcodeFocus:true,
 				count: 0,
 				batch: '',
-				
-				
-				
+				msgType: 'success',
+				messageText: '杩欐槸涓�鏉℃垚鍔熸彁绀�',
 			}
 		},
 		mounted(){
@@ -131,11 +132,20 @@
 			analysis() {
 				let that = this
 				let str = that.orderNo.split(';')
+				
 				that.orderNo = str[0]
+				if(that.matList.length>0) {
+					if(str[1] != that.matList[0].orderno){
+						uni.showToast({title: '璇风‘璁や笂鏋跺崟鍙�', icon: "none", position: 'top'});
+						return;
+					}
+				}
 				uni.request({
 				    url: that.commonUrl + '/mat/auth',
 				    data: {
-						matnr:str[1]
+						orderno:str[0],
+						matnr:str[1],
+						batch:str[2]
 				    },
 				    header: {
 						'token':uni.getStorageSync('token')
@@ -144,6 +154,7 @@
 						uni.vibrateShort();
 						let res = result.data
 						if (res.code === 200 && res.data) {
+							res.data['orderno'] = str[1]
 							res.data.batch = str[2]
 							that.matData = res.data
 							that.matnr = ''
@@ -160,6 +171,15 @@
 									res.eventChannel.emit('matData', { data: that.matData })
 								},
 							});
+						} else if(res.code === 403) {
+							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({title: res.msg, icon: "none",position: 'top'})
 						}
 						
 					}
@@ -229,6 +249,18 @@
 				this.orderNo = ''
 				this.matList = []
 			},
+			// 绉婚櫎鐗╂枡
+			removeItem(item,index) {
+				this.matList.splice(index,1)
+				// this.listLen = this.matList.length
+				this.messageToggle('success')
+				this.messageText = '绉婚櫎鎴愬姛'
+			},
+			messageToggle(type) {
+				this.msgType = type
+				this.messageText = ''
+				this.$refs.message.open()
+			},
 		}
 	}
 </script>

--
Gitblit v1.9.1