From 4b84492a942504698dc50423947b9b7db43bc2b6 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 十二月 2023 00:22:00 +0800
Subject: [PATCH] modified: src/views/common/qrCodeApp.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 6 +++++-
src/views/common/qrCodeApp.vue | 2 ++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/views/common/qrCodeApp.vue b/src/views/common/qrCodeApp.vue
index b3c1f61..f0bada3 100644
--- a/src/views/common/qrCodeApp.vue
+++ b/src/views/common/qrCodeApp.vue
@@ -41,6 +41,8 @@
onDecode(result) {
console.log(result);
if (result !== "") {
+ this.result=result
+ this.$emit("ok",result)
alert(result)
}
},
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 3011021..b56aae4 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -271,7 +271,7 @@
:visible.sync="qrcode"
width="60%">
<div style="height: 100vh;width: 100%;">
- <qr-code-app ref="codeCompont" @cancelCodeDialog="cancelCodeDialog"></qr-code-app>
+ <qr-code-app ref="codeCompont" @ok="getResultInfo" @cancelCodeDialog="cancelCodeDialog"></qr-code-app>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="qrcode = false">鍙� 娑�</el-button>
@@ -372,6 +372,10 @@
},
},
methods:{
+ getResultInfo(data){
+ // console.log("杩斿洖");
+ console.log("鎵弿鍑虹殑浜岀淮鐮佸��",data);
+ },
cancelCodeDialog(){
this.qrcode = false
},
--
Gitblit v1.9.3