From 2e403b0ffa43b5411161d86b9c041acfb02831a1 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 15 十二月 2023 09:51:47 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
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