diff --git a/src/api/qc/qc_report.js b/src/api/qc/qc_report.js index cc3876a..a1918f9 100644 --- a/src/api/qc/qc_report.js +++ b/src/api/qc/qc_report.js @@ -47,6 +47,17 @@ export const getPropertiesItemList = data => createAPI('/pms/qcReport/getPropert // 物料属性实际值(选检验单后按 site+partNo+codeNo 查询,回填结果列) export const getPartPropertiesValue = data => createAPI('/pms/qcReport/getPartPropertiesValue','post',data) +export const saveQmsPropertiesItem = data => createAPI('/pms/qcReport/saveQmsPropertiesItem','post',data) +export const updateQmsPropertiesItem = data => createAPI('/pms/qcReport/updateQmsPropertiesItem','post',data) +export const deleteQmsPropertiesItem = data => createAPI('/pms/qcReport/deleteQmsPropertiesItem','post',data) +export const saveQmsPropertiesHeader = data => createAPI('/pms/qcReport/saveQmsPropertiesHeader','post',data) +export const updateQmsPropertiesHeader = data => createAPI('/pms/qcReport/updateQmsPropertiesHeader','post',data) +export const deleteQmsPropertiesHeader = data => createAPI('/pms/qcReport/deleteQmsPropertiesHeader','post',data) +export const saveQmsPropertiesDetail = data => createAPI('/pms/qcReport/saveQmsPropertiesDetail','post',data) +export const updateQmsPropertiesDetail = data => createAPI('/pms/qcReport/updateQmsPropertiesDetail','post',data) +export const saveQmsPropertiesDetailList = data => createAPI('/pms/qcReport/saveQmsPropertiesDetailList','post',data) +export const deleteQmsPropertiesDetail = data => createAPI('/pms/qcReport/deleteQmsPropertiesDetail','post',data) + // SPC 过程能力报表 export const getSpcMaterials = data => createAPI('/pms/qcReport/getSpcMaterials', 'post', data) export const getSpcInspectionItems = data => createAPI('/pms/qcReport/getSpcInspectionItems', 'post', data) diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index 7ba26d3..5468751 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -161,6 +161,7 @@ + @@ -531,7 +532,8 @@ 分批保存 关闭 - 最终检验完成 + 临时放行 + 最终检验完成 @@ -1620,6 +1622,60 @@ fixed: '', columnWidth: 200, }, + { + userId: this.$store.state.user.name, + functionId: 301015, + serialNumber: '301015Table1ReleaseFlag', + tableId: "301015Table1", + tableName: "FQC检验记录表", + columnProp: 'releaseFlag', + headerAlign: "center", + align: "center", + columnLabel: '放行标识', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 90, + }, + { + userId: this.$store.state.user.name, + functionId: 301015, + serialNumber: '301015Table1ReleaseTime', + tableId: "301015Table1", + tableName: "FQC检验记录表", + columnProp: 'releaseTime', + headerAlign: "center", + align: "center", + columnLabel: '放行时间', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150, + }, + { + userId: this.$store.state.user.name, + functionId: 301015, + serialNumber: '301015Table1ReleaseByName', + tableId: "301015Table1", + tableName: "FQC检验记录表", + columnProp: 'releaseByName', + headerAlign: "center", + align: "center", + columnLabel: '放行人', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100, + }, ], //项目清单 detailData: { @@ -1649,6 +1705,7 @@ responsiblePerson: '', responsiblePersonName: '', state: '', + releaseFlag: 'N', passQty: '', notPassQty: '', batchQualifiedQty: '' @@ -3543,6 +3600,13 @@ }) return false } + const releasedNos = this.FAISelections.filter(item => item.releaseFlag === 'Y').map(item => item.inspectionNo) + if (releasedNos.length > 0) { + this.$alert('检验单号 ' + releasedNos.join('、') + ' 已临时放行,不允许删除,请先取消审核!', '提示', { + confirmButtonText: '确定' + }) + return false + } this.$confirm(`是否删除该 `+ this.FAISelections.length +` 条检验记录?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -3596,7 +3660,7 @@ }, Transfer (type) { - if (type === '2') { + if (type === '2' || type === '3') { if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) { this.$message.warning('请选择检验结论!') return @@ -3777,6 +3841,7 @@ this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePersonName = row.responsiblePersonName this.detailData.state = row.state + this.detailData.releaseFlag = row.releaseFlag || 'N' if (row.state === '待检验') { this.detailData.passQty = row.samplingQty } else { @@ -3897,7 +3962,7 @@ return } for (let i = 0; i < this.FAISelections.length; i++) { - if (this.FAISelections[i].state !== '已完成') { + if (this.FAISelections[i].state !== '已完成' && this.FAISelections[i].releaseFlag !== 'Y') { tempData1 = tempData1 + this.FAISelections[i].inspectionNo + '、' } } @@ -4237,6 +4302,37 @@ return s }, + appendReleaseColumns () { + const extras = [ + { columnProp: 'releaseFlag', columnLabel: '放行标识', columnWidth: 90 }, + { columnProp: 'releaseTime', columnLabel: '放行时间', columnWidth: 150 }, + { columnProp: 'releaseByName', columnLabel: '放行人', columnWidth: 100 } + ] + extras.forEach(extra => { + if (this.columnList1.some(item => item.columnProp === extra.columnProp)) { + return + } + this.columnList1.push({ + userId: this.$store.state.user.name, + functionId: 301015, + serialNumber: '301015Table1' + extra.columnProp, + tableId: '301015Table1', + tableName: 'FQC检验记录表', + columnProp: extra.columnProp, + headerAlign: 'center', + align: 'center', + columnLabel: extra.columnLabel, + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: extra.columnWidth + }) + }) + }, + // 动态列开始 获取 用户保存的 格式列 async getTableUserColumn (tableId, columnId) { let queryTableUser = { @@ -4252,6 +4348,7 @@ switch (columnId) { case 1: this.columnList1 = data.rows + this.appendReleaseColumns() this.showDefault = false break; case 2: @@ -4282,6 +4379,7 @@ switch (columnId) { case 1: this.columnList1 = data.rows + this.appendReleaseColumns() this.showDefault = false break; case 2: diff --git a/src/views/modules/qc/qcItem.vue b/src/views/modules/qc/qcItem.vue index 53342ac..34dc3e4 100644 --- a/src/views/modules/qc/qcItem.vue +++ b/src/views/modules/qc/qcItem.vue @@ -1352,6 +1352,7 @@ flag: '2', // bu: row.site + '_' + row.buNo, site: row.site, + buNo: row.buNo, itemNo: row.itemNo, itemDesc: row.itemDesc, valueTypeDb: row.valueTypeDb, diff --git a/src/views/modules/qc/qmsPropertiesItem.vue b/src/views/modules/qc/qmsPropertiesItem.vue new file mode 100644 index 0000000..0ce7a62 --- /dev/null +++ b/src/views/modules/qc/qmsPropertiesItem.vue @@ -0,0 +1,204 @@ + + + + diff --git a/src/views/modules/qc/qmsPropertiesModel.vue b/src/views/modules/qc/qmsPropertiesModel.vue new file mode 100644 index 0000000..4cdd01d --- /dev/null +++ b/src/views/modules/qc/qmsPropertiesModel.vue @@ -0,0 +1,439 @@ + + + + diff --git a/src/views/modules/report/shipment_report.vue b/src/views/modules/report/shipment_report.vue index a70dde4..4d06276 100644 --- a/src/views/modules/report/shipment_report.vue +++ b/src/views/modules/report/shipment_report.vue @@ -3,12 +3,12 @@
选择模板 - 选择检验单 + 选择检验单 打印
-
+

出货报告打印报表

@@ -17,7 +17,7 @@ 选择检验单: - {{ reportData.inspectionNo || '请选择' }} + {{ reportData.inspectionNo || '请选择' }} 报告日期 {{ currentDate }} @@ -491,6 +491,10 @@ export default { // 确认选择检验单:填充报表数据("结果"列改由主表行"选择"检验明细项目赋值) confirmSelectionlection() { + if (!this.selectedTemplateCode) { + this.$message.warning('请先选择属性模板') + return + } if (this.selectedRow) { this.reportData = { ...this.selectedRow } this.selectDialogVisible = false @@ -766,6 +770,10 @@ export default { // 打印报表(仅打印主页面报表内容) printReport() { + if (!this.selectedTemplateCode) { + this.$message.warning('请先选择属性模板') + return + } if (!this.reportData.inspectionNo) { this.$message.warning('请先选择检验单') return