diff --git a/src/api/qc/qc_report.js b/src/api/qc/qc_report.js index 3e98a4f..b3164f0 100644 --- a/src/api/qc/qc_report.js +++ b/src/api/qc/qc_report.js @@ -10,6 +10,10 @@ export const getFAIReport = data => createAPI('/pms/qcReport/getFAIReport','post export const getFQCReport = data => createAPI('/pms/qcReport/getFQCReport','post',data) // PQC报表查询 export const getPQCReport = data => createAPI('/pms/qcReport/getPQCReport','post',data) +// SQC报表查询 +export const getSQCReport = data => createAPI('/pms/qcReport/getSQCReport','post',data) +// OQC报表查询 +export const getOQCReport = data => createAPI('/pms/qcReport/getOQCReport','post',data) // IQC报表明细查询 @@ -22,6 +26,10 @@ export const getFAIDetailReport = data => createAPI('/pms/qcReport/getFAIDetailR export const getFQCDetailReport = data => createAPI('/pms/qcReport/getFQCDetailReport','post',data) // PQC报表明细查询 export const getPQCDetailReport = data => createAPI('/pms/qcReport/getPQCDetailReport','post',data) +// SQC报表明细查询 +export const getSQCDetailReport = data => createAPI('/pms/qcReport/getSQCDetailReport','post',data) +// OQC报表明细查询 +export const getOQCDetailReport = data => createAPI('/pms/qcReport/getOQCDetailReport','post',data) // 导出 export const downloadQcDetailRecord = data => createAPI('/pms/qcReport/downloadQcDetailRecord','post',data, 'download') diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index 1d1f30b..006e9e1 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -1205,6 +1205,24 @@ export default { fixed: '', columnWidth: 120, }, + { + userId: this.$store.state.user.name, + functionId: 301007, + serialNumber: '301007Table1Spec', + tableId: "301007Table1", + tableName: "FQC检验记录表", + columnProp: 'spec', + headerAlign: "center", + align: "left", + columnLabel: '规格型号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120, + }, { userId: this.$store.state.user.name, functionId: 301007, diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index 01cdab2..e61b85b 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -1175,6 +1175,24 @@ fixed: '', columnWidth: 120, }, + { + userId: this.$store.state.user.name, + functionId: 301015, + serialNumber: '301015Table1Spec', + tableId: "301015Table1", + tableName: "FQC检验记录表", + columnProp: 'spec', + headerAlign: "center", + align: "left", + columnLabel: '规格型号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120, + }, { userId: this.$store.state.user.name, functionId: 301015, diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index a6d5d45..d6589f2 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -91,7 +91,7 @@ 审核 取消审核 删除 - 任务重载 + 任务重载 打印 val.state === '待检验' || val.state === '未开始')) { + this.$message.warning('检验单必须为待检验或未开始状态！') + return + } + this.$confirm(`是否重载该 ` + this.IPQCSelections.length + ` 条检验单?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - ipqcRecordOverLoad({ submitList: this.IPQCSelections }).then(({data}) => { - if (data && data.code === 0) { - this.$message.success('操作成功') - this.getDataList() - this.IPQCSelections = [] - } else { - this.$message.warning(data.msg || '操作失败') - } + const submitList = this.IPQCSelections.map(item => ({ + ...item, + inspectionTypeNo: item.inspectionTypeNo || '101' + })) + this.overLoadModal2({ + site: '', + submitList }) }).catch(() => {}) }, + overLoadModal2 (tempData) { + this.overLoadLoading = true + ipqcRecordOverLoad(tempData).then(({data}) => { + if (data && data.code === 0) { + this.getDataList() + this.IPQCSelections = [] + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => {} + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + this.overLoadLoading = false + }).catch(() => { + this.overLoadLoading = false + }) + }, + Transfer (type) { if (type === '2') { if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) { diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index f163984..7f8ffcf 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -1101,6 +1101,24 @@ fixed: '', columnWidth: 120, }, + { + userId: this.$store.state.user.name, + functionId: 301006, + serialNumber: '301006Table1Spec', + tableId: "301006Table1", + tableName: "IQC检验记录表", + columnProp: 'spec', + headerAlign: "center", + align: "left", + columnLabel: '规格型号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120, + }, { userId: this.$store.state.user.name, functionId: 301006, diff --git a/src/views/modules/qc/OQCResultEntry.vue b/src/views/modules/qc/OQCResultEntry.vue index 91f1059..5003933 100644 --- a/src/views/modules/qc/OQCResultEntry.vue +++ b/src/views/modules/qc/OQCResultEntry.vue @@ -994,38 +994,38 @@ { userId: this.$store.state.user.name, functionId: 301017, - serialNumber: '301017Table1PartDesc', + serialNumber: '301017Table1Spec', tableId: "301017Table1", tableName: "OQC检验记录表", - columnProp: 'partDesc', + columnProp: 'spec', headerAlign: "center", align: "left", - columnLabel: '物料名称', + columnLabel: '规格型号', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 200, + columnWidth: 120, }, { userId: this.$store.state.user.name, functionId: 301017, - serialNumber: '301017Table1Spec', + serialNumber: '301017Table1PartDesc', tableId: "301017Table1", tableName: "OQC检验记录表", - columnProp: 'spec', + columnProp: 'partDesc', headerAlign: "center", align: "left", - columnLabel: '规格型号', + columnLabel: '物料名称', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 120, + columnWidth: 200, }, { userId: this.$store.state.user.name, diff --git a/src/views/modules/qc/SQCResultEntry.vue b/src/views/modules/qc/SQCResultEntry.vue index 4aec648..d59d0c1 100644 --- a/src/views/modules/qc/SQCResultEntry.vue +++ b/src/views/modules/qc/SQCResultEntry.vue @@ -906,6 +906,24 @@ fixed: '', columnWidth: 120, }, + { + userId: this.$store.state.user.name, + functionId: 301015, + serialNumber: '301015Table1Spec', + tableId: "301015Table1", + tableName: "SQC检验记录表", + columnProp: 'spec', + headerAlign: "center", + align: "left", + columnLabel: '规格型号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120, + }, { userId: this.$store.state.user.name, functionId: 301015, diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue index 0bd17c4..8937cde 100644 --- a/src/views/modules/qc/qcPartAttribute.vue +++ b/src/views/modules/qc/qcPartAttribute.vue @@ -889,8 +889,11 @@ - + + + @@ -918,6 +921,12 @@ align="center" label="物料名称"> + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - + + + + 查询 + 导出 + + + + + + + + + + + + +
+ + + + diff --git a/src/views/modules/report/FQC_report.vue b/src/views/modules/report/FQC_report.vue new file mode 100644 index 0000000..a2df400 --- /dev/null +++ b/src/views/modules/report/FQC_report.vue @@ -0,0 +1,1356 @@ + + + + diff --git a/src/views/modules/report/IPQC_detail_report.vue b/src/views/modules/report/IPQC_detail_report.vue new file mode 100644 index 0000000..ecd9852 --- /dev/null +++ b/src/views/modules/report/IPQC_detail_report.vue @@ -0,0 +1,1305 @@ + + + + diff --git a/src/views/modules/report/IPQC_report.vue b/src/views/modules/report/IPQC_report.vue new file mode 100644 index 0000000..2a5cf99 --- /dev/null +++ b/src/views/modules/report/IPQC_report.vue @@ -0,0 +1,1381 @@ + + + + diff --git a/src/views/modules/report/IQC_detail_report.vue b/src/views/modules/report/IQC_detail_report.vue new file mode 100644 index 0000000..ec11540 --- /dev/null +++ b/src/views/modules/report/IQC_detail_report.vue @@ -0,0 +1,1358 @@ + + + + diff --git a/src/views/modules/report/IQC_report.vue b/src/views/modules/report/IQC_report.vue new file mode 100644 index 0000000..792b2d8 --- /dev/null +++ b/src/views/modules/report/IQC_report.vue @@ -0,0 +1,1440 @@ + + + + diff --git a/src/views/modules/report/OQC_detail_report.vue b/src/views/modules/report/OQC_detail_report.vue new file mode 100644 index 0000000..f91a7b9 --- /dev/null +++ b/src/views/modules/report/OQC_detail_report.vue @@ -0,0 +1,1332 @@ + + + + diff --git a/src/views/modules/report/OQC_report.vue b/src/views/modules/report/OQC_report.vue new file mode 100644 index 0000000..c1606ea --- /dev/null +++ b/src/views/modules/report/OQC_report.vue @@ -0,0 +1,1413 @@ + + + + diff --git a/src/views/modules/report/PQC_detail_report.vue b/src/views/modules/report/PQC_detail_report.vue new file mode 100644 index 0000000..01db864 --- /dev/null +++ b/src/views/modules/report/PQC_detail_report.vue @@ -0,0 +1,1278 @@ + + + + diff --git a/src/views/modules/report/PQC_report.vue b/src/views/modules/report/PQC_report.vue new file mode 100644 index 0000000..d88eb9d --- /dev/null +++ b/src/views/modules/report/PQC_report.vue @@ -0,0 +1,1356 @@ + + + + diff --git a/src/views/modules/report/SQC_detail_report.vue b/src/views/modules/report/SQC_detail_report.vue new file mode 100644 index 0000000..35d6795 --- /dev/null +++ b/src/views/modules/report/SQC_detail_report.vue @@ -0,0 +1,1358 @@ + + + + diff --git a/src/views/modules/report/SQC_report.vue b/src/views/modules/report/SQC_report.vue new file mode 100644 index 0000000..fe8899c --- /dev/null +++ b/src/views/modules/report/SQC_report.vue @@ -0,0 +1,1440 @@ + + + +