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: '',