From ad2437550eb0c8f3c3c8736df1a38a713f920ec2 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 十二月 2023 10:13:40 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 3011021..fc8c19e 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>
@@ -288,7 +288,7 @@
getObj,
updateRawInsProduct,
updateRawInspectsById,
- updateDeviceById, } from '@/api/quality/rawMaterial'
+ updateDeviceById, chooseIFS} from '@/api/quality/rawMaterial'
import rawMaterialPartDialog from '@/views/common/rawMaterial-part'
import qrCodeApp from '@/views/common/qrCodeApp'
export default {
@@ -372,6 +372,13 @@
},
},
methods:{
+ getResultInfo(data){
+ console.log("鎵弿鍑虹殑浜岀淮鐮佸��",JSON.stringify(data));
+ let obj=JSON.parse(data)
+ let info={"code":obj["part_no"]}
+ this.paramObj = info
+ this.showPart = true
+ },
cancelCodeDialog(){
this.qrcode = false
},
--
Gitblit v1.9.3