From d85b6f7e7d0eae1571cf97b531bc1cf53cf5c45b Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 15 Jul 2026 14:36:38 +0800 Subject: [PATCH] =?UTF-8?q?2026-07-15=20=E5=BC=82=E5=B8=B8=E8=A7=84?= =?UTF-8?q?=E5=88=99=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yieldReport/com_produce_report_normal.vue | 58 ++----------------- 1 file changed, 4 insertions(+), 54 deletions(-) diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index afe03a2..a2845ff 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -1012,9 +1012,6 @@ import { import { getUserSpecialSecurity, } from '@/api/yieldReport/produce_order.js' -import { - getSplitRuleLockStatus -} from '@/api/yieldReport/com_separate_roll.js' import { sopListSearch, downloadSopFile } from '@/api/qc/qc.js' /*打印标签专用的js*/ import { @@ -1091,7 +1088,6 @@ export default { showOperatorFlag: false, showSwitchFlag: false, showSeparateFlag: false, - exceptionRuleForceLock: false, showFinishFlag: false, showFinishPartFlag: false, showMergeFlag: false, @@ -4660,11 +4656,6 @@ export default { //刷新当前页面的菜单 async refreshPageButtons() { - await this.syncSeparateRuleForceLockStatus() - if (this.exceptionRuleForceLock) { - this.lockWorkbenchButtonsByRule() - return - } //判断是否存在人员 if (this.operatorData.operatorId == null || this.operatorData.operatorId == '') { this.buttonTags.createNewRollFlag = true; @@ -4788,32 +4779,6 @@ export default { this.checkProcessInspectionPendingCount(); }, - async syncSeparateRuleForceLockStatus () { - if (!this.scheduleData.site || !this.scheduleData.buNo || !this.scheduleData.orderNo || !this.scheduleData.seqNo) { - this.exceptionRuleForceLock = false - return - } - try { - const { data } = await getSplitRuleLockStatus({ - site: this.scheduleData.site, - buNo: this.scheduleData.buNo, - orderNo: this.scheduleData.orderNo, - seqNo: this.scheduleData.seqNo - }) - if (!data || data.code === 500) { - return - } - const resultMap = data.resultMap || {} - const wasLocked = this.exceptionRuleForceLock - this.exceptionRuleForceLock = !!resultMap.locked - if (wasLocked && !this.exceptionRuleForceLock && resultMap.bypassByAudit) { - this.$message.success('QC已审核,已解除锁定,可继续操作。') - } - } catch (error) { - console.error('同步创建分卷规则锁定状态失败:', error) - } - }, - //设置参数 initOperatorData(operatorData) { this.showOperatorFlag = false; @@ -4911,12 +4876,6 @@ export default { }); }, - lockWorkbenchButtonsByRule () { - Object.keys(this.buttonTags || {}).forEach(key => { - this.buttonTags[key] = true - }) - }, - onSeparateRuleOpenDefect () { this.showSeparateFlag = false this.$nextTick(() => { @@ -4932,22 +4891,13 @@ export default { }, onSeparateRuleLockPage (resultMap) { - const wasLocked = this.exceptionRuleForceLock - this.exceptionRuleForceLock = true - this.lockWorkbenchButtonsByRule() - if (!wasLocked) { - this.$alert((resultMap && resultMap.message) || '触发强制异常规则,当前页面已锁定。', '提示', { - confirmButtonText: '确定', - type: 'warning' - }) - } + this.$alert((resultMap && resultMap.message) || '触发强制异常规则,当前页面已锁定。', '提示', { + confirmButtonText: '确定', + type: 'warning' + }) }, onSeparateRuleUnlockPage () { - if (!this.exceptionRuleForceLock) { - return - } - this.exceptionRuleForceLock = false this.refreshPageButtons() },