From 77f30ad3d40b85cdbaf636c89b780964b4dd39a7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 25 七月 2024 18:25:37 +0800
Subject: [PATCH] #

---
 manifest.json                    |    4 +-
 pages/pakin/pakin.vue            |   21 +++++-----
 pages/order/orderPickConfirm.vue |   56 +++++++++++++--------------
 3 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/manifest.json b/manifest.json
index c478ad9..e182684 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "涓壃WMS",
     "appid" : "__UNI__DA5854D",
     "description" : "",
-    "versionName" : "2024071201",
-    "versionCode" : "100",
+    "versionName" : "20240725A",
+    "versionCode" : 101,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages/order/orderPickConfirm.vue b/pages/order/orderPickConfirm.vue
index 87bb66b..29146fb 100644
--- a/pages/order/orderPickConfirm.vue
+++ b/pages/order/orderPickConfirm.vue
@@ -217,12 +217,8 @@
 				let that = this
 				uni.request({
 					url: that.baseUrl + '/mobile/loc/f/list',
-					header: {
-						'token': uni.getStorageSync('token')
-					},
-					data: {
-						locNo: that.locNo
-					},
+					header: { 'token': uni.getStorageSync('token') },
+					data: { locNo: that.locNo },
 					method: 'GET',
 					success(res) {
 						res = res.data;
@@ -233,6 +229,11 @@
 								list.push(item.locNo)
 							})
 							that.locNoList = list;
+						} else if (res.code == 403) {
+							uni.showToast({ title: res.msg, icon: "error", position: 'center' })
+							setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+						} else {
+							uni.showToast({ title: res.msg, icon: "error", position: 'center' })
 						}
 					}
 				})
@@ -254,6 +255,11 @@
 								list.push(item.stnNo)
 							})
 							that.staList = list;
+						} else if (res.code == 403) {
+							uni.showToast({ title: res.msg, icon: "error", position: 'center' })
+							setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+						} else {
+							uni.showToast({ title: res.msg, icon: "error", position: 'center' })
 						}
 					}
 				})
@@ -277,6 +283,11 @@
 							for (var i = 0; i < that.dataList.length; i++) {
 								that.$set(that.dataList[i], 'checked', false)
 							}
+						} else if (res.code == 403) {
+							uni.showToast({ title: res.msg, icon: "error", position: 'center' })
+							setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+						} else {
+							uni.showToast({ title: res.msg, icon: "error", position: 'center' })
 						}
 					}
 				})
@@ -289,7 +300,6 @@
 						checkedList.push(this.dataList[i])
 					}
 				}
-				
 				this.checkedDataList = checkedList;
 				this.switchCheckedList()
 			},
@@ -297,8 +307,6 @@
 				this.dataList = this.checkedDataList;
 				this.showChecked = true;
 			},
-			
-			
 			checkboxChange: function(e) {},
 			messageToggle(type) {
 				this.msgType1 = type
@@ -314,24 +322,20 @@
 				uni.vibrateShort();
 				let that = this;
 				if (that.checkedDataList.length === 0) {
-					this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
-					this.messageToggle('error')
+					uni.showToast({ title: "璇烽�夋嫨骞舵澘鍟嗗搧", icon: "error", position: 'center' })
 					return;
 				}
 				if (that.locNo == '') {
-					this.messageText = "搴撲綅鍙蜂笉鑳戒负绌�"
-					this.messageToggle('error')
+					uni.showToast({ title: "搴撲綅鍙蜂笉鑳戒负绌�", icon: "error", position: 'center' })
 					return;
 				}
 				if (that.sta == '') {
-					this.messageText = "绔欑偣涓嶈兘涓虹┖"
-					this.messageToggle('error')
+					uni.showToast({ title: "绔欑偣涓嶈兘涓虹┖", icon: "error", position: 'center' })
 					return;
 				}
 				for (var i = 0; i < that.checkedDataList.length; i++) {
 					if (that.checkedDataList[i].useCount == 0 || that.checkedDataList[i].useCount == '') {
-						this.messageText = that.checkedDataList[i].matnr + '骞舵澘鏁伴噺涓嶈兘涓�0'
-						this.messageToggle('error')
+						uni.showToast({ title: "骞舵澘鏁伴噺涓嶈兘涓�0", icon: "error", position: 'center' })
 						return;
 					}
 				}
@@ -341,7 +345,6 @@
 						staNo: that.sta,
 						list: that.checkedDataList
 				}
-				console.log(param);
 				uni.request({
 					url: that.baseUrl + '/mobile/pick/in',
 					data: JSON.stringify(param),
@@ -353,19 +356,12 @@
 						var res = result.data
 						if (res.code === 200) {
 							that.resst();
-							that.messageText = "骞舵澘鎴愬姛"
-							that.messageToggle('success')
+							uni.showToast({ title: "骞舵澘鎴愬姛", icon: "success", position: 'center' })
 						} else if (res.code == 403) {
-							that.messageText = res.msg
-							that.messageToggle('error')
-							setTimeout(() => {
-								uni.reLaunch({
-									url: '../login/login'
-								});
-							}, 1000);
+							uni.showToast({ title: res.msg, icon: "success", position: 'center' })
+							setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
 						} else {
-							that.messageText = res.msg
-							that.messageToggle('error')
+							uni.showToast({ title: res.msg, icon: "success", position: 'center' })
 						}
 					}
 				});
@@ -434,6 +430,8 @@
 			resst() {
 				this.dataList = []
 				this.checkedDataList = []
+				this.locNo = ''
+				this.sta = ''
 			},
 			combClose() {
 				this.$refs.combConfirm.close()
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 8243044..5bb8f9c 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<!-- ----------------------------------------------绋嬪簭鏍囬鏍�----------------------------------------------------------- -->
 		<view class="status_bar">
 			<!-- 杩欓噷鏄姸鎬佹爮 -->
 		</view>
@@ -14,6 +15,9 @@
 				</view>
 			</block>
 		 </uni-nav-bar>
+		<!-- ----------------------------------------------绋嬪簭鏍囬鏍�----------------------------------------------------------- -->
+		 
+		<!-- ----------------------------------------------  杈撳叆妗�  ----------------------------------------------------------- -->
 		<view class="code">
 			<view class="item">
 				<view class="code-decs">鎵樼洏鐮�:</view>
@@ -42,7 +46,7 @@
 				</radio-group>
 			</view>
 		</view>
-		
+		<!-- ----------------------------------------------  杈撳叆妗�  ----------------------------------------------------------- -->
 		<view class="mat-list-title">
 			鍟嗗搧鍒楄〃
 		</view>
@@ -293,22 +297,14 @@
 								},
 							});
 						} else if (result.code == 403) {
-							uni.showToast({
-								title: result.msg,
-								icon: "none",
-								position: 'top'
-							})
+							uni.showToast({ title: result.msg, icon: "none", position: 'top' })
 							setTimeout(() => {
 								uni.reLaunch({
 									url: '../login/login'
 								});
 							}, 1000);
 						} else {
-							uni.showToast({
-								title: result.msg,
-								icon: "none",
-								position: 'top'
-							})
+							uni.showToast({ title: result.msg, icon: "none", position: 'top' })
 						}
 
 					}
@@ -508,6 +504,9 @@
 <style>
 	@import url('../../static/css/wms.css/wms.css');
 
+	.list:first-child {
+		margin-top: 320rpx;
+	}
 	.code {
 		width: 100%;
 		position: fixed;

--
Gitblit v1.9.1