From b53e821a17c8d3700bedf31a533a3574510fe098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Wed, 3 Sep 2025 13:41:44 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=A3=80=E9=AA=8C=E5=8D=95=E4=B8=AD=20?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A3=80=E9=AA=8C=E7=BB=93=E8=AE=BA=EF=BC=8C?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=A4=84=E7=BD=AE=E6=8E=AA=E6=96=BD=202.?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=BA=E5=91=98=E8=A7=92=E8=89=B2=E6=9D=83?= =?UTF-8?q?=E9=99=90=EF=BC=8C=E9=99=90=E5=88=B6=E6=9F=A5=E7=9C=8B=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=8D=95-=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=AD=E6=A0=87=E5=87=86=E5=80=BC=E3=80=81=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E5=80=BC?= 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/PQCResultEntry.vue | 98 +++++++++++++++---------- 2 files changed, 62 insertions(+), 37 deletions(-) diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index 098e420..81bb371 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -150,6 +150,7 @@ export const getAllUserList = data => createAPI(`/pms/pqc/getAllUserList`,'post' export const queryResourceList2 = data => createAPI(`/pms/pqc/queryResourceList2`,'post',data) export const querySopNum = data => createAPI(`/pms/pqc/querySopNum`,'post',data) export const previewSopFile = data => createAPI(`/pms/pqc/previewSopFile`,'post',data,'download') +export const getColumnDisplayFlagList = data => createAPI(`/pms/pqc/getColumnDisplayFlagList`,'post',data) // ===================================== IPQC检验 ===================================== export const qcIPQCInspectionSearch = data => createAPI(`/pms/qc/qcIPQCInspectionSearch`,'post',data) diff --git a/src/views/modules/qc/PQCResultEntry.vue b/src/views/modules/qc/PQCResultEntry.vue index fb4f258..1b8d767 100644 --- a/src/views/modules/qc/PQCResultEntry.vue +++ b/src/views/modules/qc/PQCResultEntry.vue @@ -473,7 +473,7 @@ - + 预览SOP @@ -487,43 +487,43 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -546,6 +546,7 @@ { + if (data.code === 0) { + let userList = data.rows + let usernameList = [] + userList.forEach(val => { + usernameList.push(val.adminID) + }) + this.columnDisplayFlag = usernameList.includes(this.$store.state.user.name) + } + }) + }, // 批量打印标签 printList () { @@ -3825,10 +3841,10 @@ export default { // this.$message.warning('请选择检验结论！') // return // } - if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures === '')) { - this.$message.warning('请选择处置措施！') - return - } + // if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures === '')) { + // this.$message.warning('请选择处置措施！') + // return + // } if (this.detailList.length > 0 && this.detailData.inspectionResult === '不合格') { const flag = this.detailList.some(item => item.itemResult === 'N') if (!flag) { @@ -3836,6 +3852,13 @@ export default { return } } + if (this.detailList.length > 0 && this.detailData.inspectionResult === '合格') { + const flag = this.detailList.some(item => item.itemResult === 'N') + if (flag) { + this.$message.warning('存在不合格的检验项目，结论不能为合格') + return + } + } if (this.detailData.inspectionResult !== '不合格') { this.detailData.disposalMeasures = '' this.detailData.disposalRemark = '' @@ -3985,6 +4008,7 @@ export default { this.detailData.batchQualifiedQty = row.batchQualifiedQty this.getInspectionFormData() this.inspectorSearch() + this.getColumnDisplayFlagList() // this.acquisitionList = [] this.detailInformationFlag = true },