From 1506285cadd60b03c92a79491d1655891ede1d77 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 15 七月 2022 08:51:06 +0800
Subject: [PATCH] #

---
 pages/basics/outPakin.vue |  132 +++++++++++++++++++++++++-------------------
 1 files changed, 75 insertions(+), 57 deletions(-)

diff --git a/pages/basics/outPakin.vue b/pages/basics/outPakin.vue
index 4c5052c..dbbe81b 100644
--- a/pages/basics/outPakin.vue
+++ b/pages/basics/outPakin.vue
@@ -95,6 +95,7 @@
 	export default {
 		data() {
 			return {
+				commonUrl:null,
 				barcode: '',
 				barcodeFocus:true,
 				focus:false,
@@ -118,6 +119,7 @@
 			this.baseIP = UIP;
 			const UPORT = uni.getStorageSync('UPORT');
 			this.basePORT = UPORT
+			this.getUrl()
 		},
 		onLoad() {
 			// #ifdef APP
@@ -127,6 +129,10 @@
 			// #endif
 		},
 		methods: {
+			// 鑾峰彇url
+			getUrl() {
+				this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + this.baseUrl
+			},
 			radioChange(evt) {
 				for (let i = 0; i < this.origins.length; i++) {
 					if (this.origins[i].value === evt.detail.value) {
@@ -135,13 +141,51 @@
 					}
 				}
 			},
+			// 纭鍑哄簱鍙�
 			check() {
+				let that = this
 				if (this.current == 0) {
 					this.origin = 1288
 				} else {
 					this.origin = 5055
 				}
 				this.$refs.checkOrigin.close()
+				uni.request({
+				    url: that.commonUrl + '/mobile/comb/auth',
+				    data: JSON.stringify({
+						barcode: that.barcode,
+						origin: that.origin,
+						combMats: that.matList
+					}),
+					method: 'POST',
+				    header: {
+						'token':uni.getStorageSync('token')
+				    },
+					success(result) {
+						uni.showLoading();
+						var res = result.data
+						if (res.code === 200) {
+							uni.showToast({
+								title: res.msg,
+								position: 'bottom',
+								duration: 1000
+							});
+							that.barcode = '';
+							that.matList = '';
+							that.matList = [];
+							that.barcodeFocuss();
+						} 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'})
+						}
+					}
+				});
 			},
 			nextInput() {
 				if (this.barcode.length == 8) {
@@ -211,45 +255,10 @@
 					return;
 				}
 				// uni.showLoading();
-				// that.$refs.checkOrigin.open()
-				// return;
-				uni.request({
-				    url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/comb/auth',
-				    data: JSON.stringify({
-						barcode: that.barcode,
-						// origin: that.origin,
-						combMats: that.matList
-					}),
-					method: 'POST',
-				    header: {
-						'token':uni.getStorageSync('token')
-				    },
-					success(result) {
-						uni.showLoading();
-						var res = result.data
-						if (res.code === 200) {
-							uni.showToast({
-								title: res.msg,
-								position: 'bottom',
-								duration: 1000
-							});
-							that.barcode = '';
-							that.matList = '';
-							that.matList = [];
-							that.barcodeFocuss();
-						} 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'})
-						}
-					}
-				});
+				that.$refs.checkOrigin.open()
+				
 			},
+			// 杈撳叆鐨勪笉鏄暟瀛楃殑鎺掗櫎
 			checkNum(theObj) {
 				var reg = /^[0-9]*$/;
 				if (!reg.test(theObj)) {
@@ -259,6 +268,25 @@
 					return;
 				}
 			},
+			// 娣诲姞鎵弿鏃ュ織
+			addLog(matCode,userName) {
+				let that = this;
+				uni.request({
+					url: that.commonUrl + "/mobile/addLog/auth",
+					data: {
+						matcode:matCode,
+						username:userName
+					},
+					header: {
+						'token':uni.getStorageSync('token')
+					},
+					// method:"POST",
+					success(result) {
+					}
+				})
+				
+			},
+			// 妫�绱㈠晢鍝�
 			findMat() {
 				let that = this
 				if (that.matnrId.length > 25){
@@ -269,6 +297,7 @@
 				}
 				let str = that.matnrId.split('-')
 				let matnr = str[0] + '-' + str[1]
+				// 妫�鏌ユ潯鐮佷腑闈炴暟瀛�
 				that.checkNum(str[2])
 				for (let k = 0; k < that.matList.length;k++) {
 					if (that.matList[k].matnr != matnr) {
@@ -278,9 +307,14 @@
 						return;
 					}
 				}
-				uni.showLoading();
+				let userName = uni.getStorageSync('HCuname')
+				let matCode = that.matnrId
+				// 寮�鍚壂鎻忔棩蹇�
+				that.addLog(matCode,userName)
+				// return;
+				// uni.showLoading();
 				uni.request({
-				    url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mat/auth',
+				    url: that.commonUrl + '/mat/auth',
 				    data: {
 						matnr:matnr
 				    },
@@ -345,23 +379,7 @@
 	/* @import "../../colorui/main.css";
 	@import "../../colorui/icon.css"; */
 	/* 
-	1101842-10000-220475159999
-	1101842-10000-22047518494
-	1101842-10000-22047518532
-	1101842-10000-2204751599A
-	1101842-12345-22047515990
-	1101842-10000-22047515997
-	1101842-10000-22047518515
-	1101842-10000-22047515778
-	1101842-10000-22047515938
-	1101842-10000-22047518518
-	1101842-10000-22047518517
-	1101842-10000-22047515967
-	1101842-10000-22047518472
-	1101842-10000-22047518516
-	1101842-10000-22047518511
-	1101842-10000-22047515864
-	1101842-10000-22047515889
+	
 	 */
 	.pop-btn {
 		position: absolute;

--
Gitblit v1.9.1