From 078535b0abeffc3d61d30d7a71e59d35d97b2499 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 12 Nov 2024 17:43:50 +0800 Subject: [PATCH 1/3] 2024-11-12 --- src/views/modules/part/standardRoutingOperation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/part/standardRoutingOperation.vue b/src/views/modules/part/standardRoutingOperation.vue index f154b1c..e09adea 100644 --- a/src/views/modules/part/standardRoutingOperation.vue +++ b/src/views/modules/part/standardRoutingOperation.vue @@ -143,7 +143,7 @@ - + From e5d28ff351edf0a906ee684db46b7b668c57232f Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Tue, 12 Nov 2024 20:13:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?2024.11.12=20=E6=96=87=E6=A1=A3=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/common/uploadFileList1.vue | 1 + .../modules/eam/com_project_proof_record.vue | 4 +- src/views/modules/eam/eamProjectPartInfo.vue | 101 +++++++++++------- 3 files changed, 65 insertions(+), 41 deletions(-) diff --git a/src/views/modules/common/uploadFileList1.vue b/src/views/modules/common/uploadFileList1.vue index 9f4fda3..5c07ff1 100644 --- a/src/views/modules/common/uploadFileList1.vue +++ b/src/views/modules/common/uploadFileList1.vue @@ -254,6 +254,7 @@ export default { EventBus.$emit('updateAgencyMatterForUploads'); EventBus.$emit('updateProjectPartDocumentInfo'); EventBus.$emit('updateThisProjectPartDocumentInfo'); + EventBus.$emit('getProjectOtherDocument'); // this.$emit('get-document-list'); // this.$emit('get-proof-document'); } else { diff --git a/src/views/modules/eam/com_project_proof_record.vue b/src/views/modules/eam/com_project_proof_record.vue index 85389e4..5126631 100644 --- a/src/views/modules/eam/com_project_proof_record.vue +++ b/src/views/modules/eam/com_project_proof_record.vue @@ -9,7 +9,7 @@ :data="dataList" border style="width: 100%;margin-top: -5px;" - :height="this.height - 38" + :height="this.height +10" highlight-current-row ref="proofingTable" @row-click="proofDocumentClickRow" @@ -62,7 +62,7 @@ :data="proofDocumentList" border style="width: 100%;margin-top: 5px;" - :height="this.height - 79" + :height="this.height - 31" ref="proofDocumentTable" @row-click="uploadDocumentClickRow" @current-change="changeCurrentRow1" diff --git a/src/views/modules/eam/eamProjectPartInfo.vue b/src/views/modules/eam/eamProjectPartInfo.vue index 9daf071..83bd890 100644 --- a/src/views/modules/eam/eamProjectPartInfo.vue +++ b/src/views/modules/eam/eamProjectPartInfo.vue @@ -297,6 +297,7 @@ 文档清单定义 上传其他文档 + 邮件提醒 + + + - - - @@ -1164,7 +1165,20 @@ import {EventBus} from "../../../main"; if (newVal) { this.activeName1 = 'selectDocument'; } - } + }, + // 如果projectOtherDocumentList改变，遍历projectOtherDocumentList + projectOtherDocumentList: { + deep: true, + handler: function (newV, oldV) { + const sendMassMailFlags = []; + this.projectOtherDocumentList.forEach(item => { + if (item.uploadedFlag === 'N') { + sendMassMailFlags.push(item.uploadedFlag) + } + }) + this.sendMassMailFlag = sendMassMailFlags.includes('N'); + } + }, }, data () { return { @@ -1275,6 +1289,7 @@ import {EventBus} from "../../../main"; projectConfirmatorFileList: [], viewDocumentFileVisible: false, viewMassDocumentFileVisible: false, + sendMassMailFlag: false, searchProjectDocumentTypeData: { site: this.$store.state.user.site, projectId: '', @@ -2824,6 +2839,9 @@ import {EventBus} from "../../../main"; EventBus.$on('updateThisProjectPartDocumentInfo', () => { this.searchProjectAllDocumentList() }); + EventBus.$on('getProjectOtherDocument', () => { + this.getProjectOtherDocument() + }); }, created () { @@ -3601,6 +3619,9 @@ import {EventBus} from "../../../main"; }); } } else if (row.status === '进行中' || '已量产') { + if (row.status === '进行中') { + this.modalData.status2 = '进行中' + } this.modalData.status = '已量产' this.modalData.closeDate = new Date() this.$confirm(`是否确认转量产?`, '提示', { @@ -3618,18 +3639,6 @@ import {EventBus} from "../../../main"; duration: 1500, onClose: () => {} }) - sendMailHandle(this.modalData).then(({data}) => { - if (data && data.code === 0) { - this.$message({ - message: '发送成功', - type: 'success' - }) - } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' - }) - } - }) } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -3640,6 +3649,22 @@ import {EventBus} from "../../../main"; }) } }, + sendMassMailHandle () { + let inData = this.proofingCurrentRow + inData.proofingId = -1 + sendMailHandle(inData).then(({data}) => { + if (data && data.code === 0) { + this.$message({ + message: '发送成功', + type: 'success' + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, getRowProjectInfo(){ let inData={ site: this.proofingCurrentRow.site, @@ -4016,7 +4041,7 @@ import {EventBus} from "../../../main"; customerId: this.proofingCurrentRow.customerNo, customerDesc: this.proofingCurrentRow.customerDesc, page: 1, - limit: 1000 + limit: -1 } getProjectOtherDocument(tempData).then(({data}) => { if (data && data.code === 0) { @@ -4028,19 +4053,19 @@ import {EventBus} from "../../../main"; if (this.projectOtherDocumentList[i].documentTypeId !== 'N/A') { this.proofDocumentListDefinition.push(this.projectOtherDocumentList[i]) } - if (this.projectOtherDocumentList[i].responsibleDepartment === 'PM/Sales'){ + if (this.projectOtherDocumentList[i].responsibleDepartment === 'PM/Sales') { this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.projectManager.split("-")[1] - } else if(this.projectOtherDocumentList[i].responsibleDepartment === 'PjM'){ + } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'PjM') { this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.projectOwner.split("-")[1] - } else if(this.projectOtherDocumentList[i].responsibleDepartment === 'Engineer'){ + } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'Engineer') { this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.engineer.split("-")[1] - } else if(this.projectOtherDocumentList[i].responsibleDepartment === 'IPQC-Lam/Pri/Etch/Slit'){ + } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'IPQC-Lam/Pri/Etch/Slit') { this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer1.split("-")[1] - } else if(this.projectOtherDocumentList[i].responsibleDepartment === 'IPQC-Converting'){ + } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'IPQC-Converting') { this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer2.split("-")[1] - } else if(this.projectOtherDocumentList[i].responsibleDepartment === 'FQC1'){ + } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'FQC1') { this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer3.split("-")[1] - } else if(this.projectOtherDocumentList[i].responsibleDepartment === 'MFQ'){ + } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'MFQ') { this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.cManufactureEngineer.split("-")[1] } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'SQE') { if (this.proofingCurrentRow.cQualityEngineer4 != null && this.proofingCurrentRow.cQualityEngineer4 !== '') { @@ -4050,15 +4075,13 @@ import {EventBus} from "../../../main"; if (this.proofingCurrentRow.cQualityEngineer5 != null && this.proofingCurrentRow.cQualityEngineer5 !== '') { this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer5.split('-')[1] // 截取用户名 } - } - else if (this.projectOtherDocumentList[i].responsibleDepartment === 'IQC') { + } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'IQC') { if (this.proofingCurrentRow.cQualityEngineer6 != null && this.proofingCurrentRow.cQualityEngineer6 !== '') { this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer6.split('-')[1] // 截取用户名 } - } - else if(this.projectOtherDocumentList[i].responsibleDepartment === 'DocEngineer'){ - if (this.proofingCurrentRow.docEngineer != null && this.proofingCurrentRow.docEngineer !== ''){ - this.projectOtherDocumentList[i].projectLeader= this.proofingCurrentRow.docEngineer.split('-')[1] // 截取用户名 + } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'DocEngineer') { + if (this.proofingCurrentRow.docEngineer != null && this.proofingCurrentRow.docEngineer !== '') { + this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.docEngineer.split('-')[1] // 截取用户名 } } } From 8444455782e05c41fa21c4ce77e1ef8241dffc71 Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Tue, 12 Nov 2024 20:18:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?2024.11.12=20=E6=96=87=E6=A1=A3=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/eam/com_project_proof_record.vue | 4 ++-- src/views/modules/eam/eamProjectPartInfo.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/eam/com_project_proof_record.vue b/src/views/modules/eam/com_project_proof_record.vue index 5126631..2b0d811 100644 --- a/src/views/modules/eam/com_project_proof_record.vue +++ b/src/views/modules/eam/com_project_proof_record.vue @@ -9,7 +9,7 @@ :data="dataList" border style="width: 100%;margin-top: -5px;" - :height="this.height +10" + :height="this.height +30" highlight-current-row ref="proofingTable" @row-click="proofDocumentClickRow" @@ -62,7 +62,7 @@ :data="proofDocumentList" border style="width: 100%;margin-top: 5px;" - :height="this.height - 31" + :height="this.height - 11" ref="proofDocumentTable" @row-click="uploadDocumentClickRow" @current-change="changeCurrentRow1" diff --git a/src/views/modules/eam/eamProjectPartInfo.vue b/src/views/modules/eam/eamProjectPartInfo.vue index 83bd890..adbee7d 100644 --- a/src/views/modules/eam/eamProjectPartInfo.vue +++ b/src/views/modules/eam/eamProjectPartInfo.vue @@ -166,7 +166,7 @@