From b6a39ff20f53f1595e101abcc5b7e193c1121b8b Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 08 十月 2024 15:28:21 +0800
Subject: [PATCH] 3

---
 pages/pakin/stocktaking.vue  |   24 +
 pages.json                   |    9 
 pages/pakin/confirmPakin.vue |  689 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 719 insertions(+), 3 deletions(-)

diff --git a/pages.json b/pages.json
index f570b4f..e2f68c5 100644
--- a/pages.json
+++ b/pages.json
@@ -268,6 +268,15 @@
         		"navigationBarTitleText" : "骞舵澘缁勬墭"
         	}
         }
+        ,{
+            "path" : "pages/pakin/confirmPakin",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "鐩樼偣",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/pakin/confirmPakin.vue b/pages/pakin/confirmPakin.vue
new file mode 100644
index 0000000..86ccc4b
--- /dev/null
+++ b/pages/pakin/confirmPakin.vue
@@ -0,0 +1,689 @@
+<template>
+	<view>
+		<view class="code">
+			<view class="item">
+				<view class="code-decs">鎵樼洏鐮�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
+					@input="barcodeInput()">
+			</view>
+			<view class="item">
+				<view class="code-decs">鐮佸灈浣�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="bomCode" :focus="bomCodeFocus"
+					@confirm="bomInput()">
+			</view>
+			<view class="item">
+				<view class="code-decs">鐗╂枡鐮�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="analysis()">
+				<view class="item-right">
+					<!-- <button></button>
+					<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
+					<uni-icons type="right" color="#c1c1c1"></uni-icons> -->
+				</view>
+			</view>
+		</view>
+		<view class="mat-list-title">
+			鍟嗗搧鍒楄〃
+		</view>
+		<scroll-view>
+			<view class="list" v-for="(item,i) in dataList" :key="i">
+				<view class="list-left">
+					<view style="display: flex; flex-wrap: wrap;color: #3a3a3a;">
+						<view style="margin-right: 20rpx;">
+							<text style="font-weight: 600;">鍖呰缁勫彿:</text>
+							<text>{{item.packageGroupNo}}</text>
+						</view>
+						<view style="margin-right: 20rpx;">
+							<text style="font-weight: 600;">鏈ㄧ绫诲瀷:</text>
+							<text>{{item.boxType}}</text>
+						</view>
+						<view style="margin-right: 20rpx;">
+							<text style="font-weight: 600;">绠¤姱绫诲瀷:</text>
+							<text>{{item.rollType}}</text>
+						</view>
+						<view style="margin-right: 20rpx;">
+							<text style="font-weight: 600;">瀹藉箙:</text>
+							<text>{{item.wideInWidth}}</text>
+						</view>
+						<view style="margin-right: 20rpx;">
+							<text style="font-weight: 600;">鐢熺當鍘氬害:</text>
+							<text>{{item.thickness}}</text>
+						</view>
+						<view style="margin-right: 20rpx;">
+							<text style="font-weight: 600;">鍗峰彿:</text>
+							<text>{{item.rollNo}}</text>
+						</view>
+						<view style="margin-right: 20rpx;">
+							<text style="font-weight: 600;">绠卞彿:</text>
+							<text>{{item.boxNo}}</text>
+						</view>
+						<view style="margin-right: 20rpx;">
+							<text style="font-weight: 600;">瑙勬牸:</text>
+							<text>{{item.specs}}</text>
+						</view>
+						<view style="margin-right: 20rpx;">
+							<text style="font-weight: 600;">闀垮害:</text>
+							<text>{{item.length}}</text>
+						</view>
+						<view style="margin-right: 20rpx;">
+							<text style="font-weight: 600;">鎺ュご:</text>
+							<text>{{item.splices}}</text>
+						</view>
+						<view style="margin-right: 20rpx;">
+							<text style="font-weight: 600;">鍑�閲�:</text>
+							<text>{{item.netWeight}}</text>
+						</view>
+						<view style="margin-right: 20rpx;">
+							<text style="font-weight: 600;">姣涢噸:</text>
+							<text>{{item.grossWeight}}</text>
+						</view>
+						<view style="margin-right: 20rpx;">
+							<text style="font-weight: 600;">鍒嗗垏涓嬫枡鏃堕棿:</text>
+							<text>{{item.fqTime}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+		<view class="buttom">
+			<button size="mini" @click="reset('warn')">閲嶇疆</button>
+			<button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+		</view>
+		<!-- 寮圭獥 -->
+		<!-- 淇敼鏁伴噺 -->
+		<view>
+			<uni-popup ref="revise" type="dialog">
+				<view class="popup">
+					<!-- 鏍囬 -->
+					<view class="title">淇敼</view>
+					<view class="popup-item">
+						<view class="popup-item-left">缂栫爜:</view>
+						<view class="popup-item-right">
+							<input type="text" v-model="matnr" disabled="true"
+								style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
+						</view>
+					</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 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" :step='1' :max="maxAn" color="#747474" @change="changeValue" />
+						</view>
+					</view>
+					<view class="btn">
+						<view class="btn-left" @click="reviseClose">鍙栨秷</view>
+						<view class="btn-right" @click="reviseConfirm()">淇敼</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		<!-- 绉婚櫎纭 -->
+		<view>
+			<!-- 鎻愮ず绐楃ず渚� -->
+			<uni-popup ref="alertDialog" type="dialog">
+				<uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
+					@confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+		<view>
+			<!-- 鎻愮ず淇℃伅寮圭獥 -->
+			<uni-popup ref="message" type="message">
+				<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
+			</uni-popup>
+		</view>
+		<!-- 纭缁勬墭 -->
+		<view>
+			<uni-popup ref="combConfirm" type="dialog">
+				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+					@confirm="comb" @close="combClose"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+		<!-- 纭閲嶇疆 -->
+		<view>
+			<uni-popup ref="resetConfirm" type="dialog">
+				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+					@confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				baseUrl: '',
+				token: '',
+				barcode: '',
+				dataList: [],
+				count: 0,
+				rowNum: '',
+				matnr: '',
+				batch: '',
+				weight: '',
+				msgType1: 'success',
+				msgType: 'success',
+				messageText: '',
+				title: '',
+				content: '',
+				barcodeFocus: true,
+				matFocus: false,
+				matData: '',
+				removeNum: 0,
+				bomCode: '',
+				bomCodeFocus: false,
+				maxAn: 0,
+				
+			}
+		},
+		onLoad() {
+
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+		},
+		methods: {
+			// 瑙f瀽浜岀淮鐮�
+			analysis() {
+				let _this = this
+				var matObj= {
+					packageGroupNo: '', // 鍖呰缁勫彿
+					boxType: '', // 鏈ㄧ绫诲瀷
+					rollType: '', // 绠¤姱绫诲瀷
+					wideInWidth: '', // 瀹炴祴瀹藉箙
+					thickness: '', // 鐢熺當鍘氬害
+					rollNo: '', // 鍗峰彿
+					boxNo: '', // 绠卞彿
+					specs: '', // 瑙勬牸
+					length: '', // 闀垮害
+					splices: '', // 鎺ュご 涓�
+					netWeight: '', // 鍑�閲�
+					grossWeight: '', // 姣涢噸 
+					fqTime: '', // 鍒嗗垏涓嬫枡鏃堕棿
+				}
+				// 鍒涘缓涓�涓� Map 瀵硅薄
+				const resultMap = new Map();
+				
+				// 浣跨敤鎹㈣绗︿綔涓哄垎闅旂鍒嗗壊瀛楃涓�
+				const lines = this.matnr.split(' ');
+				console.log(lines);
+				lines.forEach(line => {
+				    // 浣跨敤涓枃鍐掑彿浣滀负鍒嗛殧绗�
+				    const match = line.split('锛�');
+				    if (match.length === 2) {
+				        const key = match[0].trim(); // 涓枃閮ㄥ垎浣滀负閿�
+				        const value = match[1].trim(); // 鍚庨潰鐨勫瓧绗︿覆浣滀负鍊�
+				        resultMap.set(key, value); // 灏嗛敭鍊煎瀛樺叆 Map
+				    }
+				});
+				
+				// 杈撳嚭缁撴灉
+				console.log(resultMap);
+				
+				
+				
+				// 濡傛灉闇�瑕佸皢 Map 杞崲涓烘櫘閫氬璞�
+				const resultObject = Object.fromEntries(resultMap);
+				console.log(resultObject.鍑�閲�);
+				console.log(lines);
+				console.log();
+				matObj.packageGroupNo = resultObject.鍖呰缁勫彿
+				matObj.boxType = resultObject.鏈ㄧ绫诲瀷
+				matObj.rollType = resultObject.绠¤姱绫诲瀷
+				matObj.wideInWidth = resultObject.瑙勬牸.split('围')[0]
+				matObj.thickness = resultObject.瑙勬牸.split('围')[1]
+			
+				matObj.rollNo = resultObject.鍗峰彿
+				matObj.boxNo = resultObject.绠卞彿
+				matObj.specs = resultObject.瑙勬牸
+				matObj.length = resultObject.闀垮害
+				matObj.splices = resultObject.鎺ュご
+				matObj.netWeight = resultObject.鍑�閲�
+				matObj.grossWeight = resultObject.姣涢噸
+				matObj.fqTime = resultObject.鍒嗗垏涓嬫枡鏃堕棿
+				
+				console.log(this.dataList);
+				this.checkMatObj(matObj)
+				this.barcodeFocus = false;
+				this.matFocus = false;
+				setTimeout(() => {
+					this.matnr = '';
+					this.matFocus = true;
+				}, 100);
+			},
+			checkMatObj(mat) {
+				var len = this.dataList.length
+				var add = true 
+				for	(let k of this.dataList) {
+					if (mat.boxNo == k.boxNo) {
+						add = false
+					}
+				}
+				if (add) {
+					this.dataList.unshift(mat)
+				}
+			},
+			messageToggle(type) {
+				this.msgType1 = type
+				this.$refs.message.open()
+			},
+			bomInput() {
+				setTimeout(() => {
+					this.focuss()
+				}, 200)
+			},
+			bomFocuss() {
+				let that = this;
+				that.bomCodeFocus = false;
+				setTimeout(() => {
+					that.bomCode = '';
+					that.bomCodeFocus = true;
+				}, 100);
+			},
+			// barcode input 浜嬩欢
+			barcodeInput() {
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				setTimeout(() => {
+					var len = this.barcode.length
+					if (len != 8) {
+						uni.showToast({
+							title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+							icon: "none",
+							position: 'top'
+						});
+						this.barcodeFocuss()
+						return;
+					}
+					this.bomFocuss()
+				}, 200)
+			},
+			// 鎵樼洏鐮佹湁璇噸缃�
+			barcodeFocuss() {
+				let that = this;
+				that.barcodeFocus = false;
+				setTimeout(() => {
+					that.barcode = '';
+					that.barcodeFocus = true;
+				}, 100);
+			},
+			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
+			focuss() {
+				this.bomCodeFocus = false;
+				this.matFocus = false;
+				setTimeout(() => {
+					this.matnr = '';
+					this.matFocus = true;
+				}, 100);
+			},
+			// 妫�楠屽綋鍓嶇墿鏂欐槸鍚︽槸鍦ㄥ綋鍓岯om琛ㄤ腑
+			checkBom() {
+				let _this = this
+				uni.request({
+					url: _this.baseUrl + '/mobile/comb/checkBom',
+					data: JSON.stringify({
+						bomCode: _this.bomCode,
+						matnr: _this.matnr
+					}),
+					method: 'POST',
+					header: { 'token': uni.getStorageSync('token') },
+					success(res) {
+						// console.log(res);
+						res = res.data
+						if (res.code === 200) {
+							if (res.data) {
+								_this.maxAnfme = res.data.zpalletAnfme
+								_this.findMat()
+							} else {
+								_this.findMat()
+							}
+						} else if (res.code == 403) {
+							uni.showToast({
+								title: res.msg,
+								icon: "none",
+								position: 'top'
+							})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							_this.matnr = ''
+							uni.showToast({
+								title: res.msg,
+								icon: "none",
+								position: 'top'
+							})
+						}
+						
+					}
+				})
+			},
+			// 鎼滅储鐗╂枡
+			findMat() {
+				let that = this
+				uni.request({
+					url: that.baseUrl + '/mat/auth',
+					data: {
+						matnr: that.matnr
+					},
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					success(result) {
+						result = result.data
+						if (result.code === 200 && result.data) {
+							that.matData = result.data
+							that.matnr = ''
+							that.matData['batch'] = ''
+							if (that.maxAnfme > 0) {
+								that.matData['maxNum'] = that.maxAnfme
+							} else if (that.maxAnfme == 0){
+								that.matData['maxNum'] = 0
+							}
+							uni.navigateTo({
+								url: "../mat/matSelected",
+								// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+								success: function(res) {
+									res.eventChannel.emit('mat', {
+										data: result.data
+									})
+								},
+								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+								events: {
+									matList: function(data) {
+										that.checkMat(data.data)
+										that.focuss()
+									},
+								},
+							});
+						} else if (result.code == 403) {
+							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'
+							})
+						}
+
+					}
+				});
+
+			},
+			selectMat() {
+				let that = this
+				uni.navigateTo({
+					url: "../mat/matQuery",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('commonUrl', {
+							commonUrl: ''
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							that.matnr = data.data
+							that.findMat(that.matnr)
+						},
+					},
+
+
+				});
+				that.matnr = ''
+			},
+			checkMat(mat) {
+				var len = this.dataList.length
+				var add = true ,sameItem = false
+				for (var i = 0; i < len; i++) {
+					if (mat.matnr == this.dataList[i].matnr) {
+						for (var j = 0; j < len; j++) {
+							if (mat.batch == this.dataList[j].batch) {
+								sameItem = true
+							}
+						}
+						// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿  鏂板姞鍒楄〃
+						if (mat.batch != this.dataList[i].batch) {
+							this.$forceUpdate() // 寮哄埗鍒锋柊
+							if (sameItem) {
+								add = false
+							} else {
+								add = true
+							}
+							
+						} else {
+							// 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+							
+							if (this.maxAnfme) {
+								this.dataList[i].anfme = this.maxAnfme
+							} else {
+								this.dataList[i].anfme += mat.anfme
+							}
+							this.$forceUpdate() // 寮哄埗鍒锋柊
+							add = false
+						}
+					}
+				}
+				if (add) {
+					if (this.maxAnfme) {
+						mat['maxAnfme'] = this.maxAnfme
+						mat.anfme = this.maxAnfme
+					}
+					this.dataList.unshift(mat)
+				}
+				this.$forceUpdate() // 寮哄埗鍒锋柊
+				this.maxAnfme = ''
+			},
+			// 淇敼鎵瑰彿
+			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.maxAn = this.dataList[i].maxNum
+				this.rowNum = i
+				this.eject()
+			},
+			eject(type) {
+				this.type = type
+				this.$refs.revise.open(type)
+			},
+			// 鍒楄〃绉婚櫎鎸夐挳
+			remove(item, i, type) {
+				this.removeNum  = i
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
+				this.$refs.alertDialog.open(i)
+			},
+			// 纭绉婚櫎
+			removeConfirm() {
+				this.messageText = "绉婚櫎鎴愬姛"
+				this.messageToggle('success')
+				this.dataList.splice(this.removeNum, 1)
+			},
+			// 鍙栨秷绉婚櫎
+			removeClose() {
+				this.$refs.alertDialog.close()
+			},
+			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()
+			},
+			reviseClose() {
+				this.$refs.revise.close()
+			},
+			changeValue(value) {
+				this.count = value
+			},
+			combConfirm(type) {
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁鐜板湪缁勬墭!'
+				this.$refs.combConfirm.open()
+			},
+			combClose() {
+				this.$refs.combConfirm.close()
+			},
+			comb() {
+				uni.vibrateShort();
+				let that = this;
+				if (that.barcode === '') {
+					this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+					this.messageToggle('error')
+					return;
+				}
+				if (that.dataList.length === 0) {
+					this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
+					this.messageToggle('error')
+					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')
+						return;
+					}
+				}
+				uni.request({
+					url: that.baseUrl + '/mobile/pdtz/auth',
+					data: JSON.stringify({
+						palletizingNo: that.bomCode,
+						barcode: that.barcode,
+						matList: that.dataList
+					}),
+					method: 'POST',
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							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')
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							that.messageText = res.msg
+							that.messageToggle('error')
+						}
+					}
+				});
+			},
+			reset(type) {
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁閲嶇疆!'
+				this.$refs.resetConfirm.open()
+			},
+			// 纭閲嶇疆
+			resetConfirm() {
+				this.dataList = []
+				this.barcode = ''
+				this.bomCode = ''
+				this.messageText = "閲嶇疆瀹屾垚"
+				this.messageToggle('success')
+				this.bomFocuss()
+			},
+			// 鍙栨秷閲嶇疆
+			resetClose() {
+
+			},
+			// 娓呯┖
+			resst() {
+				this.dataList = []
+				this.barcode = ''
+				this.bomCode = ''
+				this.bomFocuss()
+			},
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+
+	.code {
+		width: 100%;
+		position: fixed;
+		min-height: 200rpx;
+		background-color: #FFF;
+		z-index: 10;
+	}
+
+	.item {
+		display: flex;
+		align-items: center;
+		height: 70rpx;
+		margin-left: 20rpx;
+		border-bottom: 1px solid #DCDFE6;
+	}
+
+	.item input {
+		height: 50rpx;
+		line-height: 50rpx;
+		/* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
+		font-size: 36upx;
+		font-family: PingFang SC;
+		width: 55vw;
+
+	}
+
+	.code-decs {
+		width: 20vw;
+		font-size: 18px;
+		color: #303133;
+	}
+
+	.item-right {
+		margin-left: auto;
+		margin-right: 20rpx;
+	}
+
+	.mat-list-title {
+		height: 80rpx;
+		line-height: 80rpx;
+		width: 100%;
+		background-color: white;
+		position: fixed;
+		margin-top: 200rpx;
+		z-index: 9;
+		/* border-top: 1px solid #DCDFE6; */
+		text-align: center;
+		box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
+	}
+</style>
+
diff --git a/pages/pakin/stocktaking.vue b/pages/pakin/stocktaking.vue
index a43256d..b061d1b 100644
--- a/pages/pakin/stocktaking.vue
+++ b/pages/pakin/stocktaking.vue
@@ -359,9 +359,6 @@
 							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')
@@ -371,12 +368,33 @@
 								});
 							}, 1000);
 						} else {
+							that.goto()
 							that.messageText = res.msg
 							that.messageToggle('error')
 						}
 					}
 				});
 			},
+			// 璺宠浆椤甸潰
+			goto() {
+				let _this = this
+				uni.navigateTo({
+					url: './confirmPakin',
+					success(res) {
+						res.eventChannel.emit('item', {
+							item: item,
+						}),
+						res.eventChannel.emit('type', {
+							type: "bcp"
+						})
+					},
+					events: {
+						acceptDataFromOpenedPage: function(data) {
+							_this.getOrderDetlList(this.searchValue1,10)
+						}
+					}
+				})
+			},
 			reset(type) {
 				this.msgType = type
 				this.title = '璀﹀憡'

--
Gitblit v1.9.1