diff --git a/src/api/yieldReport/produce_report_normal.js b/src/api/yieldReport/produce_report_normal.js index 0508db3..be205c0 100644 --- a/src/api/yieldReport/produce_report_normal.js +++ b/src/api/yieldReport/produce_report_normal.js @@ -100,3 +100,6 @@ export const deleteSfdcTimeHist = data => createAPI('schedule/deleteSfdcTimeHist // 删除发料 export const deleteSfdcMaterialHist = data => createAPI('schedule/deleteSfdcMaterialHist', 'POST', data) + +// 查询过程检验待检验记录数量 +export const checkProcessInspectionPendingCount = data => createAPI('/pms/qc/checkProcessInspectionPendingCount', 'POST', data) diff --git a/src/views/modules/yieldReport/com_process_inspection.vue b/src/views/modules/yieldReport/com_process_inspection.vue index 2829808..ac7f0fa 100644 --- a/src/views/modules/yieldReport/com_process_inspection.vue +++ b/src/views/modules/yieldReport/com_process_inspection.vue @@ -349,6 +349,7 @@ export default { return { // 查询参数 searchData: { + userName: this.$store.state.user.name, buNo: '', inspectionNo: '', partNo: '', @@ -419,44 +420,6 @@ export default { columnWidth: 120, showOverflowTooltip: true }, - { - userId: this.$store.state.user.name, - functionId: 301014, - serialNumber: '301014Table1BatchRollNo', - tableId: "301014Table1", - tableName: "IPQC检验记录表", - columnProp: 'batchRollNo', - headerAlign: "center", - align: "center", - columnLabel: '老卷号', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 150, - showOverflowTooltip: true - }, - { - userId: this.$store.state.user.name, - functionId: 301014, - serialNumber: '301014Table1RollNo', - tableId: "301014Table1", - tableName: "IPQC检验记录表", - columnProp: 'rollNo', - headerAlign: "center", - align: "center", - columnLabel: '标签条码', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 150, - showOverflowTooltip: true - }, { userId: this.$store.state.user.name, functionId: 301014, @@ -666,25 +629,6 @@ export default { columnWidth: 300, showOverflowTooltip: true }, - { - userId: this.$store.state.user.name, - functionId: 301014, - serialNumber: '301014Table1Sku', - tableId: "301014Table1", - tableName: "IPQC检验记录表", - columnProp: 'sku', - headerAlign: "center", - align: "center", - columnLabel: 'SKU', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120, - showOverflowTooltip: true - } ], // 新增弹窗 modalFlag: false, diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index 0f8d725..d309299 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -586,7 +586,7 @@ + :style="processInspectionButtonStyle + 'margin-left: 15px; margin-bottom: 5px;'"> 过程检验 @@ -728,8 +728,7 @@ @refreshPageData="refreshPageData"> - - + @@ -837,7 +836,8 @@ import { switchrollReverse, getSfdcFlowLabelData, rollSplit, - getOrderFirstItemNo + getOrderFirstItemNo, + checkProcessInspectionPendingCount } from "@/api/yieldReport/produce_report_normal.js"; import { getUserSpecialSecurity, @@ -894,6 +894,7 @@ export default { showMalformedMaterialFlag: false,// 2022-11-17 malformedMaterialButtonFlag: true,// 2022-11-17 showProcessInspectionFlag: false,// 过程检验弹窗显示状态 + processInspectionButtonStyle: '', // 过程检验按钮样式 showDefault: false, popoverFlag: false, showNotOverFlag: false, @@ -4194,6 +4195,9 @@ export default { } }) } + + // 刷新过程检验按钮状态 + this.checkProcessInspectionPendingCount(); }, //设置参数 @@ -4617,9 +4621,33 @@ export default { // 质量检验相关方法 qualityInspectionModal() { + // 查询过程检验待检验记录数量 + this.checkProcessInspectionPendingCount(); this.showProcessInspectionFlag = true; }, + // 查询过程检验待检验记录数量 + checkProcessInspectionPendingCount() { + const params = { + site: this.scheduleData.site, + //buNo: this.scheduleData.buNo, + orderNo: this.scheduleData.orderNo + }; + + checkProcessInspectionPendingCount(params).then(({data}) => { + if (data && data.code === 0) { + // 如果有待检验记录,设置按钮颜色为#d83c70 + if (data.count > 0) { + this.processInspectionButtonStyle = 'background-color: #d83c70; border-color: #d83c70;'; + } else { + this.processInspectionButtonStyle = ''; + } + } + }).catch(() => { + this.processInspectionButtonStyle = ''; + }); + }, + updateSampleModal() { this.$message.info('更换样片功能'); // TODO: 实现更换样片功能