From 849bd325118d72dc35c5c011ab71aa6108f30b42 Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:25:20 +0800 Subject: [PATCH] =?UTF-8?q?2024.8.20=20=E4=B8=80=E3=80=81=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=96=87=E6=A1=A3=E6=94=B6=E9=9B=86=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20=E4=BA=8C=E3=80=81=E5=AE=A1=E6=89=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/auth/auth.js | 19 + src/api/eam/eamProofing.js | 4 + src/views/modules/auth/authBusiness.vue | 135 +++ src/views/modules/auth/authGroup.vue | 898 ++++++++++++++++++ src/views/modules/auth/authRule.vue | 52 + .../modules/eam/com_project_proof_record.vue | 226 ++++- src/views/modules/eam/dashBoard.vue | 4 +- src/views/modules/eam/eamProjectInfo.vue | 184 +++- .../modules/eam/eamProjectInfoForConfirm.vue | 23 +- .../modules/eam/eamProjectInfoForUploads.vue | 91 +- src/views/modules/eam/eamProjectPartInfo.vue | 171 +++- 11 files changed, 1743 insertions(+), 64 deletions(-) create mode 100644 src/api/auth/auth.js create mode 100644 src/views/modules/auth/authBusiness.vue create mode 100644 src/views/modules/auth/authGroup.vue create mode 100644 src/views/modules/auth/authRule.vue diff --git a/src/api/auth/auth.js b/src/api/auth/auth.js new file mode 100644 index 0000000..f9c0903 --- /dev/null +++ b/src/api/auth/auth.js @@ -0,0 +1,19 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +export const authBusinessSearch = data => createAPI(`auth/authBusinessSearch`,'post',data) + +export const authGroupSearch = data => createAPI(`auth/authGroupSearch`,'post',data) + +export const authGroupSave = data => createAPI(`auth/authGroupSave`,'post',data) + +export const authGroupDelete = data => createAPI(`auth/authGroupDelete`,'post',data) + +export const authGroupEdit = data => createAPI(`auth/authGroupEdit`,'post',data) + +export const authGroupBusinessSearch = data => createAPI(`auth/authGroupBusinessSearch`,'post',data) + +export const getAuthGroupBusinessList = data => createAPI(`auth/getAuthGroupBusinessList`,'post',data) + +export const addAuthGroupMemberBusiness = data => createAPI(`auth/addAuthGroupMemberBusiness`,'post',data) + +export const deleteAuthGroupMemberBusiness = data => createAPI(`auth/deleteAuthGroupMemberBusiness`,'post',data) diff --git a/src/api/eam/eamProofing.js b/src/api/eam/eamProofing.js index 09ad2a4..3151c96 100644 --- a/src/api/eam/eamProofing.js +++ b/src/api/eam/eamProofing.js @@ -37,6 +37,10 @@ export const searchProjectUploadsDocumentList= data => createAPI(`/plm/proofingI export const searchProjectOverUploadsDocumentList= data => createAPI(`/plm/proofingInformation/searchProjectOverUploadsDocumentList`,'post',data) +export const searchAllProjectUploadsDocumentList= data => createAPI(`/plm/proofingInformation/searchAllProjectUploadsDocumentList`,'post',data) + export const searchConfirmProgressList= data => createAPI(`/plm/proofingInformation/searchConfirmProgressList`,'post',data) +export const searchAllConfirmProgressList= data => createAPI(`/plm/proofingInformation/searchAllConfirmProgressList`,'post',data) + export const searchOverConfirmProgressList= data => createAPI(`/plm/proofingInformation/searchOverConfirmProgressList`,'post',data) diff --git a/src/views/modules/auth/authBusiness.vue b/src/views/modules/auth/authBusiness.vue new file mode 100644 index 0000000..07cc6f3 --- /dev/null +++ b/src/views/modules/auth/authBusiness.vue @@ -0,0 +1,135 @@ + + + diff --git a/src/views/modules/auth/authGroup.vue b/src/views/modules/auth/authGroup.vue new file mode 100644 index 0000000..c5ebb08 --- /dev/null +++ b/src/views/modules/auth/authGroup.vue @@ -0,0 +1,898 @@ + + + + + + diff --git a/src/views/modules/auth/authRule.vue b/src/views/modules/auth/authRule.vue new file mode 100644 index 0000000..08a6fa5 --- /dev/null +++ b/src/views/modules/auth/authRule.vue @@ -0,0 +1,52 @@ + + + diff --git a/src/views/modules/eam/com_project_proof_record.vue b/src/views/modules/eam/com_project_proof_record.vue index e231c4e..8a54e86 100644 --- a/src/views/modules/eam/com_project_proof_record.vue +++ b/src/views/modules/eam/com_project_proof_record.vue @@ -63,13 +63,14 @@ @@ -406,6 +407,49 @@ + + + + + + + + + + + + +
+ 关闭 +
+ + { //区分请求成功和失败的状况 if (data && data.code === 0) { - this.newProofingDocument(data.proofingId) + this.newProofingDocument(data.proofingId).then(() => { + this.modalData.roleDescList = this.roleDescList + this.modalData.projectManager = this.searchData.projectManager + this.modalData.projectOwner = this.searchData.projectOwner + this.modalData.engineer = this.searchData.engineer + this.modalData.cQualityEngineer1 = this.searchData.cQualityEngineer1 + this.modalData.cQualityEngineer2 = this.searchData.cQualityEngineer2 + this.modalData.cQualityEngineer3 = this.searchData.cQualityEngineer3 + this.modalData.cManufactureEngineer = this.searchData.cManufactureEngineer this.sendMailHandle(this.modalData) this.$message({ message: '新增成功', @@ -1112,6 +1186,7 @@ //刷新表格 this.getProofingInformation() this.refreshCurrentTabTable() + }) } else { this.$message({ message: '新增失败:数据库已存在该打样单号', @@ -1174,6 +1249,21 @@ if (this.proofDocumentList[i].documentTypeId !== 'N/A') { this.proofDocumentListDefinition.push(this.proofDocumentList[i]) } + if (this.proofDocumentList[i].responsibleDepartment === 'PM/Sales'){ + this.proofDocumentList[i].projectLeader = this.searchData.projectManager.split("-")[1] + } else if(this.proofDocumentList[i].responsibleDepartment === 'PjM'){ + this.proofDocumentList[i].projectLeader = this.searchData.projectOwner.split("-")[1] + } else if(this.proofDocumentList[i].responsibleDepartment === 'Engineer'){ + this.proofDocumentList[i].projectLeader = this.searchData.engineer.split("-")[1] + } else if(this.proofDocumentList[i].responsibleDepartment === 'IPQC-Lam/Pri/Etch/Slit'){ + this.proofDocumentList[i].projectLeader = this.searchData.cQualityEngineer1.split("-")[1] + } else if(this.proofDocumentList[i].responsibleDepartment === 'IPQC-Converting'){ + this.proofDocumentList[i].projectLeader = this.searchData.cQualityEngineer2.split("-")[1] + } else if(this.proofDocumentList[i].responsibleDepartment === 'FQC'){ + this.proofDocumentList[i].projectLeader = this.searchData.cQualityEngineer3.split("-")[1] + } else if(this.proofDocumentList[i].responsibleDepartment === 'MFQ'){ + this.proofDocumentList[i].projectLeader = this.searchData.cManufactureEngineer.split("-")[1] + } } if (this.totalPage > 0) { // 设置选中行 @@ -1543,14 +1633,13 @@ }, newProofingDocument(proofingId) { this.modalData.proofingId = proofingId - proofingDocumentSave(this.modalData).then(({data}) => { - //区分请求成功和失败的状况 + return proofingDocumentSave(this.modalData).then(({ data }) => { if (data && data.code === 0) { - this.documentListVisible = false - //刷新表格 - this.refreshCurrentTabTable() + this.roleDescList = data.roleDescList; + this.documentListVisible = false; + this.refreshCurrentTabTable(); } - }) + }); }, deleteDocumentType(row) { this.$confirm('是否删除该文档清单?', '提示', { @@ -1701,9 +1790,15 @@ } }) }, + closeViewDocumentFileVisible(){ + this.viewDocumentFileVisible = false; + this.partProofingDocumentFileList = []; + }, warnSendMail(row) { row.projectPartId = this.proofDocumenCurrentRow.projectPartId row.testPartNo = this.proofDocumenCurrentRow.testPartNo + row.partDesc = this.proofDocumenCurrentRow.partDesc + row.requiredDeliveryDate = this.proofDocumenCurrentRow.requiredDeliveryDate if (this.proofDocumenCurrentRow.createBy !== this.$store.state.user.name) { this.$message({ message: '仅打样单录入人才可以发送提醒！', @@ -1735,6 +1830,117 @@ }); } }, + viewDocumentFile(row) { + let inData = { + orderRef1: row.site, + orderRef2: row.proofingId, + orderRef3: row.documentDefinitionListId, + orderRef4: row.projectId, + orderRef5: this.searchData.projectPartId, + createdBy: row.createdBy, + documentType: row.documentType, + fileName: row.fileName, + page: 1, + limit: 1000 + } + searchProjectConfirmatorFileList(inData).then(({data}) => { + if (data && data.code === 0){ + this.partProofingDocumentFileList = data.page.list; + } + }) + this.viewDocumentFileVisible = true + }, + // 查看文件 + viewFile(row) { + // 预览文件 + let image = ['jpg', 'jpeg', 'png', 'gif', 'bmp'] + let video = ['mp4', 'avi', 'mov', 'wmv', 'flv'] + let office = ['doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx'] + let txt = ['txt'] + let type = '' + let pdf = ['pdf'] + if (image.includes(row.fileType.toLowerCase())) { + type = 'image/' + row.fileType + downLoadObjectFile(row).then(({data}) => { + const blob = new Blob([data], { type: type }); + // 创建URL来生成预览 + const fileURL = URL.createObjectURL(blob); + // 在新标签页中打开文件预览 + const newTab = window.open(fileURL, '_blank') + }) + } + else if (video.includes(row.fileType.toLowerCase())) { + type = 'video/' + row.fileType + downLoadObjectFile(row).then(({data}) => { + const blob = new Blob([data], { type: type }); + // 创建URL来生成预览 + const fileURL = URL.createObjectURL(blob); + // 在新标签页中打开文件预览 + const newTab = window.open(fileURL, '_blank') + }) + } + else if (txt.includes(row.fileType.toLowerCase())) { + type = 'text/plain' + downLoadObjectFile(row).then(({data}) => { + const blob = new Blob([data], { type: type }); + // 创建URL来生成预览 + const fileURL = URL.createObjectURL(blob); + // 在新标签页中打开文件预览 + const newTab = window.open(fileURL, '_blank') + }) + } + else if (office.includes(row.fileType.toLowerCase())) { + if (row.fileType.toLowerCase() === 'doc' || row.fileType.toLowerCase() === 'docx') { + type = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' + } else if (row.fileType.toLowerCase() === 'ppt' || row.fileType.toLowerCase() === 'pptx') { + type = 'application/vnd.openxmlformats-officedocument.presentationml.presentation' + } else { + type = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' + } + downLoadObjectFile(row).then(({data}) => { + const blob = new Blob([data], { type: type }); + // 创建URL来生成预览 + const fileURL = URL.createObjectURL(blob); + // 在新标签页中打开文件预览 + const newTab = window.open(fileURL, '_blank') + }) + } + else if (pdf.includes(row.fileType.toLowerCase())) { + type = 'application/pdf' + downLoadObjectFile(row).then(({data}) => { + const blob = new Blob([data], { type: type }); + // 创建URL来生成预览 + const fileURL = URL.createObjectURL(blob); + // 在新标签页中打开文件预览 + const newTab = window.open(fileURL, '_blank') + }) + } + else { + this.$message({ + message: '不支持的文件类型', + type: 'warning' + }) + } + }, + // 下载 + downloadFile (row) { + downLoadObjectFile(row) + .then(({data}) => { + // 不限制文件下载类型 + const blob = new Blob([data], {type:'application/octet-stream;charset=utf-8'}) + // 下载文件名称 + const fileName = row.fileName + // a标签下载 + const linkNode = document.createElement('a') + linkNode.download = fileName // a标签的download属性规定下载文件的名称 + linkNode.style.display = 'none' + linkNode.href = URL.createObjectURL(blob) // 生成一个Blob URL + document.body.appendChild(linkNode) + linkNode.click() // 模拟在按钮上的一次鼠标单击 + URL.revokeObjectURL(linkNode.href) // 释放URL 对象 + document.body.removeChild(linkNode) + }) + }, } }; diff --git a/src/views/modules/eam/dashBoard.vue b/src/views/modules/eam/dashBoard.vue index 408d06d..581d2ab 100644 --- a/src/views/modules/eam/dashBoard.vue +++ b/src/views/modules/eam/dashBoard.vue @@ -3,7 +3,7 @@ -
我参与的未结项目
+
我参与的未结物料
{{ counts.unfinishedProjectsCount }}
 @@ -23,7 +23,7 @@ -
我参与的所有项目
+
我参与的所有物料
{{ counts.allProjectsCount }}
 diff --git a/src/views/modules/eam/eamProjectInfo.vue b/src/views/modules/eam/eamProjectInfo.vue index 776ec79..cc06d5c 100644 --- a/src/views/modules/eam/eamProjectInfo.vue +++ b/src/views/modules/eam/eamProjectInfo.vue @@ -171,17 +171,14 @@ - + 客户编码 （新客户） - + - - - - + @@ -730,6 +727,7 @@ import { import row from "element-ui/packages/row"; import 'moment/locale/zh-cn'; import {EventBus} from "../../../main"; +import {queryCustomerList} from "../../../api/customer/customer"; /*打样记录組件*/ export default { @@ -1754,20 +1752,6 @@ import {EventBus} from "../../../main"; trigger: ['blur','change'] } ], - customerNo:[ - { - required: true, - message: ' ', - trigger: ['blur','change'] - } - ], - customerDesc:[ - { - required: true, - message: ' ', - trigger: ['blur','change'] - } - ], testPartNo:[ { required: true, @@ -2096,6 +2080,26 @@ import {EventBus} from "../../../main"; this.newCustomerFlag = true }, + customerNoBlur(){ + let params = { + customerNo: this.modalData.customerNo, + createBy: this.$store.state.user.name, + } + queryCustomerList(params).then(({data}) => { + if (data && data.code === 0) { + if (data.rows.length === 1){ + this.modalData.customerDesc = data.rows[0].customerDesc + }else { + this.modalData.customerDesc = '' + } + }else { + this.$message.warning(data.message) + } + }).catch((error) => { + this.$message.error(error) + }) + }, + saveNewCustomer () { this.generateNextCustomerNo().then((customerNo) => { if (customerNo !== false) { @@ -2415,15 +2419,19 @@ import {EventBus} from "../../../main"; return } if (this.modalData.customerNo === '' || this.modalData.customerNo == null) { - this.$message.warning('请输入客户编码！') - return + this.modalData.customerNo = 'C0000' + this.modalData.customerDesc = '无客户' + this.modalData.finalCustomerId = this.modalData.customerNo } if (this.modalData.customerDesc === '' || this.modalData.customerDesc == null) { - this.$message.warning('请输入客户名称！') - return + this.$alert('该客户不存在，请重新输入客户编码或点击新客户添加客户!', '提示', { + confirmButtonText: '确定', + type: 'warning' + }) + return; } //请选择立项日期 - if (this.searchData.projectCreationDate === '' || this.searchData.projectCreationDate == null) { + if (this.searchData.projectCreationDate == null) { this.$message.warning('请选择立项日期！') return } @@ -2478,20 +2486,61 @@ import {EventBus} from "../../../main"; type: 'warning' }).then(() => { this.modalData.status = '草稿' + let inData = { + projectId : null, + projectNo: this.modalData.projectNo, + projectDesc: this.modalData.projectDesc, + projectCategory: this.modalData.projectCategory, + projectCloseDate: this.modalData.projectCloseDate, + needDate: this.modalData.needDate, + cProjectRegion: this.modalData.cProjectRegion, + projectManager: this.modalData.projectManager, + projectOwner: this.modalData.projectOwner, + engineer: this.modalData.engineer, + cQualityEngineer1: this.modalData.cQualityEngineer1, + cQualityEngineer2: this.modalData.cQualityEngineer2, + cQualityEngineer3: this.modalData.cQualityEngineer3, + cManufactureEngineer: this.modalData.cManufactureEngineer, + projectCreationDate: this.modalData.projectCreationDate, + createDate: this.modalData.createDate, + createBy: this.modalData.createBy, + updateBy: this.modalData.updateBy, + site: this.modalData.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, + priority: this.modalData.priority, + testPartNo: 'P000000', + partDesc: '无物料', + } eamProjectInfoSave(this.modalData).then(({data}) => { if (data && data.code === '0') { - this.getDataList() - this.modalFlag=false - EventBus.$emit('updateProjectPartInfo') - this.$message({ - message: '操作成功', - type: 'success', - duration: 1500, - onClose: () => {}, - }) - } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' + eamProjectInfoSearch(this.searchData).then(({data}) => { + if (data && data.code === 0) { + inData.projectId = data.page.list[0].projectId + eamProjectPartInfoSave(inData).then(({data}) => { + if (data && data.code === 0) { + this.getDataList() + this.modalFlag = false + EventBus.$emit('updateProjectPartInfo') + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => { + }, + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + } }) } }) @@ -2505,16 +2554,61 @@ import {EventBus} from "../../../main"; } else { this.modalData.status = '草稿' + let inData = { + projectId : null, + projectNo: this.modalData.projectNo, + projectDesc: this.modalData.projectDesc, + projectCategory: this.modalData.projectCategory, + projectCloseDate: this.modalData.projectCloseDate, + needDate: this.modalData.needDate, + cProjectRegion: this.modalData.cProjectRegion, + projectManager: this.modalData.projectManager, + projectOwner: this.modalData.projectOwner, + engineer: this.modalData.engineer, + cQualityEngineer1: this.modalData.cQualityEngineer1, + cQualityEngineer2: this.modalData.cQualityEngineer2, + cQualityEngineer3: this.modalData.cQualityEngineer3, + cManufactureEngineer: this.modalData.cManufactureEngineer, + projectCreationDate: this.modalData.projectCreationDate, + createDate: this.modalData.createDate, + createBy: this.modalData.createBy, + updateBy: this.modalData.updateBy, + site: this.modalData.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, + priority: this.modalData.priority, + testPartNo: 'P000000', + partDesc: '无物料', + } eamProjectInfoSave(this.modalData).then(({data}) => { if (data && data.code === '0') { - this.getDataList() - this.modalFlag=false - EventBus.$emit('updateProjectPartInfo') - this.$message({ - message: '操作成功', - type: 'success', - duration: 1500, - onClose: () => {}, + eamProjectInfoSearch(this.searchData).then(({data}) => { + if (data && data.code === 0) { + inData.projectId = data.page.list[0].projectId + eamProjectPartInfoSave(inData).then(({data}) => { + if (data && data.code === 0) { + this.getDataList() + this.modalFlag = false + EventBus.$emit('updateProjectPartInfo') + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => { + }, + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + } }) } else { this.$alert(data.msg, '错误', { diff --git a/src/views/modules/eam/eamProjectInfoForConfirm.vue b/src/views/modules/eam/eamProjectInfoForConfirm.vue index d8bd4c6..4647b34 100644 --- a/src/views/modules/eam/eamProjectInfoForConfirm.vue +++ b/src/views/modules/eam/eamProjectInfoForConfirm.vue @@ -254,7 +254,7 @@ import { searchProjectUploadsDocumentList, searchProjectOverUploadsDocumentList, - searchConfirmProgressList, searchOverConfirmProgressList + searchConfirmProgressList, searchOverConfirmProgressList, searchAllConfirmProgressList } from "../../../api/eam/eamProofing"; import { deleteProjectFile, @@ -829,6 +829,7 @@ export default { // 获取数据列表 getDataList () { + console.log(this.$route.query.flag) this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex if (this.$route.query.flag === '4') { @@ -849,7 +850,7 @@ export default { }) } }) - } else { + } else if (this.$route.query.flag === '3') { searchConfirmProgressList(this.searchData).then(({data}) => { if (data.code === 0) { this.dataList = data.page.list @@ -867,6 +868,24 @@ export default { }) } }) + }else { + searchAllConfirmProgressList(this.searchData).then(({data}) => { + if (data.code === 0) { + this.dataList = data.page.list + this.pageIndex = data.page.currPage + this.pageSize = data.page.pageSize + this.totalPage = data.page.totalCount + this.dataList.forEach((item) => { + item.projectManagerName = item.projectManager.split('-')[1] + item.projectOwnerName = item.projectOwner.split('-')[1] + item.engineerName = item.engineer.split('-')[1] + item.cQualityEngineer1Name = item.cQualityEngineer1.split('-')[1] + item.cQualityEngineer2Name = item.cQualityEngineer2.split('-')[1] + item.cQualityEngineer3Name = item.cQualityEngineer3.split('-')[1] + item.cManufactureEngineerName = item.cManufactureEngineer.split('-')[1] + }) + } + }) } }, diff --git a/src/views/modules/eam/eamProjectInfoForUploads.vue b/src/views/modules/eam/eamProjectInfoForUploads.vue index 2ff7733..c3d4c61 100644 --- a/src/views/modules/eam/eamProjectInfoForUploads.vue +++ b/src/views/modules/eam/eamProjectInfoForUploads.vue @@ -139,7 +139,7 @@ import { searchProjectUploadsDocumentList, searchProjectOverUploadsDocumentList, - searchConfirmProgressList, searchOverConfirmProgressList, getProofDocument + searchConfirmProgressList, searchOverConfirmProgressList, getProofDocument, searchAllProjectUploadsDocumentList } from "../../../api/eam/eamProofing"; import {searchConfirmProgressPusherList} from "../../../api/eam/eamProject"; import {getSiteAndBuByUserName} from "../../../api/qc/qc"; @@ -714,6 +714,24 @@ export default { fixed: '', columnWidth: 180, }, + { + userId: this.$store.state.user.name, + functionId: 101001014, + serialNumber: '101001014Table1ProjectLeader', + tableId: "101001014Table1", + tableName: "打样文档表", + columnProp: 'projectLeader', + 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: 101001014, @@ -961,9 +979,26 @@ export default { item.cQualityEngineer3Name = item.cQualityEngineer3.split('-')[1] item.cManufactureEngineerName = item.cManufactureEngineer.split('-')[1] }) + 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 { + }else if(this.$route.query.flag === '1') { searchProjectUploadsDocumentList(this.searchData).then(({data}) => { if (data.code === 0) { this.dataList = data.page.list @@ -979,8 +1014,60 @@ export default { item.cQualityEngineer3Name = item.cQualityEngineer3.split('-')[1] item.cManufactureEngineerName = item.cManufactureEngineer.split('-')[1] }) + 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 { + searchAllProjectUploadsDocumentList(this.searchData).then(({data}) => { + if (data.code === 0) { + this.dataList = data.page.list + this.pageIndex = data.page.currPage + this.pageSize = data.page.pageSize + this.totalPage = data.page.totalCount + this.dataList.forEach((item) => { + item.projectManagerName = item.projectManager.split('-')[1] + item.projectOwnerName = item.projectOwner.split('-')[1] + item.engineerName = item.engineer.split('-')[1] + item.cQualityEngineer1Name = item.cQualityEngineer1.split('-')[1] + item.cQualityEngineer2Name = item.cQualityEngineer2.split('-')[1] + item.cQualityEngineer3Name = item.cQualityEngineer3.split('-')[1] + item.cManufactureEngineerName = item.cManufactureEngineer.split('-')[1] + }) + 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] + } + } + } + }) } }, diff --git a/src/views/modules/eam/eamProjectPartInfo.vue b/src/views/modules/eam/eamProjectPartInfo.vue index 401bee7..06f3941 100644 --- a/src/views/modules/eam/eamProjectPartInfo.vue +++ b/src/views/modules/eam/eamProjectPartInfo.vue @@ -196,12 +196,13 @@ @@ -275,6 +276,16 @@ + + + @@ -663,6 +674,49 @@ + + + + + + + + + + + + +
+ 关闭 +
+ + { if (data && data.code === 0){ this.projectAllDocumentList = data.page.list; + for (let i = 0; i < this.projectAllDocumentList.length; i++) { + if (this.projectAllDocumentList[i].responsibleDepartment === 'PM/Sales'){ + this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.projectManager.split("-")[1] + } else if(this.projectAllDocumentList[i].responsibleDepartment === 'PjM'){ + this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.projectOwner.split("-")[1] + } else if(this.projectAllDocumentList[i].responsibleDepartment === 'Engineer'){ + this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.engineer.split("-")[1] + } else if(this.projectAllDocumentList[i].responsibleDepartment === 'IPQC-Lam/Pri/Etch/Slit'){ + this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer1.split("-")[1] + } else if(this.projectAllDocumentList[i].responsibleDepartment === 'IPQC-Converting'){ + this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer2.split("-")[1] + } else if(this.projectAllDocumentList[i].responsibleDepartment === 'FQC'){ + this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer3.split("-")[1] + } else if(this.projectAllDocumentList[i].responsibleDepartment === 'MFQ'){ + this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.cManufactureEngineer.split("-")[1] + } + } } }) }, @@ -3231,7 +3366,9 @@ import {EventBus} from "../../../main"; 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 @@ -3629,6 +3766,10 @@ import {EventBus} from "../../../main"; this.viewDocumentFileVisible = false; this.projectConfirmatorFileList = []; }, + closeViewMassDocumentFileVisible(){ + this.viewMassDocumentFileVisible = false; + this.projectConfirmatorFileList = []; + }, viewDocumentFile(row) { this.confirmData = { site: row.site, @@ -3654,6 +3795,7 @@ import {EventBus} from "../../../main"; orderRef3: row.userid, orderRef4: row.orderRef1, orderRef5: row.orderRef2, + id : row.documentId, page: 1, limit: 1000 } @@ -3664,6 +3806,27 @@ import {EventBus} from "../../../main"; }) this.viewDocumentFileVisible = true }, + viewMassDocumentFile(row) { + let inData = { + orderRef1: row.site, + orderRef2: row.proofingId, + orderRef3: row.documentDefinitionListId, + orderRef4: row.projectId, + orderRef5: this.proofingCurrentRow.projectPartId, + createdBy: row.createdBy, + id : row.documentId, + documentType: row.documentType, + fileName: row.fileName, + page: 1, + limit: 1000 + } + searchProjectConfirmatorFileList(inData).then(({data}) => { + if (data && data.code === 0){ + this.projectConfirmatorFileList = data.page.list; + } + }) + this.viewMassDocumentFileVisible = true + }, deleteFile(row) { if (this.confirmData.confirmedBy === this.$store.state.user.userDisplay) { this.$confirm('是否删除该文件?', '提示', { @@ -3886,6 +4049,8 @@ import {EventBus} from "../../../main"; warnSendMail(row) { row.projectPartId = this.proofingCurrentRow.projectPartId row.testPartNo = this.proofingCurrentRow.testPartNo + row.partDesc = this.proofingCurrentRow.partDesc + row.needDate = this.proofingCurrentRow.needDate this.$confirm('确认发送提醒?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消',