diff --git a/src/views/modules/rohs/rohsRecord.vue b/src/views/modules/rohs/rohsRecord.vue index 224f454..31caa19 100644 --- a/src/views/modules/rohs/rohsRecord.vue +++ b/src/views/modules/rohs/rohsRecord.vue @@ -969,7 +969,6 @@ export default { fileList: [], approvalList: [], plmRohsAuthorityArr: [], - plmRohsMaterialAuthorityArr: [], nodeAuthorityLoaded: false, modalTitle: 'RoHs 新增', activeName: 'basicInfo', @@ -1059,7 +1058,6 @@ export default { loadNodeAuthority (site, stepId) { if (!site || stepId === null || stepId === undefined || !this.menuId) { this.plmRohsAuthorityArr = [] - this.plmRohsMaterialAuthorityArr = [] this.nodeAuthorityLoaded = true return Promise.resolve() } @@ -1072,15 +1070,12 @@ export default { return api.getRohsNodeAuthority(params).then(({data}) => { if (data && data.code === 0 && data.rows) { this.plmRohsAuthorityArr = data.rows.plm_rohs || [] - this.plmRohsMaterialAuthorityArr = data.rows.plm_rohs_material || [] } else { this.plmRohsAuthorityArr = [] - this.plmRohsMaterialAuthorityArr = [] } this.nodeAuthorityLoaded = true }).catch(() => { this.plmRohsAuthorityArr = [] - this.plmRohsMaterialAuthorityArr = [] this.nodeAuthorityLoaded = true }) }, @@ -1091,18 +1086,11 @@ export default { let target = this.plmRohsAuthorityArr.find(item => item.fieldId === fieldId) return target ? target.updateFlag : 'N' }, - rohsMaterialFieldFlag (fieldId) { - if (!this.plmRohsMaterialAuthorityArr || this.plmRohsMaterialAuthorityArr.length === 0) { - return 'N' - } - let target = this.plmRohsMaterialAuthorityArr.find(item => item.fieldId === fieldId) - return target ? target.updateFlag : 'N' - }, isRohsFieldDisabled (fieldId) { return this.showModalFlag || this.rohsFieldFlag(fieldId) === 'N' }, canEditRohsMaterial () { - return !this.showModalFlag && this.rohsMaterialFieldFlag('testPartNo') !== 'N' + return !this.showModalFlag }, getRohsSubmitFieldValue (fieldId) { const fieldMapping = { @@ -1140,22 +1128,6 @@ export default { } } - const requiredMaterialFields = (this.plmRohsMaterialAuthorityArr || []).filter(item => item.required === 'Y') - if (requiredMaterialFields.length > 0) { - const materialList = Array.isArray(this.modalData.materialList) ? this.modalData.materialList : [] - if (materialList.length === 0) { - this.$message.warning('材料信息不能为空!') - return false - } - for (let i = 0; i < requiredMaterialFields.length; i++) { - const fieldConfig = requiredMaterialFields[i] - const valid = materialList.every(item => !this.isSubmitFieldEmpty(item[fieldConfig.fieldId])) - if (!valid) { - this.$message.warning((fieldConfig.fieldName || fieldConfig.fieldId) + '不能为空!') - return false - } - } - } return true }, materialDialogHeaderCellStyle () { @@ -1426,7 +1398,6 @@ export default { this.projectMaterialSelections = [] this.materialSelections = [] this.plmRohsAuthorityArr = [] - this.plmRohsMaterialAuthorityArr = [] this.nodeAuthorityLoaded = false this.projectMaterialPageIndex = 1 this.projectMaterialTotal = 0 @@ -1618,10 +1589,17 @@ export default { if (!this.validateSubmitRequiredFields()) { return } + const submitMaterialList = this.normalizeMaterialListForSave(this.modalData.materialList || []) this.submitLoading = true let params = { + ...this.modalData, site: this.modalData.site, referenceNo: this.modalData.referenceNo, + materialClassify: (this.modalData.materialClassifyList || []).join(';'), + qualificationDocumentsNeeded: (this.modalData.qualificationDocumentsNeededList || []).join(';'), + testReportIncludingItems: (this.modalData.testReportIncludingItemsList || []).join(';'), + materialList: submitMaterialList, + ifsPartNo: submitMaterialList.length > 0 ? submitMaterialList[0].testPartNo : '', nodeConclusion: nodeConclusion, rejectOpinion: nodeConclusion === 'N' ? this.rejectOpinion : '', menuId: this.menuId, @@ -1672,7 +1650,7 @@ export default { }, openProjectMaterialDialog () { if (!this.canEditRohsMaterial()) { - this.$message.warning('当前节点无材料编辑权限') + this.$message.warning('当前状态不允许编辑材料') return } if (!this.modalData.projectId) { @@ -1740,7 +1718,7 @@ export default { }, confirmProjectMaterialSelection () { if (!this.canEditRohsMaterial()) { - this.$message.warning('当前节点无材料编辑权限') + this.$message.warning('当前状态不允许编辑材料') return } if (!this.projectMaterialSelections || this.projectMaterialSelections.length === 0) { @@ -1843,7 +1821,7 @@ export default { }, removeSelectedMaterialRows () { if (!this.canEditRohsMaterial()) { - this.$message.warning('当前节点无材料编辑权限') + this.$message.warning('当前状态不允许编辑材料') return } if (!this.materialSelections || this.materialSelections.length === 0) {