From 70e0056c0c08ca0033e87e1dfd1c773dcdd0143f Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 08 二月 2025 13:56:40 +0800
Subject: [PATCH] #

---
 pages/order/zlOrderPakin.vue |  119 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 62 insertions(+), 57 deletions(-)

diff --git a/pages/order/zlOrderPakin.vue b/pages/order/zlOrderPakin.vue
index e5f5e7a..eb010d0 100644
--- a/pages/order/zlOrderPakin.vue
+++ b/pages/order/zlOrderPakin.vue
@@ -1,5 +1,19 @@
 <template>
 	<view>
+		<view class="status_bar">
+			<!-- 杩欓噷鏄姸鎬佹爮 -->
+		</view>
+		<uni-nav-bar left-icon="left" background-color="#f8f8f8" title="鍒朵护鍏ュ簱" @clickLeft="back"  :fixed="true"
+			:border="false" rightWidth="160rpx" leftWidth="160rpx"
+			>
+			<block slot="right">
+				<view class="city">
+					<view>
+						<text class="uni-nav-bar-text">{{store}}</text>
+					</view>
+				</view>
+			</block>
+		 </uni-nav-bar>
 		<view class="code">
 			<view class="item">
 				<view class="code-decs">鍒朵护鍙�:</view>
@@ -14,6 +28,7 @@
 			<view class="item">
 				<view class="code-decs">鐗╂枡鐮�:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="checkBom()">
+				<uni-icons type="close" color="#c1c1c1" @click="clearMatnr"></uni-icons>
 				<view class="item-right">
 					<button></button>
 					<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
@@ -160,6 +175,8 @@
 			return {
 				baseUrl: '',
 				token: '',
+				storeId: 0,
+				store: '',
 				barcode: '',
 				dataList: [],
 				count: 0,
@@ -179,8 +196,8 @@
 				bomCode: '',
 				bomCodeFocus: true,
 				maxAn: 0,
-				ck1: true,
-				ck2: false,
+				ck1: false,
+				ck2: true,
 				fullPlt: 'N',
 				decrees_a: {
 					locNo: '',
@@ -191,16 +208,28 @@
 			}
 		},
 		onLoad() {
-
+			// this.dataList = uni.getStorageSync('zlPakinDataList')
+			// if (this.dataList === '') {
+			// 	this.dataList = []
+			// }
 		},
 		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
