From f9e93380e5192b35943769950c698c50b86febb6 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 13 九月 2024 08:41:21 +0800
Subject: [PATCH] #

---
 pages/pakin/pakin.vue |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 3dfc74b..ff6b206 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -8,7 +8,7 @@
 			</view>
 			<view class="item">
 				<view class="code-decs">鍝佺暘浜岀淮鐮�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()" maxlength="600">
 			</view>
 		</view>
 		<view class="mat-list-title">
@@ -61,7 +61,7 @@
 		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
 		<view class="buttom">
 			<button size="mini" @click="reset('warn')">閲嶇疆</button>
-			<button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+			<button size="mini" type="primary" @click="comb()">缁勬墭</button>
 		</view>
 		<!-- 寮圭獥 -->
 		<!-- 淇敼鏁伴噺 -->
@@ -130,6 +130,8 @@
 </template>
 
 <script>
+	import {setCurrentDeviceAction} from '../../static/js/PresetsPda.js'
+	import {initScan,startScan,stopScan} from '../../static/js/scanModule.js'
 	export default {
 		data() {
 			return {
@@ -186,6 +188,7 @@
 			// 鎵樼洏鐮佹湁璇噸缃�
 			barcodeFocuss() {
 				let that = this;
+				this.matFocus = false;
 				that.barcodeFocus = false;
 				setTimeout(() => {
 					that.barcode = '';
@@ -194,7 +197,7 @@
 			},
 			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
 			focuss() {
-				this.focus = false;
+				this.matFocus = false;
 				setTimeout(() => {
 					this.matnr = '';
 					this.matFocus = true;
@@ -202,11 +205,32 @@
 			},
 			// 鎼滅储鐗╂枡
 			findMat() {
-				let that = this
+				let _this = this
+				initScan();
+				startScan();
 				let item = {}
-				item['threeCode'] = that.matnr
-				this.dataList.unshift(item)
-				this.focuss()
+				uni.$on("SCAN_CODE", ({code}) => {
+					console.log(code);
+					item['threeCode'] = code
+					if (_this.dataList.length > 0) {
+						let add = false
+						for	(let k of _this.dataList) {
+							if (code == k.threeCode) {
+								add = false
+							} else {
+								add = true
+							}
+						}
+						if (add) {
+							_this.dataList.unshift(item)
+						}
+					} else {
+						_this.dataList.unshift(item)
+					}
+					_this.focuss()
+					// code灏辨槸鎵爜鐨勭粨鏋� 鎺ヤ笅鏉ュ啓涓氬姟闇�姹�
+				});
+				
 			},
 			selectMat() {
 				let that = this
@@ -379,8 +403,10 @@
 			// 纭閲嶇疆
 			resetConfirm() {
 				this.dataList = []
+				this.barcode = ''
 				this.messageText = "閲嶇疆瀹屾垚"
 				this.messageToggle('success')
+				this.barcodeFocuss()
 			},
 			// 鍙栨秷閲嶇疆
 			resetClose() {
@@ -427,7 +453,7 @@
 
 	.code-decs {
 		width: 20vw;
-		font-size: 18px;
+		font-size: 14px;
 		color: #303133;
 	}
 
@@ -448,4 +474,4 @@
 		text-align: center;
 		box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
 	}
-</style>
+</style>
\ No newline at end of file

--
Gitblit v1.9.1