From 3a6703651c3abec23e35b69296bcb726dd3b87c0 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 11 Nov 2025 09:45:00 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-10=20=E8=BF=87=E7=AB=99=E9=87=87?=
 =?UTF-8?q?=E9=9B=86-=E3=80=8B=E6=8A=A5=E5=B7=A5-=E3=80=8B=E7=BB=93?=
 =?UTF-8?q?=E5=8D=95-=E3=80=8B=E7=BB=93=E5=8D=95=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A1=AB=E5=86=99=E5=A4=87=E6=B3=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yieldReport/com_finish_schedule.vue       | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/yieldReport/com_finish_schedule.vue b/src/views/modules/yieldReport/com_finish_schedule.vue
index 8605ead..c9564d6 100644
--- a/src/views/modules/yieldReport/com_finish_schedule.vue
+++ b/src/views/modules/yieldReport/com_finish_schedule.vue
@@ -98,7 +98,7 @@
             <el-row style="margin-top: 18px; height: 55px;">
               <el-col style="text-align: center">
                 <el-form-item>
-                  <el-button type="primary" @click="finishScheduleBun"
+                  <el-button type="primary" @click="openRemarkDialog"
                              style="margin-left: 10px; margin-bottom: 5px;">
                     {{ buttons.finishScheduleButton }}
                   </el-button>
@@ -261,6 +261,24 @@
 
     </el-dialog>
 
+    <!-- 备注对话框 -->
+    <el-dialog title="填写备注" :visible.sync="remarkDialogVisible" width="500px" :close-on-click-modal="false">
+      <el-form :model="remarkForm" label-position="top">
+        <el-form-item label="备注信息：">
+          <el-input
+            type="textarea"
+            v-model="remarkForm.remark"
+            :rows="5"
+            placeholder="请填写结单备注信息">
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:35px;margin-top: 90px;text-align:center">
+        <el-button type="primary" @click="confirmRemark">确 定</el-button>
+        <el-button @click="remarkDialogVisible = false">取 消</el-button>
+      </el-footer>
+    </el-dialog>
+
     <!-- 异常原因录入的组件 -->
     <comExceptionReason ref="comExceptionReason" :close-on-click-modal="false"
                         :visible.sync="showExceptionFlag"
@@ -305,6 +323,10 @@
         titleCon: '',
         showDefault: false,
         showExceptionFlag: false,
+        remarkDialogVisible: false,
+        remarkForm: {
+          remark: ''
+        },
         scheduleNo: 0,
         pageData: {
           site: this.$store.state.user.site,
@@ -1310,6 +1332,24 @@
         }
       },
 
+      /*打开备注对话框*/
+      openRemarkDialog() {
+        // 清空之前的备注
+        this.remarkForm.remark = this.pageData.remark || '';
+        // 打开对话框
+        this.remarkDialogVisible = true;
+      },
+
+      /*确认备注并继续结单*/
+      confirmRemark() {
+        // 保存备注到pageData
+        this.pageData.remark = this.remarkForm.remark;
+        // 关闭备注对话框
+        this.remarkDialogVisible = false;
+        // 继续执行原有的结单逻辑
+        this.finishScheduleBun();
+      },
+
       /*结束当前的操作*/
       finishScheduleBun() {
         //首先判断数值是否通过判断