diff --git a/src/api/eam/eamProject.js b/src/api/eam/eamProject.js index d96a4bc..ffdbbba 100644 --- a/src/api/eam/eamProject.js +++ b/src/api/eam/eamProject.js @@ -33,3 +33,5 @@ export const sendMailHandle= data => createAPI(`/pms/eamProject/sendMailHandle`, export const warnSendMailHandle= data => createAPI(`/pms/eamProject/warnSendMailHandle`,'post',data) export const confirmatorSendMailHandle= data => createAPI(`/pms/eamProject/confirmatorSendMailHandle`,'post',data) export const agencyMatter= data => createAPI(`/pms/agencyMatter/project-counts`,'post',data) +export const deleteAndSaveHandle= data => createAPI(`/pms/eamProject/deleteAndSaveHandle`,'post',data) +export const saveHandle= data => createAPI(`/pms/eamProject/saveHandle`,'post',data) diff --git a/src/views/modules/common/uploadFileList1.vue b/src/views/modules/common/uploadFileList1.vue index d4eb372..9f4fda3 100644 --- a/src/views/modules/common/uploadFileList1.vue +++ b/src/views/modules/common/uploadFileList1.vue @@ -333,13 +333,6 @@ export default { for (let i = 0; i < this.proofDocumentList.length; i++) { this.proofDocumentList[i].buNo = this.proofDocumenCurrentRow.buNo } - if (this.totalPage > 0) { - // 设置选中行 - this.$refs.proofDocumentTable.setCurrentRow(this.proofDocumentList[0]) - // 加载当前的页签的table - this.refreshCurrentTabTable() - this.proofDocumentClickRow = this.proofDocumentList[0] - } } else { this.proofDocumentList = [] } diff --git a/src/views/modules/eam/com_project_proof_record.vue b/src/views/modules/eam/com_project_proof_record.vue index 615eb0f..e6fe8fb 100644 --- a/src/views/modules/eam/com_project_proof_record.vue +++ b/src/views/modules/eam/com_project_proof_record.vue @@ -282,6 +282,11 @@ + + + + +
取 消 确 定 @@ -699,7 +704,24 @@ fixed: '', columnWidth: 80, }, - //日期requiredDeliveryDate + { + userId: this.$store.state.user.name, + functionId: 103001, + serialNumber: '103001Table1Remark', + tableId: '103001Table1', + tableName: '打样记录表', + columnProp: 'remark', + headerAlign: 'center', + align: 'center', + columnLabel: '备注', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 + }, { userId: this.$store.state.user.name, functionId: 103001, @@ -718,7 +740,6 @@ fixed: '', columnWidth: 80 }, - //日期requiredDeliveryDate { userId: this.$store.state.user.name, functionId: 103001, @@ -1298,6 +1319,7 @@ updateBy: this.$store.state.user.name, id: row.id, proofDocumentDataList: this.proofDocumentList, + remark: row.remark } }, saveProofingRecord(row,type) { @@ -1322,6 +1344,7 @@ updateBy: this.$store.state.user.name, proofingStatus: this.modalData.proofingStatus, proofingResultStatus: this.modalData.proofingResultStatus, + remark: this.modalData.remark } if (this.modalData.actualityDeliveryDate !== null && this.modalData.actualityDeliveryDate !== undefined && this.modalData.actualityDeliveryDate !== ''){ inData.actualityDeliveryDate = moment(this.modalData.actualityDeliveryDate).utcOffset('+8').format('YYYY-MM-DD') @@ -1353,6 +1376,7 @@ updateBy: this.$store.state.user.name, proofingStatus: '进行中', proofingResultStatus: row.proofingResultStatus, + remark: row.remark } } else { if (this.modalData.cProjectTypeDb === '' || this.modalData.cProjectTypeDb === null || this.modalData.cProjectTypeDb === undefined) { diff --git a/src/views/modules/eam/eamProjectInfo.vue b/src/views/modules/eam/eamProjectInfo.vue index ab701e3..b31d9ca 100644 --- a/src/views/modules/eam/eamProjectInfo.vue +++ b/src/views/modules/eam/eamProjectInfo.vue @@ -3163,6 +3163,7 @@ import {searchBusinessInfo7} from "../../../api/factory/site"; priority: this.modalData.priority, testPartNo: 'P000000', partDesc: '无物料', + partType: 'Active', } eamProjectInfoSave(this.modalData).then(({data}) => { if (data && data.code === '0') { @@ -3234,6 +3235,7 @@ import {searchBusinessInfo7} from "../../../api/factory/site"; priority: this.modalData.priority, testPartNo: 'P000000', partDesc: '无物料', + partType: 'Active', } eamProjectInfoSave(this.modalData).then(({data}) => { if (data && data.code === '0') { @@ -3302,7 +3304,6 @@ import {searchBusinessInfo7} from "../../../api/factory/site"; bu: this.modalData.bu, customerNo: this.modalData.customerNo, customerDesc: this.modalData.customerDesc, - status: this.modalData.status, active: this.modalData.active, closeDate : this.modalData.projectCloseDate, buildDate : this.modalData.projectCreationDate, @@ -3428,6 +3429,7 @@ import {searchBusinessInfo7} from "../../../api/factory/site"; } this.modalData.closeDate = this.modalData.projectCloseDate this.modalData.buildDate = this.modalData.projectCreationDate + this.modalData.partType = 'Active' eamProjectPartInfoEdit(this.modalData).then(({data}) => { if (data && data.code === 0) { this.refreshCurrentTabTable() diff --git a/src/views/modules/eam/eamProjectInfoForProof.vue b/src/views/modules/eam/eamProjectInfoForProof.vue index 93c63c2..6b18be7 100644 --- a/src/views/modules/eam/eamProjectInfoForProof.vue +++ b/src/views/modules/eam/eamProjectInfoForProof.vue @@ -639,7 +639,25 @@ export default { columnProp: 'status', headerAlign: "center", align: "left", - columnLabel: '项目状态' , + columnLabel: '物料状态' , + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100, + }, + { + userId: this.$store.state.user.name, + functionId: 401008, + serialNumber: '401008Table1ProofingStatus', + tableId: "401008Table1", + tableName: "项目打样记录表", + columnProp: 'proofingStatus', + headerAlign: "center", + align: "left", + columnLabel: '打样状态' , columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/eam/eamProjectInfoForUploads.vue b/src/views/modules/eam/eamProjectInfoForUploads.vue index 6c34fed..7b8da12 100644 --- a/src/views/modules/eam/eamProjectInfoForUploads.vue +++ b/src/views/modules/eam/eamProjectInfoForUploads.vue @@ -79,6 +79,16 @@ + + + + + + @@ -251,6 +261,9 @@ export default { finalPartNosList() { return this.allPersonnelInfoList.filter(item => item.finalPartNoId !== undefined); }, + projectProjectLeadersList() { + return this.allPersonnelInfoList.filter(item => item.projectLeaderId !== undefined); + }, }, data() { @@ -304,6 +317,7 @@ export default { finalPartNo: '', closeStartDate: '', closeEndDate: '', + projectLeader: '', page: 1, limit: 10, }, @@ -938,6 +952,24 @@ export default { fixed: '', columnWidth: 70, }, + { + userId: this.$store.state.user.name, + functionId: 401006, + serialNumber: '401006Table1ProofingPhase', + tableId: "401006Table1", + tableName: "项目信息待上传文件表", + columnProp: 'proofingPhase', + headerAlign: "center", + align: "center", + columnLabel: '打样阶段', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 70, + }, { userId: this.$store.state.user.name, functionId: 401006, @@ -1235,8 +1267,8 @@ export default { // 获取数据列表 getDataList (params) { this.selectTypeFlag = params - this.searchData.limit = this.pageSize - this.searchData.page = this.pageIndex + this.searchData.limit = 20 + this.searchData.page = 1 if (this.$route.query.flag === '2') { searchProjectOverUploadsDocumentList(this.searchData).then(({data}) => { if (data.code === 0) { @@ -1315,6 +1347,55 @@ export default { } } } + if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){ + console.log('1',this.searchData.projectLeader) + this.dataList = data.list + for (let i = 0; i < this.dataList.length; i++) { + if (this.dataList[i].responsibleDepartment === 'R001'){ + this.dataList[i].projectLeader = this.dataList[i].projectManager.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R002'){ + this.dataList[i].projectLeader = this.dataList[i].projectOwner.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R004'){ + this.dataList[i].projectLeader = this.dataList[i].engineer.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R005'){ + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer1.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R007'){ + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer2.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R008'){ + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer3.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R009'){ + this.dataList[i].projectLeader = this.dataList[i].cManufactureEngineer.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R012'){ + if (this.dataList[i].docEngineer === null || this.dataList[i].docEngineer === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].docEngineer.split("-")[1] + } + } else if(this.dataList[i].responsibleDepartment === 'R011'){ + if (this.dataList[i].cQualityEngineer4 === null || this.dataList[i].cQualityEngineer4 === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer4.split("-")[1] + } + } else if(this.dataList[i].responsibleDepartment === 'R013'){ + if (this.dataList[i].cQualityEngineer5 === null || this.dataList[i].cQualityEngineer5 === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer5.split("-")[1] + } + } else if(this.dataList[i].responsibleDepartment === 'R014'){ + if (this.dataList[i].cQualityEngineer6 === null || this.dataList[i].cQualityEngineer6 === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1] + } + } + } + this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader); + this.pageIndex = 1 + this.pageSize = -1 + this.totalPage = this.dataList.length + 1 + } } // 获取全部人员信息用于下拉框 this.getAllPersonnelList() @@ -1397,6 +1478,55 @@ export default { } } } + if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){ + console.log('2',this.searchData.projectLeader) + this.dataList = data.list + for (let i = 0; i < this.dataList.length; i++) { + if (this.dataList[i].responsibleDepartment === 'R001'){ + this.dataList[i].projectLeader = this.dataList[i].projectManager.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R002'){ + this.dataList[i].projectLeader = this.dataList[i].projectOwner.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R004'){ + this.dataList[i].projectLeader = this.dataList[i].engineer.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R005'){ + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer1.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R007'){ + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer2.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R008'){ + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer3.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R009'){ + this.dataList[i].projectLeader = this.dataList[i].cManufactureEngineer.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R012'){ + if (this.dataList[i].docEngineer === null || this.dataList[i].docEngineer === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].docEngineer.split("-")[1] + } + } else if(this.dataList[i].responsibleDepartment === 'R011'){ + if (this.dataList[i].cQualityEngineer4 === null || this.dataList[i].cQualityEngineer4 === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer4.split("-")[1] + } + } else if(this.dataList[i].responsibleDepartment === 'R013'){ + if (this.dataList[i].cQualityEngineer5 === null || this.dataList[i].cQualityEngineer5 === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer5.split("-")[1] + } + } else if(this.dataList[i].responsibleDepartment === 'R014'){ + if (this.dataList[i].cQualityEngineer6 === null || this.dataList[i].cQualityEngineer6 === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1] + } + } + } + this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader); + this.pageIndex = 1 + this.pageSize = -1 + this.totalPage = this.dataList.length + 1 + } } // 获取全部人员信息用于下拉框 this.getAllPersonnelList() @@ -1489,6 +1619,55 @@ export default { } } } + if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null) { + console.log('3',this.searchData.projectLeader) + this.dataList = data.list + for (let i = 0; i < this.dataList.length; i++) { + if (this.dataList[i].responsibleDepartment === 'R001') { + this.dataList[i].projectLeader = this.dataList[i].projectManager.split("-")[1] + } else if (this.dataList[i].responsibleDepartment === 'R002') { + this.dataList[i].projectLeader = this.dataList[i].projectOwner.split("-")[1] + } else if (this.dataList[i].responsibleDepartment === 'R004') { + this.dataList[i].projectLeader = this.dataList[i].engineer.split("-")[1] + } else if (this.dataList[i].responsibleDepartment === 'R005') { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer1.split("-")[1] + } else if (this.dataList[i].responsibleDepartment === 'R007') { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer2.split("-")[1] + } else if (this.dataList[i].responsibleDepartment === 'R008') { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer3.split("-")[1] + } else if (this.dataList[i].responsibleDepartment === 'R009') { + this.dataList[i].projectLeader = this.dataList[i].cManufactureEngineer.split("-")[1] + } else if (this.dataList[i].responsibleDepartment === 'R012') { + if (this.dataList[i].docEngineer === null || this.dataList[i].docEngineer === '') { + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].docEngineer.split("-")[1] + } + } else if (this.dataList[i].responsibleDepartment === 'R011') { + if (this.dataList[i].cQualityEngineer4 === null || this.dataList[i].cQualityEngineer4 === '') { + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer4.split("-")[1] + } + } else if (this.dataList[i].responsibleDepartment === 'R013') { + if (this.dataList[i].cQualityEngineer5 === null || this.dataList[i].cQualityEngineer5 === '') { + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer5.split("-")[1] + } + } else if (this.dataList[i].responsibleDepartment === 'R014') { + if (this.dataList[i].cQualityEngineer6 === null || this.dataList[i].cQualityEngineer6 === '') { + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1] + } + } + } + this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader); + this.pageIndex = 1 + this.pageSize = -1 + this.totalPage = this.dataList.length + 1 + } } else { this.$route.query.flag = '1' } @@ -1589,6 +1768,54 @@ export default { } } } + if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){ + this.dataList = data.list + for (let i = 0; i < this.dataList.length; i++) { + if (this.dataList[i].responsibleDepartment === 'R001'){ + this.dataList[i].projectLeader = this.dataList[i].projectManager.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R002'){ + this.dataList[i].projectLeader = this.dataList[i].projectOwner.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R004'){ + this.dataList[i].projectLeader = this.dataList[i].engineer.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R005'){ + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer1.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R007'){ + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer2.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R008'){ + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer3.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R009'){ + this.dataList[i].projectLeader = this.dataList[i].cManufactureEngineer.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R012'){ + if (this.dataList[i].docEngineer === null || this.dataList[i].docEngineer === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].docEngineer.split("-")[1] + } + } else if(this.dataList[i].responsibleDepartment === 'R011'){ + if (this.dataList[i].cQualityEngineer4 === null || this.dataList[i].cQualityEngineer4 === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer4.split("-")[1] + } + } else if(this.dataList[i].responsibleDepartment === 'R013'){ + if (this.dataList[i].cQualityEngineer5 === null || this.dataList[i].cQualityEngineer5 === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer5.split("-")[1] + } + } else if(this.dataList[i].responsibleDepartment === 'R014'){ + if (this.dataList[i].cQualityEngineer6 === null || this.dataList[i].cQualityEngineer6 === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1] + } + } + } + this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader); + this.pageIndex = 1 + this.pageSize = -1 + this.totalPage = this.dataList.length + 1 + } } // 获取全部人员信息用于下拉框 this.getAllPersonnelList() @@ -1671,6 +1898,54 @@ export default { } } } + if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){ + this.dataList = data.list + for (let i = 0; i < this.dataList.length; i++) { + if (this.dataList[i].responsibleDepartment === 'R001'){ + this.dataList[i].projectLeader = this.dataList[i].projectManager.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R002'){ + this.dataList[i].projectLeader = this.dataList[i].projectOwner.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R004'){ + this.dataList[i].projectLeader = this.dataList[i].engineer.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R005'){ + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer1.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R007'){ + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer2.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R008'){ + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer3.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R009'){ + this.dataList[i].projectLeader = this.dataList[i].cManufactureEngineer.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R012'){ + if (this.dataList[i].docEngineer === null || this.dataList[i].docEngineer === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].docEngineer.split("-")[1] + } + } else if(this.dataList[i].responsibleDepartment === 'R011'){ + if (this.dataList[i].cQualityEngineer4 === null || this.dataList[i].cQualityEngineer4 === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer4.split("-")[1] + } + } else if(this.dataList[i].responsibleDepartment === 'R013'){ + if (this.dataList[i].cQualityEngineer5 === null || this.dataList[i].cQualityEngineer5 === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer5.split("-")[1] + } + } else if(this.dataList[i].responsibleDepartment === 'R014'){ + if (this.dataList[i].cQualityEngineer6 === null || this.dataList[i].cQualityEngineer6 === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1] + } + } + } + this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader); + this.pageIndex = 1 + this.pageSize = -1 + this.totalPage = this.dataList.length + 1 + } } // 获取全部人员信息用于下拉框 this.getAllPersonnelList() @@ -1763,6 +2038,54 @@ export default { } } } + if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){ + this.dataList = data.list + for (let i = 0; i < this.dataList.length; i++) { + if (this.dataList[i].responsibleDepartment === 'R001'){ + this.dataList[i].projectLeader = this.dataList[i].projectManager.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R002'){ + this.dataList[i].projectLeader = this.dataList[i].projectOwner.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R004'){ + this.dataList[i].projectLeader = this.dataList[i].engineer.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R005'){ + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer1.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R007'){ + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer2.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R008'){ + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer3.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R009'){ + this.dataList[i].projectLeader = this.dataList[i].cManufactureEngineer.split("-")[1] + } else if(this.dataList[i].responsibleDepartment === 'R012'){ + if (this.dataList[i].docEngineer === null || this.dataList[i].docEngineer === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].docEngineer.split("-")[1] + } + } else if(this.dataList[i].responsibleDepartment === 'R011'){ + if (this.dataList[i].cQualityEngineer4 === null || this.dataList[i].cQualityEngineer4 === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer4.split("-")[1] + } + } else if(this.dataList[i].responsibleDepartment === 'R013'){ + if (this.dataList[i].cQualityEngineer5 === null || this.dataList[i].cQualityEngineer5 === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer5.split("-")[1] + } + } else if(this.dataList[i].responsibleDepartment === 'R014'){ + if (this.dataList[i].cQualityEngineer6 === null || this.dataList[i].cQualityEngineer6 === ''){ + this.dataList[i].projectLeader = '' + } else { + this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1] + } + } + } + this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader); + this.pageIndex = 1 + this.pageSize = -1 + this.totalPage = this.dataList.length + 1 + } } else { this.$route.query.flag = '1' } @@ -1785,6 +2108,49 @@ export default { const projectManagersMap = new Map(); const engineersMap = new Map(); const finalPartNosMap = new Map(); + const projectProjectLeadersMap = new Map(); + + for (let i = 0; i < allPersonnelInfoDataList.length; i++) { + if (allPersonnelInfoDataList[i].responsibleDepartment === 'R001'){ + allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].projectManager.split("-")[1] + } else if(allPersonnelInfoDataList[i].responsibleDepartment === 'R002'){ + allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].projectOwner.split("-")[1] + } else if(allPersonnelInfoDataList[i].responsibleDepartment === 'R004'){ + allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].engineer.split("-")[1] + } else if(allPersonnelInfoDataList[i].responsibleDepartment === 'R005'){ + allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].cQualityEngineer1.split("-")[1] + } else if(allPersonnelInfoDataList[i].responsibleDepartment === 'R007'){ + allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].cQualityEngineer2.split("-")[1] + } else if(allPersonnelInfoDataList[i].responsibleDepartment === 'R008'){ + allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].cQualityEngineer3.split("-")[1] + } else if(allPersonnelInfoDataList[i].responsibleDepartment === 'R009'){ + allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].cManufactureEngineer.split("-")[1] + } else if(allPersonnelInfoDataList[i].responsibleDepartment === 'R012'){ + if (allPersonnelInfoDataList[i].docEngineer === null || allPersonnelInfoDataList[i].docEngineer === ''){ + allPersonnelInfoDataList[i].projectLeader = '' + } else { + allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].docEngineer.split("-")[1] + } + } else if(allPersonnelInfoDataList[i].responsibleDepartment === 'R011'){ + if (allPersonnelInfoDataList[i].cQualityEngineer4 === null || allPersonnelInfoDataList[i].cQualityEngineer4 === ''){ + allPersonnelInfoDataList[i].projectLeader = '' + } else { + allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].cQualityEngineer4.split("-")[1] + } + } else if(allPersonnelInfoDataList[i].responsibleDepartment === 'R013'){ + if (allPersonnelInfoDataList[i].cQualityEngineer5 === null || allPersonnelInfoDataList[i].cQualityEngineer5 === ''){ + allPersonnelInfoDataList[i].projectLeader = '' + } else { + allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].cQualityEngineer5.split("-")[1] + } + } else if(allPersonnelInfoDataList[i].responsibleDepartment === 'R014'){ + if (allPersonnelInfoDataList[i].cQualityEngineer6 === null || allPersonnelInfoDataList[i].cQualityEngineer6 === ''){ + allPersonnelInfoDataList[i].projectLeader = '' + } else { + allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].cQualityEngineer6.split("-")[1] + } + } + } allPersonnelInfoDataList.forEach((item) => { // Handle project owners @@ -1829,6 +2195,16 @@ export default { }); allPersonnelList.push(finalPartNosMap.get(item.finalPartNo)); } + + // Handle projectProjectLeaders + if (!projectProjectLeadersMap.has(item.projectLeader) && item.projectLeader !== null && item.projectLeader !== '') { + const projectLeaderId = projectProjectLeadersMap.size + 1; + projectProjectLeadersMap.set(item.projectLeader, { + projectLeaderId, + projectLeader: item.projectLeader, + }); + allPersonnelList.push(projectProjectLeadersMap.get(item.projectLeader)); + } }); this.allPersonnelInfoList = allPersonnelList; diff --git a/src/views/modules/eam/eamProjectPartInfo.vue b/src/views/modules/eam/eamProjectPartInfo.vue index 00f1b75..8e1ce28 100644 --- a/src/views/modules/eam/eamProjectPartInfo.vue +++ b/src/views/modules/eam/eamProjectPartInfo.vue @@ -211,11 +211,16 @@ 转正式料号 转量产
-
+
下达 - 新增打样 + 新增打样 转正式料号 - 转量产 + 转量产 +
+
+ 新增打样 + 转正式料号 + 转量产
@@ -992,6 +997,11 @@ + + + + +
取 消 确 定 @@ -1051,6 +1061,8 @@ import { searchProjectAllDocument } from "../../../api/eam/eamProofing"; import { + deleteAndSaveHandle, + saveHandle, checkConfirmationRecord, checkProductionValidationDocument, deleteDocumentInformation, @@ -1108,11 +1120,6 @@ import {EventBus} from "../../../main"; this.searchData.customerNo = this.searchData.customerNo.toUpperCase() } }, - uploadDialog (newValue,oldValue) { - if (newValue === false) { - this.getProjectOtherDocument() - } - }, projectProductionValidationDocumentVisible(newVal) { if (newVal) { this.activeName1 = 'selectDocument'; @@ -1336,6 +1343,7 @@ import {EventBus} from "../../../main"; planStartDate: '', requiredDeliveryDate: '', actualityDeliveryDate: '', + remark: '', createBy: this.$store.state.user.name, updateBy: this.$store.state.user.name, }, @@ -3339,6 +3347,7 @@ import {EventBus} from "../../../main"; cQualityEngineer6: row.cQualityEngineer6, cManufactureEngineer: row.cManufactureEngineer, docEngineer: row.docEngineer, + remark: '', planStartDate : new Date(), proofingNo: '', proofingStatus: '草稿', @@ -3468,24 +3477,25 @@ import {EventBus} from "../../../main"; docEngineer: row.docEngineer, buildDate: row.buildDate, status: row.status, + partType: row.partType, // active: row.active, createBy: this.$store.state.user.name, updateBy: this.$store.state.user.name, } - if (row.cQualityEngineer4 != null && row.cQualityEngineer4 !== ''){ - this.modalData.cQualityEngineer4Name= row.cQualityEngineer4.split('-')[1] // 截取用户名 + if (row.cQualityEngineer4 != null && row.cQualityEngineer4 !== '') { + this.modalData.cQualityEngineer4Name = row.cQualityEngineer4.split('-')[1] // 截取用户名 } - if (row.cQualityEngineer5 != null && row.cQualityEngineer5 !== ''){ - this.modalData.cQualityEngineer5Name= row.cQualityEngineer5.split('-')[1] // 截取用户名 + if (row.cQualityEngineer5 != null && row.cQualityEngineer5 !== '') { + this.modalData.cQualityEngineer5Name = row.cQualityEngineer5.split('-')[1] // 截取用户名 } - if (row.cQualityEngineer6 != null && row.cQualityEngineer6 !== ''){ - this.modalData.cQualityEngineer6Name= row.cQualityEngineer6.split('-')[1] // 截取用户名 + if (row.cQualityEngineer6 != null && row.cQualityEngineer6 !== '') { + this.modalData.cQualityEngineer6Name = row.cQualityEngineer6.split('-')[1] // 截取用户名 } - if (row.docEngineer != null && row.docEngineer !== ''){ - this.modalData.docEngineerName= row.docEngineer.split('-')[1] // 截取用户名 + if (row.docEngineer != null && row.docEngineer !== '') { + this.modalData.docEngineerName = row.docEngineer.split('-')[1] // 截取用户名 } - if (row.projectOwner.split('-')[0] === this.$store.state.user.name) { - if (row.status === '草稿') { + if (row.status === '草稿') { + if (row.projectOwner.split('-')[0] === this.$store.state.user.name) { this.modalData.status = '进行中' this.$confirm(`是否确认下达该项目?`, '提示', { confirmButtonText: '确定', @@ -3493,7 +3503,7 @@ import {EventBus} from "../../../main"; type: 'warning' }).then(() => { eamProjectPartInfoEdit(this.modalData).then(({data}) => { - if (data && ( data.code === 0 || data.code === '0')) { + if (data && (data.code === 0 || data.code === '0')) { sendMailHandle(this.modalData).then(({data}) => { if (data && data.code === 0) { this.$message({ @@ -3528,16 +3538,15 @@ import {EventBus} from "../../../main"; }) }).catch(() => { }) - } } else { - this.$message({ - message: '该项目只允许PjM人员进行下达！', - type: 'warning', - showClose: true, // 显示关闭按钮 - duration: 2000 // 显示时间，单位是毫秒，这里设置为5秒钟 - }); + this.$message({ + message: '该项目只允许PjM人员进行下达！', + type: 'warning', + showClose: true, // 显示关闭按钮 + duration: 2000 // 显示时间，单位是毫秒，这里设置为5秒钟 + }); } - if (row.status === '进行中') { + } else if (row.status === '进行中' || '已量产') { this.modalData.status = '已量产' this.modalData.closeDate = new Date() this.$confirm(`是否确认转量产?`, '提示', { @@ -3564,7 +3573,7 @@ import {EventBus} from "../../../main"; }).catch(() => { }) } - }, + }, getRowProjectInfo(){ let inData={ site: this.proofingCurrentRow.site, @@ -3733,8 +3742,6 @@ import {EventBus} from "../../../main"; if (row) { this.otherDocumentCurrentRow.bu = this.otherDocumentCurrentRow.site + "-" + this.otherDocumentCurrentRow.buNo this.otherDocumentCurrentRow = JSON.parse(JSON.stringify(row)) - //刷新当前页表 - this.refreshCurrentTabTable() } }, projectAllDocumentClickRow (row) { @@ -3750,10 +3757,6 @@ import {EventBus} from "../../../main"; this.proofingCurrentRow.proofingId= -1 this.proofingCurrentRow.proofingNo = '*' this.uploadDialog = true - //打开组件 去做新增业务 - // this.$nextTick(() => { - // this.$refs.partUploadFile.init(currentData); - // }) }, /** @@ -3955,6 +3958,7 @@ import {EventBus} from "../../../main"; this.proofDocumentListDefinition = [] // 遍历proofDocumentList for (let i = 0; i < this.projectOtherDocumentList.length; i++) { + this.projectOtherDocumentList[i].buNo = this.proofingCurrentRow.buNo if (this.projectOtherDocumentList[i].documentTypeId !== 'N/A') { this.proofDocumentListDefinition.push(this.projectOtherDocumentList[i]) } @@ -3992,9 +3996,6 @@ import {EventBus} from "../../../main"; } } } - for (let i = 0; i < this.projectOtherDocumentList.length; i++) { - this.projectOtherDocumentList[i].buNo = this.proofingCurrentRow.buNo - } } else { this.projectOtherDocumentList = [] } @@ -4175,7 +4176,6 @@ import {EventBus} from "../../../main"; }) this.addProjectDocumentTypeFlag = false //刷新表格 - this.getProjectOtherDocument() this.refreshCurrentTabTable() } else { this.$message({ @@ -4375,77 +4375,65 @@ import {EventBus} from "../../../main"; cancelButtonText: '取消', type: 'warning' }).then(() => { - let confirmatorPromises = this.projectAllDocumentConfirmatorList.map(item => { - let inData = { - site: this.proofingCurrentRow.site, - projectId: this.proofingCurrentRow.projectId, - projectNo: this.proofingCurrentRow.projectNo, - orderRef1: this.proofingCurrentRow.projectId, - orderRef2: this.proofingCurrentRow.projectPartId, - userid: item.userid, - itemNo: this.projectAllDocumentConfirmatorList.indexOf(item) + 1, - wantedConfirmDate: new Date(this.modalData.wantedConfirmDate.getTime() + 8 * 60 * 60 * 1000), - createBy: this.$store.state.user.name - }; - return saveProductionValidationDocumentConfirmator(inData); - }); - - Promise.all(confirmatorPromises) - .then(confirmatorResults => { - let allConfirmatorSuccess = confirmatorResults.every(result => result.data && result.data.code === 0); - if (allConfirmatorSuccess) { - let inData = { - site: this.proofingCurrentRow.site, - orderRef1: this.proofingCurrentRow.projectId, - orderRef2: this.proofingCurrentRow.projectPartId, - projectId: this.proofingCurrentRow.projectId, - projectNo: this.proofingCurrentRow.projectNo, - projectPartId: this.proofingCurrentRow.projectPartId, - testPartNo: this.proofingCurrentRow.testPartNo, - partDesc: this.proofingCurrentRow.partDesc, - selectedDocumentItems: this.selectedDocumentItems, - wantedConfirmDate: new Date(this.modalData.wantedConfirmDate.getTime() + 8 * 60 * 60 * 1000), - } - let saveDocumentPromises = this.handleDocumentSave(inData); - saveDocumentPromises - .then(confirmDelete => { - if (confirmDelete === 'false') { - this.confirmationPrompted = false; - this.$message({ - message: '已取消操作', - type: 'info' - }); - return; - } - this.$message({ - message: '新增成功', - type: 'success' - }); - this.projectProductionValidationDocumentVisible = false; - this.confirmationPrompted = false; - this.confirmatorSendMailHandle(inData) - }) - .catch(error => { - console.error('保存文档出错:', error); - this.$message({ - message: '新增失败，请检查文档', - type: 'error' - }); + this.projectAllDocumentConfirmatorList.map(item => { + item.site = this.proofingCurrentRow.site; + item.projectId = this.proofingCurrentRow.projectId; + item.projectNo = this.proofingCurrentRow.projectNo; + item.orderRef1 = this.proofingCurrentRow.projectId; + item.orderRef2 = this.proofingCurrentRow.projectPartId; + item.projectPartId = this.proofingCurrentRow.projectPartId; + item.testPartNo = this.proofingCurrentRow.testPartNo; + item.partDesc = this.proofingCurrentRow.partDesc; + item.itemNo = this.projectAllDocumentConfirmatorList.indexOf(item) + 1; + item.wantedConfirmDate = new Date(this.modalData.wantedConfirmDate.getTime() + 8 * 60 * 60 * 1000); + item.createBy = this.$store.state.user.name; + item.selectedDocumentItems = this.selectedDocumentItems; + }) + checkProductionValidationDocument(this.projectAllDocumentConfirmatorList) + .then(({ data }) => { + if (data) { + this.$confirm('该项目已存在生产确认记录或已经有人员进行了确认，是否删除重新推送确认信息？', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'warning' + }).then(() => { + deleteAndSaveHandle(this.projectAllDocumentConfirmatorList).then(({data}) => { + if (data && data.code === 0) { + this.$message({ + message: '操作成功', + type: 'success' + }) + this.confirmatorSendMailHandle(this.projectAllDocumentConfirmatorList.at(0)) + this.projectProductionValidationDocumentVisible = false + } else { + this.$alert("操作失败，请检查确认人员和确认文档或联系管理员！（" + data.msg + ")", '错误', { + confirmButtonText: '确定' + }) + } + }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消操作' }); - } else { - this.$message({ - message: '已取消操作', - type: 'info' }); + } else { + saveHandle(this.projectAllDocumentConfirmatorList).then(({data}) => { + if (data && data.code === 0) { + this.$message({ + message: '操作成功', + type: 'success' + }) + this.confirmatorSendMailHandle(this.projectAllDocumentConfirmatorList.at(0)) + this.projectProductionValidationDocumentVisible = false + } else { + this.$alert("操作失败，请检查确认人员和确认文档或联系管理员！（" + data.msg + ")", '错误', { + confirmButtonText: '确定' + }) + } + }) } - }) - .catch(error => { - console.error('保存确认人员出错:', error); - this.$message({ - message: '新增失败，请检查确认人员', - type: 'error' - }); - }); + }); }).catch(() => { this.$message({ type: 'info', @@ -4455,145 +4443,6 @@ import {EventBus} from "../../../main"; } }, - handleDocumentSave(inData) { - return new Promise((resolve, reject) => { - checkProductionValidationDocument(inData) - .then(({ data }) => { - if (data) { - // 存在生产确认记录，且尚未进行过确认提示 - if (!this.confirmationPrompted) { - this.confirmationPrompted = true; // 标记已进行过确认提示 - this.askForDeleteConfirmation() - .then(confirmDelete => { - if (confirmDelete === 'true') { - this.handleDeleteAndSave(inData) - .then(confirmDelete => { - resolve(confirmDelete); - }) - .catch(() => resolve('false')); - } else { - resolve('false'); - } - }) - .catch(() => { - reject('对话框出错'); // 对话框出错处理 - }); - } else { - // 已经进行过一次确认提示，直接保存文档信息 - this.handleDeleteAndSave(inData) - .then(confirmDelete => { - resolve(confirmDelete); - }) - .catch(() => resolve('false')); - } - } else { - // 不存在生产确认记录，直接保存文档信息 - this.handleDeleteAndSave(inData) - .then(() => resolve()) - .catch(() => resolve('false')); - } - }) - .catch(error => { - console.error('检查生产确认文档出错:', error); - reject('检查生产确认文档失败'); - }); - }); - }, - - handleDeleteAndSave(inData) { - return new Promise((resolve, reject) => { - checkConfirmationRecord(inData) - .then(({ data }) => { - if (data) { - this.$confirm('该项目已经有人员进行了确认，是否删除重新推送确认信息？', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', - type: 'warning' - }) - .then(() => { - resolve('true'); - // 用户确认删除，执行删除操作 - deleteDocumentInformation(inData) - .then(() => { - this.projectAllDocumentConfirmatorList.map(item => { - let inData1 = { - site: this.proofingCurrentRow.site, - orderRef1: this.proofingCurrentRow.projectId, - orderRef2: this.proofingCurrentRow.projectPartId, - userid: item.userid, - itemNo: this.projectAllDocumentConfirmatorList.indexOf(item) + 1, - wantedConfirmDate: new Date(this.modalData.wantedConfirmDate.getTime() + 8 * 60 * 60 * 1000), - createBy: this.$store.state.user.name - }; - saveProductionValidationDocumentConfirmator(inData1); - }); - this.saveDocumentInformation(inData) - .then(() => resolve()) - .catch(() => reject()); - }) - .catch(() => reject('删除确认记录失败')); - }) - .catch(() => { - resolve('false'); - }); - } else { - deleteDocumentInformation(inData) - .then(() => { - this.projectAllDocumentConfirmatorList.map(item => { - let inData1 = { - site: this.proofingCurrentRow.site, - orderRef1: this.proofingCurrentRow.projectId, - orderRef2: this.proofingCurrentRow.projectPartId, - userid: item.userid, - itemNo: this.projectAllDocumentConfirmatorList.indexOf(item) + 1, - wantedConfirmDate: new Date(this.modalData.wantedConfirmDate.getTime() + 8 * 60 * 60 * 1000), - createBy: this.$store.state.user.name - }; - saveProductionValidationDocumentConfirmator(inData1); - }); - this.saveDocumentInformation(inData) - .then(() => resolve()) - .catch(() => reject()); - }) - .catch(() => reject('删除确认记录失败')); - } - }) - .catch(() => { - resolve('false'); - }); - }); - }, - - saveDocumentInformation(inData) { - return saveProductionValidationDocument(inData) - .then(response => { - if (response.data && response.data.code === 0) { - return Promise.resolve(); - } else { - return Promise.reject('保存文档失败'); - } - }) - .catch(() => { - return Promise.reject('保存文档失败'); - }); - }, - - askForDeleteConfirmation() { - return new Promise((resolve, reject) => { - this.$confirm('该项目已存在生产确认记录，是否删除重新推送确认信息？', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', - type: 'warning' - }) - .then(() => { - resolve('true'); - }) - .catch(() => { - resolve('false'); - }); - }); - }, - getConfirmProgressDocumentList() { let inData = {