diff --git a/src/api/rohs/rohs.js b/src/api/rohs/rohs.js index d4774fa..1edc79f 100644 --- a/src/api/rohs/rohs.js +++ b/src/api/rohs/rohs.js @@ -15,7 +15,7 @@ export const saveRohs = data => createAPI(`/rohs/save`, 'post', data); // 修改 export const updateRohs = data => createAPI(`/rohs/update`, 'post', data); -// 仅更新RoHs备注(不受流程节点和状态限制) +// 仅更新备注说明(不受流程节点和状态限制) export const updateRohsRemark = data => createAPI(`/rohs/updateRemark`, 'post', data); // 仅保存材料明细(编辑时即时保存) diff --git a/src/views/modules/rohs/rohsRecord.vue b/src/views/modules/rohs/rohsRecord.vue index 85c4db8..c1d10ed 100644 --- a/src/views/modules/rohs/rohsRecord.vue +++ b/src/views/modules/rohs/rohsRecord.vue @@ -255,9 +255,6 @@ - - RoHs备注 - @@ -282,7 +279,15 @@ - + + @@ -614,10 +619,10 @@ - + { if (data && data.code === 0 && data.data) { - this.$set(this.rohsRemarkForm, 'rohsRemark', data.data.rohsRemark || '') + this.$set(this.rohsRemarkForm, 'remark', data.data.remark || '') } else { this.$message.error((data && data.msg) || '刷新失败') } @@ -1594,9 +1598,9 @@ export default { }) }, saveRohsRemark () { - const rohsRemark = this.rohsRemarkForm.rohsRemark || '' + const remark = this.rohsRemarkForm.remark || '' if (!this.hasPersistedRohsRecord()) { - this.$set(this.modalData, 'rohsRemark', rohsRemark) + this.$set(this.modalData, 'remark', remark) this.rohsRemarkFlag = false this.$message.success('暂存成功,保存单据后写入数据库') return @@ -1604,17 +1608,17 @@ export default { const params = { site: this.modalData.site, referenceNo: this.modalData.referenceNo, - rohsRemark: rohsRemark + remark: remark } api.updateRohsRemark(params).then(({data}) => { if (data && data.code === 0) { - this.$set(this.modalData, 'rohsRemark', rohsRemark) + this.$set(this.modalData, 'remark', remark) if (this.currentRow && this.currentRow.site === this.modalData.site && this.currentRow.referenceNo === this.modalData.referenceNo) { - this.$set(this.currentRow, 'rohsRemark', rohsRemark) + this.$set(this.currentRow, 'remark', remark) } const target = (this.dataList || []).find(item => item.site === this.modalData.site && item.referenceNo === this.modalData.referenceNo) if (target) { - this.$set(target, 'rohsRemark', rohsRemark) + this.$set(target, 'remark', remark) } this.rohsRemarkFlag = false this.$message.success('操作成功') @@ -1867,7 +1871,7 @@ export default { this.rohsRemarkFlag = false this.rejectOpinion = '' this.rohsRemarkForm = { - rohsRemark: '' + remark: '' } this.projectMaterialDialogFlag = false this.projectMaterialSelections = [] @@ -1973,7 +1977,6 @@ export default { testReportIncludingItems: '', testReportIncludingItemsList: [], remark: '', - rohsRemark: '', status: '草稿', sgsReportNumber: '', expiredDate: '',