From c4e07bba9502023f72d1af3cf25f454bfa672c56 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 18 Jun 2024 13:13:52 +0800 Subject: [PATCH] =?UTF-8?q?2024-06-18=20=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 2 +- src/views/modules/qc/FQASResultEntry.vue | 24 ++++++++++++++++-------- src/views/modules/qc/IQCResultEntry.vue | 24 ++++++++++++++++-------- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/config/index.js b/config/index.js index 61f0ffe..beee8bc 100644 --- a/config/index.js +++ b/config/index.js @@ -24,7 +24,7 @@ module.exports = { // Various Dev Server settings host: 'localhost', // can be overwritten by process.env.HOST - port: 8003, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + port: 9003, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, notifyOnErrors: true, diff --git a/src/views/modules/qc/FQASResultEntry.vue b/src/views/modules/qc/FQASResultEntry.vue index 1b052b3..93668a2 100644 --- a/src/views/modules/qc/FQASResultEntry.vue +++ b/src/views/modules/qc/FQASResultEntry.vue @@ -1630,18 +1630,26 @@ } if (this.operatorData.flag === '1') { for (let i = 0; i < this.dataListSelections2.length; i++) { - this.detailData.operatorName = this.detailData.operatorName + ";" + this.dataListSelections2[i].adminName - this.detailData.operator = this.detailData.operator + ";" + this.dataListSelections2[i].adminID + if (!this.detailData.operator.split(';').includes(this.dataListSelections2[i].adminID)) { + this.detailData.operatorName = this.detailData.operatorName + ";" + this.dataListSelections2[i].adminName + this.detailData.operator = this.detailData.operator + ";" + this.dataListSelections2[i].adminID + } + } + if (this.detailData.operator.charAt(0) === ';') { + this.detailData.operator = this.detailData.operator.substring(1) + this.detailData.operatorName = this.detailData.operatorName.substring(1) } - this.detailData.operator = this.detailData.operator.substring(1) - this.detailData.operatorName = this.detailData.operatorName.substring(1) } else { for (let i = 0; i < this.dataListSelections2.length; i++) { - this.detailData.responsiblePersonName = this.detailData.responsiblePersonName + ";" + this.dataListSelections2[i].adminName - this.detailData.responsiblePerson = this.detailData.responsiblePerson + ";" + this.dataListSelections2[i].adminID + if (!this.detailData.responsiblePerson.split(';').includes(this.dataListSelections2[i].adminID)) { + this.detailData.responsiblePersonName = this.detailData.responsiblePersonName + ";" + this.dataListSelections2[i].adminName + this.detailData.responsiblePerson = this.detailData.responsiblePerson + ";" + this.dataListSelections2[i].adminID + } + } + if (this.detailData.responsiblePerson.charAt(0) === ';') { + this.detailData.responsiblePerson = this.detailData.responsiblePerson.substring(1) + this.detailData.responsiblePersonName = this.detailData.responsiblePersonName.substring(1) } - this.detailData.responsiblePerson = this.detailData.responsiblePerson.substring(1) - this.detailData.responsiblePersonName = this.detailData.responsiblePersonName.substring(1) } this.operatorData = { flag: '', diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 6012a52..112754b 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -1767,18 +1767,26 @@ } if (this.operatorData.flag === '1') { for (let i = 0; i < this.dataListSelections2.length; i++) { - this.detailData.operatorName = this.detailData.operatorName + ";" + this.dataListSelections2[i].adminName - this.detailData.operator = this.detailData.operator + ";" + this.dataListSelections2[i].adminID + if (!this.detailData.operator.split(';').includes(this.dataListSelections2[i].adminID)) { + this.detailData.operatorName = this.detailData.operatorName + ";" + this.dataListSelections2[i].adminName + this.detailData.operator = this.detailData.operator + ";" + this.dataListSelections2[i].adminID + } + } + if (this.detailData.operator.charAt(0) === ';') { + this.detailData.operator = this.detailData.operator.substring(1) + this.detailData.operatorName = this.detailData.operatorName.substring(1) } - this.detailData.operator = this.detailData.operator.substring(1) - this.detailData.operatorName = this.detailData.operatorName.substring(1) } else { for (let i = 0; i < this.dataListSelections2.length; i++) { - this.detailData.responsiblePersonName = this.detailData.responsiblePersonName + ";" + this.dataListSelections2[i].adminName - this.detailData.responsiblePerson = this.detailData.responsiblePerson + ";" + this.dataListSelections2[i].adminID + if (!this.detailData.responsiblePerson.split(';').includes(this.dataListSelections2[i].adminID)) { + this.detailData.responsiblePersonName = this.detailData.responsiblePersonName + ";" + this.dataListSelections2[i].adminName + this.detailData.responsiblePerson = this.detailData.responsiblePerson + ";" + this.dataListSelections2[i].adminID + } + } + if (this.detailData.responsiblePerson.charAt(0) === ';') { + this.detailData.responsiblePerson = this.detailData.responsiblePerson.substring(1) + this.detailData.responsiblePersonName = this.detailData.responsiblePersonName.substring(1) } - this.detailData.responsiblePerson = this.detailData.responsiblePerson.substring(1) - this.detailData.responsiblePersonName = this.detailData.responsiblePersonName.substring(1) } this.operatorData = { flag: '',