From 36677084aa359a96e07d694aac554a1daa003bb6 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 十二月 2023 10:12:05 +0800
Subject: [PATCH] modified: src/views/common/qrCodeApp.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue modified: vue.config.js
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 9 ++++++---
vue.config.js | 2 +-
src/views/common/qrCodeApp.vue | 5 +++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/views/common/qrCodeApp.vue b/src/views/common/qrCodeApp.vue
index f0bada3..ef13928 100644
--- a/src/views/common/qrCodeApp.vue
+++ b/src/views/common/qrCodeApp.vue
@@ -42,8 +42,9 @@
console.log(result);
if (result !== "") {
this.result=result
- this.$emit("ok",result)
- alert(result)
+ this.$emit("ok",this.result)
+ this.cancelCode()
+ // alert(result)
}
},
// 鐩告満鍙嶈浆
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index b56aae4..fc8c19e 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -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 {
@@ -373,8 +373,11 @@
},
methods:{
getResultInfo(data){
- // console.log("杩斿洖");
- console.log("鎵弿鍑虹殑浜岀淮鐮佸��",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
diff --git a/vue.config.js b/vue.config.js
index bc6b653..15bb96d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,7 +5,7 @@
// const url = 'http://192.168.2.7:9999'
-const url = 'http://192.168.32.45:9999'
+const url = 'http://localhost:9999'
//const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
--
Gitblit v1.9.3