From 84f5a65d6c7138ab6ba78c14d90c0e35bf3e121a Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 十二月 2023 10:46:21 +0800
Subject: [PATCH] modified: src/views/common/rawMaterial-part.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 3011021..170a926 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 {
@@ -345,7 +345,9 @@
userName: '',
testState: ''
}],
- dataRule: {},
+ dataRule: {
+ code:[{ required: true, message: '璇锋壂鎻忛�夋嫨闆朵欢', trigger: 'blur' }]
+ },
deviceList: [],
}
},
@@ -372,6 +374,13 @@
},
},
methods:{
+ getResultInfo(data){
+ console.log("鎵弿鍚庢墽琛�");
+ 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