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 | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 15ee4a6..ff6b206 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -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 {
@@ -203,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
--
Gitblit v1.9.1