diff --git a/src/api/eam/eamProject.js b/src/api/eam/eamProject.js index fc2012a..34edd44 100644 --- a/src/api/eam/eamProject.js +++ b/src/api/eam/eamProject.js @@ -21,3 +21,4 @@ export const deleteProjectFile= data => createAPI(`/base/deleteProjectFile`,'pos 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) +export const agencyMatter= data => createAPI(`/pms/agencyMatter/project-counts`,'post',data) diff --git a/src/api/eam/eamProofing.js b/src/api/eam/eamProofing.js index 0833b52..09ad2a4 100644 --- a/src/api/eam/eamProofing.js +++ b/src/api/eam/eamProofing.js @@ -1,4 +1,5 @@ import { createAPI } from "@/utils/httpRequest.js"; + //---------------打样信息------------------- export const proofingInformationSearch= data => createAPI(`plm/proofingInformation/proofingInformationSearch`,'post',data) @@ -14,9 +15,9 @@ export const getProofDocument= data => createAPI(`/plm/proofingInformation/getPr export const deleteDocumentType= data => createAPI(`/plm/proofingInformation/deleteDocumentType`,'post',data) //proofingDocumentSave -export const proofingDocumentSave= data => createAPI(`/plm/proofingInformation/proofingDocumentSave`,'post',data) +export const proofingDocumentSave = data => createAPI(`/plm/proofingInformation/proofingDocumentSave`,'post',data) //editProofingRecord -export const editProofingRecord= data => createAPI(`/plm/proofingInformation/editProofingRecord`,'post',data) +export const editProofingRecord = data => createAPI(`/plm/proofingInformation/editProofingRecord`,'post',data) //getExtraDocumentList export const getExtraDocumentList= data => createAPI(`/plm/proofingInformation/getExtraDocumentList`,'post',data) //proofingDocumentNEW @@ -31,3 +32,11 @@ export const editProjectDocument= data => createAPI(`/plm/proofingInformation/ed export const searchProjectAllDocument= data => createAPI(`/plm/proofingInformation/searchProjectAllDocument`,'post',data) export const deleteProofDocument= data => createAPI(`/plm/proofingInformation/deleteProofDocument`,'post',data) + +export const searchProjectUploadsDocumentList= data => createAPI(`/plm/proofingInformation/searchProjectUploadsDocumentList`,'post',data) + +export const searchProjectOverUploadsDocumentList= data => createAPI(`/plm/proofingInformation/searchProjectOverUploadsDocumentList`,'post',data) + +export const searchConfirmProgressList= data => createAPI(`/plm/proofingInformation/searchConfirmProgressList`,'post',data) + +export const searchOverConfirmProgressList= data => createAPI(`/plm/proofingInformation/searchOverConfirmProgressList`,'post',data) diff --git a/src/main.js b/src/main.js index 61fe2cd..30afa59 100644 --- a/src/main.js +++ b/src/main.js @@ -31,6 +31,7 @@ Vue.component('downloadExcel', JsonExcel) Vue.use(VueCookie) Vue.config.productionTip = false Vue.component('selectDiv', selectDiv); +export const EventBus = new Vue(); Vue.use(Viewer) diff --git a/src/views/modules/eam/dashBoard.vue b/src/views/modules/eam/dashBoard.vue new file mode 100644 index 0000000..bffba13 --- /dev/null +++ b/src/views/modules/eam/dashBoard.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/src/views/modules/eam/eamBuDocumentListDefinition.vue b/src/views/modules/eam/eamBuDocumentListDefinition.vue index e187efe..d0d3a98 100644 --- a/src/views/modules/eam/eamBuDocumentListDefinition.vue +++ b/src/views/modules/eam/eamBuDocumentListDefinition.vue @@ -202,6 +202,7 @@ getTableDefaultListLanguage, getTableUserListLanguage, } from "@/api/table.js" + import {EventBus} from "../../../main"; export default { components: { @@ -584,6 +585,9 @@ this.$nextTick(() => { this.height = window.innerHeight - 210 }) + EventBus.$on('updateBuDocumentList', () => { + this.getDataList(); + }); }, created () { @@ -599,6 +603,7 @@ // 获取数据列表 this.getDataList() } + this.$refs.eamDocumentTypeDefinition.$on('getDataList', this.getDataList) }, methods: { @@ -872,6 +877,7 @@ // 向后端发送保存请求的逻辑 eamBuDocumentEdit(this.modalData).then(({data}) => { if (data && data.code === '0') { + EventBus.$emit('updateProjectInfo'); this.getDataList() this.modalFlag=false this.disableButton = false diff --git a/src/views/modules/eam/eamDocumentTypeDefinition.vue b/src/views/modules/eam/eamDocumentTypeDefinition.vue index e79d070..75c0108 100644 --- a/src/views/modules/eam/eamDocumentTypeDefinition.vue +++ b/src/views/modules/eam/eamDocumentTypeDefinition.vue @@ -156,6 +156,7 @@ getTableDefaultListLanguage, getTableUserListLanguage, } from "@/api/table.js" + import {EventBus} from "../../../main"; export default { watch: { searchData: { @@ -669,6 +670,9 @@ } else { eamDocumentTypeEdit(this.modalData).then(({data}) => { if (data && data.code === '0') { + // 成功操作后触发事件 + EventBus.$emit('updateProjectInfo'); + EventBus.$emit('updateBuDocumentList'); this.getDataList() this.modalFlag=false this.$message({ diff --git a/src/views/modules/eam/eamProjectInfo.vue b/src/views/modules/eam/eamProjectInfo.vue index 7d28b0d..aa6ccc0 100644 --- a/src/views/modules/eam/eamProjectInfo.vue +++ b/src/views/modules/eam/eamProjectInfo.vue @@ -1259,6 +1259,7 @@ import row from "element-ui/packages/row"; import moment from 'moment'; import 'moment/locale/zh-cn'; import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; +import {EventBus} from "../../../main"; /*打样记录組件*/ export default { @@ -2414,6 +2415,20 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; trigger: ['blur','change'] } ], + cQualityEngineer3:[ + { + required: true, + message: ' ', + trigger: ['blur','change'] + } + ], + cManufactureEngineer:[ + { + required: true, + message: ' ', + trigger: ['blur','change'] + } + ], projectManagerName:[ { required: true, @@ -2442,6 +2457,20 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; trigger: ['blur','change'] } ], + cQualityEngineer3Name:[ + { + required: true, + message: ' ', + trigger: ['blur','change'] + } + ], + cManufactureEngineerName:[ + { + required: true, + message: ' ', + trigger: ['blur','change'] + } + ], projectCategoryType:[ { required: true, @@ -2589,6 +2618,10 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; this.$nextTick(() => { this.height = window.innerHeight - 558 }) + EventBus.$on('updateProjectInfo', () => { + this.getDataList(); + }); + }, created () { @@ -2606,6 +2639,13 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; } }, + activated() { + if (this.$route.query.projectId) { + this.searchData.projectId = this.$route.query.projectId; + this.getDataList(); + } + }, + methods: { // 获取用户的bu getSiteAndBuByUserName () { @@ -3172,7 +3212,23 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; duration: 1500, onClose: () => {}, }) - this.newProjectDocument(this.modalData) + let inData={ + site: this.modalData.site, + buNo: this.modalData.bu.split('_')[1], + projectId: this.modalData.projectId, + projectDesc: this.modalData.projectDesc, + customerNo: this.modalData.customerNo, + customerDesc: this.modalData.customerDesc, + bu: this.modalData.bu, + testPartNo: this.modalData.testPartNo, + partDesc: this.modalData.partDesc, + projectCategory: this.modalData.projectCategory, + cProjectTypeDb: this.modalData.projectCategory, + proofingNo: '', + rrequiredDeliveryDate: '', + createBy: this.$store.state.user.name, + } + this.newProjectDocument(inData) } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -3218,10 +3274,10 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; } }) }, - newProjectDocument(modalData) { - modalData.buNo = modalData.bu.split('_')[1] - modalData.proofingNo = '*' - projectDocumentSave(modalData).then(({data}) => { + newProjectDocument(inData) { + inData.buNo = inData.bu.split('_')[1] + inData.proofingNo = '*' + projectDocumentSave(inData).then(({data}) => { //区分请求成功和失败的状况 if (data && data.code === 0) { this.$message({ diff --git a/src/views/modules/eam/eamProjectInfoForConfirm.vue b/src/views/modules/eam/eamProjectInfoForConfirm.vue new file mode 100644 index 0000000..b74d0eb --- /dev/null +++ b/src/views/modules/eam/eamProjectInfoForConfirm.vue @@ -0,0 +1,152 @@ + + + + + diff --git a/src/views/modules/eam/eamProjectInfoForUploads.vue b/src/views/modules/eam/eamProjectInfoForUploads.vue new file mode 100644 index 0000000..4cb1d65 --- /dev/null +++ b/src/views/modules/eam/eamProjectInfoForUploads.vue @@ -0,0 +1,306 @@ + + + + +