From 68dc501e2b18179d713ea5ba08d21d85685a694c Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 15 Jan 2026 15:16:20 +0800 Subject: [PATCH] =?UTF-8?q?2026-01-15=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/qc/FQCResultEntry.vue | 31 +++++++++++++++---- src/views/modules/qc/IPQCResultEntry.vue | 27 ++++++++++++++-- src/views/modules/qc/IQCResultEntry.vue | 7 ++++- src/views/modules/qc/OQCResultEntry.vue | 7 ++++- .../yieldReport/com_process_inspection.vue | 7 ++++- 5 files changed, 67 insertions(+), 12 deletions(-) diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index 71d1cb0..3e4aa0c 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -83,7 +83,9 @@ - + + + @@ -126,9 +128,7 @@ - - - + @@ -1287,7 +1287,7 @@ import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" import Chooselist from '@/views/modules/common/Chooselist_eam' import {getInspectionFile} from '@/api/eam/eam_object_list.js' - import { searchQcSopFileList, downloadSopFile } from '@/api/qc/qc.js' + import { searchQcSopFileList, downloadSopFile, getAllOperationDescList } from '@/api/qc/qc.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' import {qcPrint} from '@/api/qc/qcPrint.js' import excel from "@/utils/excel-util.js" @@ -1359,6 +1359,7 @@ sopFileList: [], sopFileLoading: false, currentFileRow: null, + operationDescList: [], // 工序下拉列表 // 是否收藏 favorite: false, // 导出 start @@ -2809,9 +2810,22 @@ } // 获取用户角色 this.getUserRoleList() + // 加载工序下拉列表 + this.loadOperationDescList() }, methods: { + // 加载工序下拉列表 + loadOperationDescList() { + const params = { + userName: this.$store.state.user.name + } + getAllOperationDescList(params).then(({data}) => { + if (data && data.code === 0) { + this.operationDescList = data.rows || [] + } + }) + }, // 切换搜索框展开/收起 toggleSearchExpand() { this.searchExpanded = !this.searchExpanded; @@ -3815,7 +3829,12 @@ saveFQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { this.getDataList() - this.detailInformationFlag = false + // 应用时(type=1)不关闭对话框，只刷新数据 + if (type === '1') { + this.getInspectionFormData() + } else { + this.detailInformationFlag = false + } this.$message.success('操作成功') } else { this.$message.error(data.msg) diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index b40f741..16e95ec 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -88,7 +88,9 @@ - + + + @@ -1496,7 +1498,7 @@ import { getWorkCenterList } from "@/api/orderIssure/soIssueNotify.js" import Chooselist from '@/views/modules/common/Chooselist_eam' import {getInspectionFile} from '@/api/eam/eam_object_list.js' - import { searchQcSopFileList, downloadSopFile } from '@/api/qc/qc.js' + import { searchQcSopFileList, downloadSopFile, getAllOperationDescList } from '@/api/qc/qc.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' import {qcPrint} from '@/api/qc/qcPrint.js' import excel from "@/utils/excel-util.js" @@ -1570,6 +1572,7 @@ sopFileList: [], sopFileLoading: false, currentFileRow: null, + operationDescList: [], // 工序下拉列表 // 是否收藏 favorite: false, // 导出 start @@ -3061,9 +3064,22 @@ this.queryResourceList() //查询加工中心列表 this.loadWorkCenterList() + // 加载工序下拉列表 + this.loadOperationDescList() }, methods: { + // 加载工序下拉列表 + loadOperationDescList() { + const params = { + userName: this.$store.state.user.name + } + getAllOperationDescList(params).then(({data}) => { + if (data && data.code === 0) { + this.operationDescList = data.rows || [] + } + }) + }, // 切换搜索框展开/收起 toggleSearchExpand() { this.searchExpanded = !this.searchExpanded; @@ -4148,7 +4164,12 @@ saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { this.getDataList() - this.detailInformationFlag = false + // 应用时(type=1)不关闭对话框，只刷新数据 + if (type === '1') { + this.getInspectionFormData() + } else { + this.detailInformationFlag = false + } this.$message.success('操作成功') } else { this.$message.error(data.msg) diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index b34fae5..641cea8 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -2952,7 +2952,12 @@ saveIQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { this.getDataList() - this.detailInformationFlag = false + // 应用时(type=1)不关闭对话框，只刷新数据 + if (type === '1') { + this.getInspectionFormData() + } else { + this.detailInformationFlag = false + } this.$message.success('操作成功') } else { this.$message.error(data.msg) diff --git a/src/views/modules/qc/OQCResultEntry.vue b/src/views/modules/qc/OQCResultEntry.vue index 84972b2..8ce2841 100644 --- a/src/views/modules/qc/OQCResultEntry.vue +++ b/src/views/modules/qc/OQCResultEntry.vue @@ -2803,7 +2803,12 @@ if (data && data.code === 0) { this.searchData.inspectionNo = '' this.getDataList() - this.detailInformationFlag = false + // 应用时(type=1)不关闭对话框，只刷新数据 + if (type === '1') { + this.getInspectionFormData() + } else { + this.detailInformationFlag = false + } this.$message({ message: '操作成功', type: 'success', diff --git a/src/views/modules/yieldReport/com_process_inspection.vue b/src/views/modules/yieldReport/com_process_inspection.vue index dfe21a4..637a5c0 100644 --- a/src/views/modules/yieldReport/com_process_inspection.vue +++ b/src/views/modules/yieldReport/com_process_inspection.vue @@ -2409,7 +2409,12 @@ export default { saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { this.getDataList() - this.detailInformationFlag = false + // 应用时(type=1)不关闭对话框，只刷新数据 + if (type === '1') { + this.getInspectionFormData() + } else { + this.detailInformationFlag = false + } this.$message.success('操作成功') } else { this.$message.error(data.msg)