From c9c7065fa1a5cfc325480276c119d4af4bf5e2d7 Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Fri, 19 Jul 2024 17:06:57 +0800 Subject: [PATCH] =?UTF-8?q?2024.7.19=20=E4=BA=A7=E5=93=81=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=94=B6=E9=9B=86-=E9=A1=B9=E7=9B=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=BF=9B=E4=B8=80=E6=AD=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/eamProject.js | 3 + src/api/factory/site.js | 3 + src/views/modules/common/uploadFileList1.vue | 10 +- .../modules/eam/com_project_proof_record.vue | 64 ++- .../eam/eamBuDocumentListDefinition.vue | 5 +- .../modules/eam/eamDocumentTypeDefinition.vue | 35 +- src/views/modules/eam/eamProjectInfo.vue | 418 +++++++++++++----- 7 files changed, 387 insertions(+), 151 deletions(-) diff --git a/src/api/eam/eamProject.js b/src/api/eam/eamProject.js index 06f7f7b..fc2012a 100644 --- a/src/api/eam/eamProject.js +++ b/src/api/eam/eamProject.js @@ -18,3 +18,6 @@ export const uploadProjectFile= data => createAPI(`/base/uploadProjectFile`,'pos export const updateProjectDocumentConfirm= data => createAPI(`/pms/eamProject/updateProjectDocumentConfirm`,'post',data) export const searchProjectConfirmatorFileList= data => createAPI(`/pms/eamProject/searchProjectConfirmatorFileList`,'post',data) export const deleteProjectFile= data => createAPI(`/base/deleteProjectFile`,'post',data) +export const sendMailHandle= data => createAPI(`/pms/eamProject/sendMailHandle`,'post',data) +export const warnSendMailHandle= data => createAPI(`/pms/eamProject/warnSendMailHandle`,'post',data) +export const confirmatorSendMailHandle= data => createAPI(`/pms/eamProject/confirmatorSendMailHandle`,'post',data) diff --git a/src/api/factory/site.js b/src/api/factory/site.js index faf073e..713d9b4 100644 --- a/src/api/factory/site.js +++ b/src/api/factory/site.js @@ -46,3 +46,6 @@ export const searchBusinessInfo4 = data => createAPI(`/site/searchBusinessInfo4` export const searchBusinessInfo5 = data => createAPI(`/site/searchBusinessInfo5`,'post',data) export const searchBusinessInfo6 = data => createAPI(`/site/searchBusinessInfo6`,'post',data) + +export const getResponsibleDepartment = data => createAPI(`/site/getResponsibleDepartment`,'post',data) + diff --git a/src/views/modules/common/uploadFileList1.vue b/src/views/modules/common/uploadFileList1.vue index af11aac..c52718b 100644 --- a/src/views/modules/common/uploadFileList1.vue +++ b/src/views/modules/common/uploadFileList1.vue @@ -117,16 +117,16 @@ export default { { required: true, message: ' ', - trigger: ['blur', 'change'] + trigger: ['blur'] } ], - conclusion: [ + conclusion:[ { required: true, message: ' ', - trigger: ['blur', 'change'] + trigger: ['blur'] } - ] + ], } } }, @@ -389,7 +389,7 @@ export default { - + 点击选择文件 diff --git a/src/views/modules/eam/com_project_proof_record.vue b/src/views/modules/eam/com_project_proof_record.vue index d0a9067..0e7c454 100644 --- a/src/views/modules/eam/com_project_proof_record.vue +++ b/src/views/modules/eam/com_project_proof_record.vue @@ -68,7 +68,7 @@ label="操作"> @@ -431,6 +431,9 @@ import UploadFileList1 from "../common/uploadFileList1.vue"; import he from "element-ui/src/locale/lang/he"; import {deleteProofDocument} from "../../../api/eam/eamProofing"; + import {sendMailHandle, warnSendMailHandle} from "../../../api/eam/eamProject"; + import moment from 'moment'; + import 'moment/locale/zh-cn'; export default { computed: { he() { @@ -1095,6 +1098,7 @@ //刷新表格 this.getProofingInformation() this.refreshCurrentTabTable() + this.sendMailHandle(this.modalData) } else { this.$message({ message: '新增失败:数据库已存在该打样单号', @@ -1148,6 +1152,12 @@ for (let i = 0; i < this.proofDocumentList.length; i++) { this.proofDocumentList[i].buNo = this.proofDocumenCurrentRow.buNo } + this.proofDocumentListDefinition = [] + for (let i = 0; i < this.proofDocumentList.length; i++) { + if (this.proofDocumentList[i].documentTypeId !== 'N/A') { + this.proofDocumentListDefinition.push(this.proofDocumentList[i]) + } + } if (this.totalPage > 0) { // 设置选中行 this.$refs.proofDocumentTable.setCurrentRow(this.proofDocumentList[0]) @@ -1204,11 +1214,6 @@ } this.documentTypeData.proofingNo = row.proofingNo // 遍历proofDocumentList - for (let i = 0; i < this.proofDocumentList.length; i++) { - if (this.proofDocumentList[i].documentTypeId !== 'N/A') { - this.proofDocumentListDefinition.push(this.proofDocumentList[i]) - } - } }, updateProofingRecord(row) { this.proofingRecordVisible = true @@ -1291,7 +1296,7 @@ projectId: this.modalData.projectId, proofingNo: this.modalData.proofingNo, planStartDate: this.modalData.planStartDate, - requiredDeliveryDate: this.modalData.requiredDeliveryDate, + requiredDeliveryDate: moment(this.modalData.requiredDeliveryDate).utcOffset('+8').format('YYYY-MM-DD'), actualityDeliveryDate: this.modalData.actualityDeliveryDate, proofingNumber: this.modalData.proofingNumber, proofDocumentDataList: this.proofDocumentList, @@ -1343,7 +1348,6 @@ type: 'warning' }).then(() => { deleteProofingRecord(tempData).then(({data}) => { - console.log(data) if (data && data.code === 0) { this.$message({ message: '删除成功', @@ -1638,7 +1642,49 @@ id: '-1' }; this.uploadDialog = true - } + }, + sendMailHandle(row) { + sendMailHandle(row).then(({data}) => { + if (data && data.code === 0) { + this.$message({ + message: '发送成功', + type: 'success' + }) + } else { + this.$message.warning(data.msg) + } + }) + }, + warnSendMail(row) { + if (this.proofDocumenCurrentRow.createBy !== this.$store.state.user.name) { + this.$message({ + message: '仅打样单录入人才可以发送提醒！', + type: 'warning' + }) + } else { + this.$confirm('确认发送提醒?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + warnSendMailHandle(row).then(({data}) => { + if (data && data.code === 0) { + this.$message({ + message: '发送成功', + type: 'success' + }) + } else { + this.$message.warning(data.msg) + } + }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消发送' + }); + }); + } + }, } }; diff --git a/src/views/modules/eam/eamBuDocumentListDefinition.vue b/src/views/modules/eam/eamBuDocumentListDefinition.vue index aaca8a6..e187efe 100644 --- a/src/views/modules/eam/eamBuDocumentListDefinition.vue +++ b/src/views/modules/eam/eamBuDocumentListDefinition.vue @@ -716,6 +716,9 @@ this.pageIndex = data.page.currPage this.pageSize = data.page.pageSize this.totalPage = data.page.totalCount + for (let i = 0; i < this.dataList.length; i++) { + this.dataList[i].responsibleDepartment = this.dataList[i].roleDesc + } } }) }, @@ -785,8 +788,6 @@ createBy: this.modalData.createBy, updateBy: this.modalData.updateBy, } - console.log("modalCompareData",this.modalCompareData) - console.log("modalData",this.modalData) this.disableButton = true this.modalDisableFlag = true this.modalFlag = true diff --git a/src/views/modules/eam/eamDocumentTypeDefinition.vue b/src/views/modules/eam/eamDocumentTypeDefinition.vue index 34f97ec..e79d070 100644 --- a/src/views/modules/eam/eamDocumentTypeDefinition.vue +++ b/src/views/modules/eam/eamDocumentTypeDefinition.vue @@ -119,9 +119,9 @@ + :key = "i.roleNo" + :label = "i.roleDesc" + :value = "i.roleNo"> @@ -148,6 +148,9 @@ eamDocumentTypeDelete, // getSiteAndBuByUserName } from "@/api/eam/eam.js" + import { + getResponsibleDepartment + } from "@/api/factory/site.js" import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' import { getTableDefaultListLanguage, @@ -190,17 +193,7 @@ page: 1, limit: 10, }, - responsibleDepartmentList: [ - { - responsibleDepartment: '工程师', - }, - { - responsibleDepartment: 'PM', - }, - { - responsibleDepartment: '质量', - } - ], + responsibleDepartmentList: [], height: 200, pageIndex: 1, pageSize: 20, @@ -547,6 +540,9 @@ this.pageIndex = data.page.currPage this.pageSize = data.page.pageSize this.totalPage = data.page.totalCount + for (let i = 0; i < this.dataList.length; i++) { + this.dataList[i].responsibleDepartment = this.dataList[i].roleDesc + } } }) }, @@ -579,6 +575,7 @@ createBy: this.$store.state.user.name, updateBy: this.$store.state.user.name, } + this.getResponsibleDepartment() this.modalDisableFlag = false this.modalFlag = true }, @@ -596,6 +593,7 @@ createBy: this.$store.state.user.name, updateBy: this.$store.state.user.name, } + this.getResponsibleDepartment() this.modalDisableFlag = true this.modalFlag = true }, @@ -687,7 +685,14 @@ }) } }, - + getResponsibleDepartment() { + this.modalData.site = this.$store.state.user.site + getResponsibleDepartment(this.modalData).then(({data}) => { + if (data.code === 0) { + this.responsibleDepartmentList = data.rows + } + }) + }, // 动态列开始 获取 用户保存的 格式列 async getTableUserColumn(tableId, columnId) { let queryTableUser = { diff --git a/src/views/modules/eam/eamProjectInfo.vue b/src/views/modules/eam/eamProjectInfo.vue index 594a428..7d28b0d 100644 --- a/src/views/modules/eam/eamProjectInfo.vue +++ b/src/views/modules/eam/eamProjectInfo.vue @@ -107,13 +107,15 @@ fixed="right" header-align="center" align="center" - width="178" + width="208" label="操作"> @@ -738,7 +740,7 @@ label="操作"> @@ -777,16 +779,6 @@ @row-click="projectAllDocumentClickRow" :row-style="rowStyle" v-loading="dataListLoading"> - - -