From 69b5e98aa67f03e9559daba1ccd54155187e0d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Mon, 23 Oct 2023 13:53:20 +0800
Subject: [PATCH] =?UTF-8?q?2023-10-23=20=E8=AE=BE=E5=A4=87=E5=92=8C?=
=?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/qc/qc.js | 1 +
src/views/modules/qc/FAIResultEntry.vue | 36 ++++++++++++++++++------
src/views/modules/qc/FQCResultEntry.vue | 36 ++++++++++++++++++------
src/views/modules/qc/IPQCResultEntry.vue | 36 ++++++++++++++++++------
src/views/modules/qc/IQCResultEntry.vue | 35 +++++++++++++++++------
5 files changed, 108 insertions(+), 36 deletions(-)
diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js
index 2b7c8d9..6856383 100644
--- a/src/api/qc/qc.js
+++ b/src/api/qc/qc.js
@@ -144,6 +144,7 @@ export const checkIQCIsSubmit = data => createAPI(`/pms/qc/checkIQCIsSubmit`,'po
export const saveIQCSubDetailed = data => createAPI(`/pms/qc/saveIQCSubDetailed`,'post',data)
export const saveIQCSubmitResult = data => createAPI(`/pms/qc/saveIQCSubmitResult`,'post',data)
export const iqcRecordDelete = data => createAPI(`/pms/qc/iqcRecordDelete`,'post',data)
+export const disposalMeasuresSearch = data => createAPI(`/pms/qc/disposalMeasuresSearch`,'post',data)
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index f19f6f5..95c4d52 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -253,15 +253,21 @@
-
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -563,6 +569,7 @@
getPartInformation, // 获取物料信息
getSpecialOperationList, // 获取特殊工序列表
InspectionTypeSearch, // 搜索所有检验类型
+ disposalMeasuresSearch // 获取处置措施列表
} from "@/api/qc/qc.js";
import Chooselist from '@/views/modules/common/Chooselist_eam';
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js';
@@ -1224,7 +1231,8 @@
},
],
checked: false,
- typeOptions: []
+ typeOptions: [],
+ disposalMeasuresOptions: []
}
},
mounted () {
@@ -1236,8 +1244,18 @@
this.getDataList()
this.favoriteIsOk()
this.InspectionTypeSearch()
+ this.disposalMeasuresSearch()
},
methods: {
+ // 获取处置措施列表
+ disposalMeasuresSearch(){
+ disposalMeasuresSearch().then(({data}) => {
+ if (data.code === 0) {
+ this.disposalMeasuresOptions = data.rows
+ }
+ })
+ },
+
// 查询检验类型
InspectionTypeSearch(){
InspectionTypeSearch().then(({data}) => {
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 8ae0e32..189482c 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -251,15 +251,21 @@
-
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -561,6 +567,7 @@
getPartInformation, // 获取物料信息
getSpecialOperationList, // 获取特殊工序列表
InspectionTypeSearch, // 搜索所有检验类型
+ disposalMeasuresSearch // 获取处置措施列表
} from "@/api/qc/qc.js";
import Chooselist from '@/views/modules/common/Chooselist_eam';
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js';
@@ -1220,7 +1227,8 @@
},
],
checked: false,
- typeOptions: []
+ typeOptions: [],
+ disposalMeasuresOptions: []
}
},
mounted () {
@@ -1232,8 +1240,18 @@
this.getDataList()
this.favoriteIsOk()
this.InspectionTypeSearch()
+ this.disposalMeasuresSearch()
},
methods: {
+ // 获取处置措施列表
+ disposalMeasuresSearch(){
+ disposalMeasuresSearch().then(({data}) => {
+ if (data.code === 0) {
+ this.disposalMeasuresOptions = data.rows
+ }
+ })
+ },
+
// 查询检验类型
InspectionTypeSearch(){
InspectionTypeSearch().then(({data}) => {
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 7e99137..e2ca682 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -271,15 +271,21 @@
-
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -628,6 +634,7 @@
getPartInformation, // 获取物料信息
getSpecialOperationList, // 获取特殊工序列表
InspectionTypeSearch, // 搜索所有检验类型
+ disposalMeasuresSearch, // 获取处置措施列表
getOrderNoList // 查询工单列表
} from "@/api/qc/qc.js";
import Chooselist from '@/views/modules/common/Chooselist_eam';
@@ -1321,7 +1328,8 @@
},
],
checked: false,
- typeOptions: []
+ typeOptions: [],
+ disposalMeasuresOptions: []
// orderNoData:{
// limit: 10,
// page: 1,
@@ -1342,8 +1350,18 @@
this.getDataList()
this.favoriteIsOk()
this.InspectionTypeSearch()
+ this.disposalMeasuresSearch()
},
methods: {
+ // 获取处置措施列表
+ disposalMeasuresSearch(){
+ disposalMeasuresSearch().then(({data}) => {
+ if (data.code === 0) {
+ this.disposalMeasuresOptions = data.rows
+ }
+ })
+ },
+
// 查询检验类型
InspectionTypeSearch(){
InspectionTypeSearch().then(({data}) => {
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 6934272..ef947a3 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -149,15 +149,21 @@
-
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -388,6 +394,7 @@
saveIQCSubDetailed, // 新增子明细信息
saveIQCSubmitResult, // 审核
iqcRecordDelete, // 删除检验记录
+ disposalMeasuresSearch // 获取处置措施列表
} from "@/api/qc/qc.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js';
@@ -906,7 +913,8 @@
samplingLocation: '',
samplingLocationB: '',
samplingNumber: ''
- }
+ },
+ disposalMeasuresOptions: []
}
},
mounted () {
@@ -917,8 +925,17 @@
created () {
this.getDataList()
this.favoriteIsOk()
+ this.disposalMeasuresSearch()
},
methods: {
+ // 获取处置措施列表
+ disposalMeasuresSearch(){
+ disposalMeasuresSearch().then(({data}) => {
+ if (data.code === 0) {
+ this.disposalMeasuresOptions = data.rows
+ }
+ })
+ },
selectFlag(){
return true;
},