-			// setTimeout(()=>{
-			// 	this.$refs.decrees.open('center')
-			// },300)
+			this.storeId = uni.getStorageSync('store')
+			if (this.storeId == 1) {
+				this.store = '瀹佹尝浠�'
+			}
+			if (this.storeId == 2) {
+				this.store = '鏂版槍浠�'
+			}
 		},
 		methods: {
+			back() { uni.navigateBack({}) },
+			clearMatnr() {
+				// this.matnr = ''
+				this.focuss()
+			},
 			// 鏄惁婊℃澘
 			isFullPlt() {
 				var temp = this.ck1
@@ -235,11 +264,7 @@
 				setTimeout(() => {
 					var len = this.barcode.length
 					if (len != 8) {
-						uni.showToast({
-							title: '鎵樼洏鐮佹湁璇閲嶈瘯',
-							icon: "none",
-							position: 'top'
-						});
+						uni.showToast({ title: '鎵樼洏鐮佹湁璇閲嶈瘯', icon: "none", position: 'top' });
 						this.barcodeFocuss()
 						return;
 					}
@@ -265,7 +290,7 @@
 				}, 100);
 			},
 			// 妫�楠屽綋鍓嶇墿鏂欐槸鍚︽槸鍦ㄥ綋鍓岯om琛ㄤ腑
-			checkBom() {
+			checkBom(mat) {
 				let _this = this
 				uni.request({
 					url: _this.baseUrl + '/mobile/pda/decrees/check',
@@ -273,7 +298,7 @@
 					method: 'POST',
 					header: { 
 						'token': uni.getStorageSync('token'),
-						 'content-type' : 'application/x-www-form-urlencoded'
+						'content-type' : 'application/x-www-form-urlencoded'
 					},
 					success(res) {
 						// console.log(res);
@@ -281,7 +306,8 @@
 						if (res.code === 200) {
 							switch(res.data.status) {
 								case 1:
-									_this.findMat()
+									// _this.findMat()
+									_this.checkMat(mat)
 									break;
 								case 2:
 									// 鐩稿悓鍒朵护璐х墿琛ヨ揣
@@ -326,12 +352,8 @@
 				let that = this
 				uni.request({
 					url: that.baseUrl + '/mat/auth',
-					data: {
-						matnr: that.matnr
-					},
-					header: {
-						'token': uni.getStorageSync('token')
-					},
+					data: { matnr: that.matnr },
+					header: { 'token': uni.getStorageSync('token') },
 					success(result) {
 						result = result.data
 						if (result.code === 200 && result.data) {
@@ -360,22 +382,12 @@
 								},
 							});
 						} 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'
-								});
+								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' })
 						}
 
 					}
@@ -385,7 +397,7 @@
 			selectMat() {
 				let that = this
 				uni.navigateTo({
-					url: "../mat/matQuery",
+					url: "../mat/matQueryByOrder",
 					success: function(res) {
 						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
 						res.eventChannel.emit('commonUrl', {
@@ -395,12 +407,10 @@
 					events: {
 						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
 						acceptDataFromOpenedPage: function(data) {
-							that.matnr = data.data
-							that.checkBom(that.matnr)
+							that.matnr = data.data.matnr
+							that.checkBom(data.data)
 						},
 					},
-
-
 				});
 				that.matnr = ''
 			},
@@ -445,6 +455,7 @@
 				}
 				this.$forceUpdate() // 寮哄埗鍒锋柊
 				this.maxAnfme = ''
+				uni.setStorageSync('zlPakinDataList', this.dataList);
 			},
 			// 淇敼鎵瑰彿
 			revise(item, i) {
@@ -470,8 +481,7 @@
 			},
 			// 纭绉婚櫎
 			removeConfirm() {
-				this.messageText = "绉婚櫎鎴愬姛"
-				this.messageToggle('success')
+				uni.showToast({ title: "绉婚櫎鎴愬姛", icon: "success", position: 'top' })
 				this.dataList.splice(this.removeNum, 1)
 			},
 			// 鍙栨秷绉婚櫎
@@ -483,8 +493,7 @@
 				this.dataList[this.rowNum].batch = this.batch
 				this.dataList[this.rowNum].weight = this.weight
 				this.matnr = ''
-				this.messageText = "淇敼鎴愬姛"
-				this.messageToggle('success')
+				uni.showToast({ title: "淇敼鎴愬姛", icon: "success", position: 'top' })
 				this.$refs.revise.close()
 			},
 			reviseClose() {
@@ -513,19 +522,16 @@
 				uni.vibrateShort();
 				let that = this;
 				if (that.barcode === '') {
-					this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
-					this.messageToggle('error')
+					uni.showToast({ title: "璇锋壂鎻忔墭鐩樻潯鐮�", icon: "error", position: 'top' })
 					return;
 				}
 				if (that.dataList.length === 0) {
-					this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
-					this.messageToggle('error')
+					uni.showToast({ title: "璇锋坊鍔犲晢鍝佸垪琛�", icon: "error", position: 'top' })
 					return;
 				}
 				for (var i = 0; i < that.dataList.length; i++) {
 					if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
-						this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
-						this.messageToggle('error')
+						uni.showToast({ title: "缁勬墭鏁伴噺涓嶈兘涓�0", icon: "error", position: 'top' })
 						return;
 					}
 				}
@@ -533,6 +539,7 @@
 					url: that.baseUrl + '/mobile/comb/auth',
 					data: JSON.stringify({
 						fullPlt: that.fullPlt,
+						owner: that.storeId,
 						barcode: that.barcode,
 						combMats: that.dataList
 					}),
@@ -549,17 +556,16 @@
 							const innerAudioContext = uni.createInnerAudioContext();
 							innerAudioContext.src = '/static/music/pakinOk.mp3';
 							innerAudioContext.play()
+							that.dataList = []
+							uni.setStorageSync('zlPakinDataList', that.dataList);
+							uni.showToast({ title: '缁勬墭鎴愬姛', icon: "success", position: 'top' })
 						} else if (res.code == 403) {
-							that.messageText = res.msg
-							that.messageToggle('error')
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 							setTimeout(() => {
-								uni.reLaunch({
-									url: '../login/login'
-								});
+								uni.reLaunch({ url: '../login/login' });
 							}, 1000);
 						} else {
-							that.messageText = res.msg
-							that.messageToggle('error')
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
 					}
 				});
@@ -575,8 +581,7 @@
 				this.dataList = []
 				this.barcode = ''
 				this.bomCode = ''
-				this.messageText = "閲嶇疆瀹屾垚"
-				this.messageToggle('success')
+				uni.showToast({ title: "閲嶇疆瀹屾垚", icon: "success", position: 'top' })
 				this.bomFocuss()
 			},
 			// 鍙栨秷閲嶇疆

--
Gitblit v1.9.1