Browse Source

2025-10-09

报工 机台工作台的过程检验 增加校验条数变颜色
master
fengyuan_yang 3 months ago
parent
commit
cdc3c91bc6
  1. 3
      src/api/yieldReport/produce_report_normal.js
  2. 58
      src/views/modules/yieldReport/com_process_inspection.vue
  3. 36
      src/views/modules/yieldReport/com_produce_report_normal.vue

3
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 deleteSfdcMaterialHist = data => createAPI('schedule/deleteSfdcMaterialHist', 'POST', data)
// 查询过程检验待检验记录数量
export const checkProcessInspectionPendingCount = data => createAPI('/pms/qc/checkProcessInspectionPendingCount', 'POST', data)

58
src/views/modules/yieldReport/com_process_inspection.vue

@ -349,6 +349,7 @@ export default {
return { return {
// //
searchData: { searchData: {
userName: this.$store.state.user.name,
buNo: '', buNo: '',
inspectionNo: '', inspectionNo: '',
partNo: '', partNo: '',
@ -419,44 +420,6 @@ export default {
columnWidth: 120, columnWidth: 120,
showOverflowTooltip: true 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, userId: this.$store.state.user.name,
functionId: 301014, functionId: 301014,
@ -666,25 +629,6 @@ export default {
columnWidth: 300, columnWidth: 300,
showOverflowTooltip: true 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, modalFlag: false,

36
src/views/modules/yieldReport/com_produce_report_normal.vue

@ -586,7 +586,7 @@
<el-form style="text-align: center;"> <el-form style="text-align: center;">
<el-form-item style="margin-top: 10px;"> <el-form-item style="margin-top: 10px;">
<el-button class="customer-bun-mid" type="primary" @click="qualityInspectionModal" <el-button class="customer-bun-mid" type="primary" @click="qualityInspectionModal"
style="margin-left: 15px; margin-bottom: 5px;">
:style="processInspectionButtonStyle + 'margin-left: 15px; margin-bottom: 5px;'">
过程检验 过程检验
</el-button> </el-button>
</el-form-item> </el-form-item>
@ -728,8 +728,7 @@
@refreshPageData="refreshPageData"></ComMalformedMaterial> @refreshPageData="refreshPageData"></ComMalformedMaterial>
<!-- 过程检验组件 --> <!-- 过程检验组件 -->
<ComProcessInspection :visible.sync="showProcessInspectionFlag">
</ComProcessInspection>
<ComProcessInspection :visible.sync="showProcessInspectionFlag"></ComProcessInspection>
<!-- SOP预览弹出框 --> <!-- SOP预览弹出框 -->
<el-dialog title="SOP预览" :visible.sync="showSopPreviewFlag" width="50%" top="5vh" :before-close="closeSopPreview"> <el-dialog title="SOP预览" :visible.sync="showSopPreviewFlag" width="50%" top="5vh" :before-close="closeSopPreview">
@ -837,7 +836,8 @@ import {
switchrollReverse, switchrollReverse,
getSfdcFlowLabelData, getSfdcFlowLabelData,
rollSplit, rollSplit,
getOrderFirstItemNo
getOrderFirstItemNo,
checkProcessInspectionPendingCount
} from "@/api/yieldReport/produce_report_normal.js"; } from "@/api/yieldReport/produce_report_normal.js";
import { import {
getUserSpecialSecurity, getUserSpecialSecurity,
@ -894,6 +894,7 @@ export default {
showMalformedMaterialFlag: false,// 2022-11-17 showMalformedMaterialFlag: false,// 2022-11-17
malformedMaterialButtonFlag: true,// 2022-11-17 malformedMaterialButtonFlag: true,// 2022-11-17
showProcessInspectionFlag: false,// showProcessInspectionFlag: false,//
processInspectionButtonStyle: '', //
showDefault: false, showDefault: false,
popoverFlag: false, popoverFlag: false,
showNotOverFlag: false, showNotOverFlag: false,
@ -4194,6 +4195,9 @@ export default {
} }
}) })
} }
//
this.checkProcessInspectionPendingCount();
}, },
// //
@ -4617,9 +4621,33 @@ export default {
// //
qualityInspectionModal() { qualityInspectionModal() {
//
this.checkProcessInspectionPendingCount();
this.showProcessInspectionFlag = true; 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() { updateSampleModal() {
this.$message.info('更换样片功能'); this.$message.info('更换样片功能');
// TODO: // TODO:

Loading…
Cancel
Save