From c36b81234cff45a92a096a94e844041cc1a31f2a Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 07 十一月 2023 11:20:38 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 2 +-
/dev/null | 0
src/api/quality/rawMaterial.js | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/node_modules.7z b/node_modules.7z
deleted file mode 100644
index 621a7b5..0000000
--- a/node_modules.7z
+++ /dev/null
Binary files differ
diff --git a/src/api/quality/rawMaterial.js b/src/api/quality/rawMaterial.js
index f63dcd5..74c5001 100644
--- a/src/api/quality/rawMaterial.js
+++ b/src/api/quality/rawMaterial.js
@@ -10,7 +10,7 @@
export function selectDevice() {
return request({
- url: '/mes/qualityFinishedInsProduct/scope',
+ url: '/mes/rawInsProduct/selectDevice',
method: 'get',
})
}
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index add151c..400e09e 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -557,7 +557,7 @@
})
},
getDeviceList(){
- selectDevice(null).then(res=>{
+ selectDevice().then(res=>{
this.deviceList = res.data.data
})
},
--
Gitblit v1.9.3