From b9d97fe07ec39dff4ba202352c24a70ba8177c7c Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 26 Mar 2026 14:01:37 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-26=20=E6=9C=BA=E5=8F=B0=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E3=80=90=E7=BB=93=E6=9D=9F=E5=8D=B7=E3=80=91?=
 =?UTF-8?q?=E3=80=90=E7=BB=93=E5=8D=95=E3=80=91=E5=AF=B9=E8=AF=9D=E6=A1=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/yieldReport/com_finish_roll.vue   |  2 +-
 .../yieldReport/com_finish_schedule.vue       | 67 +++++++++----------
 .../yieldReport/com_produce_report_normal.vue |  4 +-
 3 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue
index ecbb8f2..777848c 100644
--- a/src/views/modules/yieldReport/com_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_roll.vue
@@ -3,7 +3,7 @@
     <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners" width="1050px" custom-class="machine-workbench-dialog">
       <div class="dialog-content-container" style="height: 680px; overflow-y: auto; overflow-x: hidden;">
         <!-- 顶部操作栏 -->
-        <div class="top-action-bar" style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 15px; padding: 0 5px;">
+        <div class="top-action-bar" style="display: flex; justify-content: space-between; align-items: center; padding: 10px 5px 15px 5px; margin-bottom: 0; position: sticky; top: 0; z-index: 10; background: #f5f7fa;">
           <div class="time-display" style="display: flex; align-items: center; gap: 10px;">
             <span class="time-label" style="font-weight: 600; color: #303133;">{{labels.currentTime}}</span>
             <el-date-picker disabled="disabled" style="width: 180px;"
diff --git a/src/views/modules/yieldReport/com_finish_schedule.vue b/src/views/modules/yieldReport/com_finish_schedule.vue
index acfe404..c71a165 100644
--- a/src/views/modules/yieldReport/com_finish_schedule.vue
+++ b/src/views/modules/yieldReport/com_finish_schedule.vue
@@ -4,22 +4,24 @@
                width="1060px" custom-class="machine-workbench-dialog">
       <div class="dialog-content-container">
         <!-- 顶部操作栏 -->
-        <div class="top-action-bar">
-          <div class="time-display">
-            <i class="el-icon-time"></i>
-            <span>{{ labels.currentTime }}: </span>
-            <span class="time-value">{{ pageData.reportedTime }}</span>
-          </div>
-          <div class="action-buttons">
-            <button class="action-btn secondary" @click="refreshPageData">
-              <i class="el-icon-refresh"></i> {{ buttons.refreshButton }}
-            </button>
-            <button class="action-btn primary" @click="openRemarkDialog">
-              <i class="el-icon-check"></i> {{ buttons.finishScheduleButton }}
-            </button>
-            <button class="action-btn secondary" @click="closeDialog">
-              <i class="el-icon-close"></i> {{ buttons.closeButton }}
-            </button>
+        <div class="top-action-bar-wrapper">
+          <div class="top-action-bar">
+            <div class="time-display">
+              <i class="el-icon-time"></i>
+              <span>{{ labels.currentTime }}: </span>
+              <span class="time-value">{{ pageData.reportedTime }}</span>
+            </div>
+            <div class="action-buttons">
+              <button class="action-btn secondary" @click="refreshPageData">
+                <i class="el-icon-refresh"></i> {{ buttons.refreshButton }}
+              </button>
+              <button class="action-btn primary" @click="openRemarkDialog">
+                <i class="el-icon-check"></i> {{ buttons.finishScheduleButton }}
+              </button>
+              <button class="action-btn secondary" @click="closeDialog">
+                <i class="el-icon-close"></i> {{ buttons.closeButton }}
+              </button>
+            </div>
           </div>
         </div>
 
@@ -165,7 +167,7 @@
                 </div>
               </div>
               <div class="card-content">
-                <el-table height="200" :data="sfdcTimeList" border v-loading="dataListLoading" style="width: 100%;">
+                <el-table height="200" :data="sfdcTimeList" border v-loading="dataListLoading" style="width: 100%; border-radius: 4px;">
                   <el-table-column v-for="(item,index) in columnTimeArray" :key="index"
                                    :sortable="item.columnSortable" :prop="item.columnProp"
                                    :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
@@ -191,7 +193,7 @@
                 </div>
               </div>
               <div class="card-content">
-                <el-table height="200" :data="sfdcToolList" border v-loading="dataListLoading" style="width: 100%;">
+                <el-table height="200" :data="sfdcToolList" border v-loading="dataListLoading" style="width: 100%; border-radius: 4px;">
                   <el-table-column v-for="(item,index) in columnToolArray" :key="index"
                                    :sortable="item.columnSortable" :prop="item.columnProp"
                                    :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
@@ -217,7 +219,7 @@
                 </div>
               </div>
               <div class="card-content">
-                <el-table height="200" :data="sfdcMaterialList" border v-loading="dataListLoading" style="width: 100%;">
+                <el-table height="200" :data="sfdcMaterialList" border v-loading="dataListLoading" style="width: 100%; border-radius: 4px;">
                   <el-table-column v-for="(item,index) in columnMaterialArray" :key="index"
                                    :sortable="item.columnSortable" :prop="item.columnProp"
                                    :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
@@ -1660,10 +1662,19 @@
   height: 750px;
   overflow-y: auto;
   overflow-x: hidden;
-  padding: 20px;
+  padding: 0 20px 20px 20px;
 }
 
 /* 顶部操作栏 */
+.top-action-bar-wrapper {
+  position: sticky;
+  top: 0;
+  z-index: 10;
+  background: #f4f6f9;
+  padding: 20px 20px 15px 20px;
+  margin: 0 -20px;
+}
+
 .top-action-bar {
   display: flex;
   justify-content: space-between;
@@ -1672,7 +1683,7 @@
   padding: 12px 20px;
   border-radius: 8px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
-  margin-bottom: 15px;
+  margin-bottom: 0;
   border: 1px solid #e8eaed;
 }
 
@@ -1818,21 +1829,7 @@
   border-color: #fbc4c4 !important;
 }
 
-/* 表格样式优化 */
-.info-card /deep/ .el-table {
-  border-radius: 6px;
-  overflow: hidden;
 
-  th {
-    background-color: #f5f7fa !important;
-    color: #606266;
-    font-weight: 600;
-  }
-
-  td {
-    padding: 6px 0;
-  }
-}
 
 /* 自定义滚动条 */
 .dialog-content-container::-webkit-scrollbar {
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 8503e67..7f45fe6 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -594,7 +594,7 @@
             </el-tab-pane>
             <el-tab-pane label="机器下机卷" name="sfdc_roll">
               <el-table
-                height="342"
+                height="353"
                 :data="sfdcRollList.slice((sfdcRollPage - 1) * sfdcRollLimit, sfdcRollPage * sfdcRollLimit)"
                 border
                 show-summary
@@ -4406,7 +4406,7 @@ export default {
       this.scheduleData.seqNo = seqNo;
       this.currentRollOps.seqNo = seqNo;
       this.operatorData = operatorData;
-      
+
       // Update site for searchData and currentRollOps when operatorData is provided
       if (operatorData && operatorData.site) {
         this.scheduleData.site = operatorData.site;