From 64978be029fd45359ed16b37e9835157e96f2714 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 21 Jul 2026 11:07:21 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-20=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

---
 src/views/modules/yieldReport/com_separate_roll.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/yieldReport/com_separate_roll.vue b/src/views/modules/yieldReport/com_separate_roll.vue
index 061ac7d..56b5929 100644
--- a/src/views/modules/yieldReport/com_separate_roll.vue
+++ b/src/views/modules/yieldReport/com_separate_roll.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="customer-css">
-    <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners" width="830px" style="height: 680px;" class="customer-dialog" :show-close="!exceptionRuleLocked" @close="onDialogClosed">
+    <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners" width="830px" style="height: 680px;" class="customer-dialog" :show-close="!exceptionRuleLocked" :close-on-press-escape="!exceptionRuleLocked" :before-close="handleMainDialogBeforeClose" @close="onDialogClosed">
       <el-form :inline="true" label-position="top" style="height: auto;">
         <!-- 时间和固定载具 -->
         <el-row style="margin-top: -10px;">
@@ -1857,6 +1857,9 @@ export default {
 
     /*关闭modal*/
     closeDialog(){
+      if (this.exceptionRuleLocked) {
+        return
+      }
       this.stopSplitRuleLockPolling()
       this.clearExceptionRuleVisualMeta()
       this.resetPendingRuleFollowup()
@@ -1866,6 +1869,13 @@ export default {
       this.$emit('update:visible', false);
     },
 
+    handleMainDialogBeforeClose (done) {
+      if (this.exceptionRuleLocked) {
+        return
+      }
+      done()
+    },
+
     onDialogClosed () {
       this.stopSplitRuleLockPolling()
       this.clearExceptionRuleVisualMeta()