From ba8ac4bf92ca312924102dbeebe962722670d6cf Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 25 Mar 2026 11:37:52 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-25=20=E6=9C=BA=E5=8F=B0=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yieldReport/com_produce_report_normal.vue | 34 ++++++++--------
 .../yieldReport/com_split_order_report.vue    | 39 +++++++++++--------
 2 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 03c229c..b6a07c4 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -129,35 +129,37 @@
 
         <!-- 卷操作区域 -->
         <div class="roll-operation-card">
-          <div class="card-title">
-            <i class="el-icon-collection"></i>
-            <span>卷操作</span>
+          <div class="card-title" style="display: flex; justify-content: space-between; align-items: center;">
+            <div style="display: flex; align-items: center;">
+              <i class="el-icon-collection"></i>
+              <span style="margin-right: 20px;margin-top: -5px">卷操作</span>
+              <div class="current-roll-display" style="margin-top: -5px; display: flex; align-items: center; font-size: 14px; font-weight: normal; color: #606266;">
+<!--                <label style="margin-right: 5px;">当前卷号：</label>-->
+                <span style="color: #667eea; font-weight: bold; font-size: 16px;">{{ this.currentRollOps.rollNo }}</span>
+              </div>
+            </div>
           </div>
           <div class="roll-operation-content">
-            <div class="current-roll-display">
-              <label>当前卷号：</label>
-              <el-input v-model="this.currentRollOps.rollNo" :readonly="true" size="small" class="roll-no-input"></el-input>
-            </div>
-            <div class="roll-buttons">
-              <el-button type="primary" size="small" @click="warnCreateNewRollConfirm" :disabled="buttonTags.createNewRollFlag" icon="el-icon-plus">
+            <div class="roll-buttons" style="display: flex; justify-content: space-between; width: 100%;">
+              <el-button type="primary" size="small" @click="warnCreateNewRollConfirm" :disabled="buttonTags.createNewRollFlag" icon="el-icon-plus" style="flex: 1; margin: 0 5px;">
                 创建新卷
               </el-button>
-              <el-button type="primary" size="small" @click="switchRollModal" :disabled="buttonTags.switchRollFlag" icon="el-icon-sort">
+              <el-button type="primary" size="small" @click="switchRollModal" :disabled="buttonTags.switchRollFlag" icon="el-icon-sort" style="flex: 1; margin: 0 5px;">
                 切换卷
               </el-button>
-              <el-button type="primary" size="small" @click="separateRollModal" :disabled="buttonTags.separateRollFlag" icon="el-icon-tickets">
+              <el-button type="primary" size="small" @click="separateRollModal" :disabled="buttonTags.separateRollFlag" icon="el-icon-tickets" style="flex: 1; margin: 0 5px;">
                 创建分卷
               </el-button>
-              <el-button type="warning" size="small" @click="abnormalContinueRollModal" :disabled="buttonTags.separateRollFlag" icon="el-icon-refresh">
+              <el-button type="warning" size="small" @click="abnormalContinueRollModal" :disabled="buttonTags.separateRollFlag" icon="el-icon-refresh" style="flex: 1; margin: 0 5px;">
                 异常续卷
               </el-button>
-              <el-button type="success" size="small" :disabled="buttonTags.finishRollFlag" @click="finishRollModal" icon="el-icon-circle-check">
+              <el-button type="success" size="small" :disabled="buttonTags.finishRollFlag" @click="finishRollModal" icon="el-icon-circle-check" style="flex: 1; margin: 0 5px;">
                 结束卷
               </el-button>
-              <el-button type="warning" size="small" :disabled="buttonTags.mergeRollFlag" @click="mergeRollModal" icon="el-icon-menu">
+              <el-button type="warning" size="small" :disabled="buttonTags.mergeRollFlag" @click="mergeRollModal" icon="el-icon-menu" style="flex: 1; margin: 0 5px;">
                 合并卷
               </el-button>
-              <el-button type="danger" size="small" :disabled="buttonTags.finishScheduleFlag" @click="showFinishScheduleModal" icon="el-icon-error">
+              <el-button type="danger" size="small" :disabled="buttonTags.finishScheduleFlag" @click="showFinishScheduleModal" icon="el-icon-error" style="flex: 1; margin: 0 5px;">
                 结单
               </el-button>
             </div>
@@ -5678,7 +5680,7 @@ export default {
   align-items: center;
   gap: 6px;
   min-width: 120px;
-  max-width: 180px;
+  max-width: 300px;
 }
 
 .current-roll-display label {
diff --git a/src/views/modules/yieldReport/com_split_order_report.vue b/src/views/modules/yieldReport/com_split_order_report.vue
index 882fa21..a919b81 100644
--- a/src/views/modules/yieldReport/com_split_order_report.vue
+++ b/src/views/modules/yieldReport/com_split_order_report.vue
@@ -54,47 +54,52 @@
         </el-form>
         <!-- 第四行菜单 -->
         <fieldset class="customer-fieldset" style="width: 660px;">
-          <legend class="customer-legend">{{labels.rollButtons}}</legend>
-          <el-form>
-            <el-form-item class="customer-roll-css" style="width: 130px; font-size: 16px; color: #387877;">
-              <span>{{ this.currentRollOps.rollNo }}</span>
-            </el-form-item>
-            <el-form-item>
+          <legend class="customer-legend" style="display: flex; justify-content: space-between; align-items: center; width: calc(100% - 20px);">
+            <div style="display: flex; align-items: center;">
+              <span style="margin-right: 20px;">{{labels.rollButtons}}</span>
+              <div style="font-size: 14px; font-weight: normal; color: #606266; display: flex; align-items: center;">
+                <label style="margin-right: 5px;">当前卷号：</label>
+                <span style="color: #387877; font-weight: bold; font-size: 16px;">{{ this.currentRollOps.rollNo }}</span>
+              </div>
+            </div>
+          </legend>
+          <el-form style="display: flex; justify-content: space-between; width: 100%;">
+            <el-form-item style="flex: 1; margin: 0 5px; text-align: center;">
               <el-button class="customer-bun-mid" type="primary" @click="warnCreateNewRollConfirm"
                          :disabled="buttonTags.createNewRollFlag"
-                         style="margin-left: 5px; margin-bottom: 5px;">
+                         style="width: 100%;">
                 {{ buttons.newRollButton }}
               </el-button>
             </el-form-item>
-            <el-form-item>
+            <el-form-item style="flex: 1; margin: 0 5px; text-align: center;">
               <el-button class="customer-bun-mid" type="primary" @click="switchRollModal"
                          :disabled="buttonTags.switchRollFlag"
-                         style="margin-left: 10px; margin-bottom: 5px;">
+                         style="width: 100%;">
                 {{buttons.switchRoll}}
               </el-button>
             </el-form-item>
-            <el-form-item>
+            <el-form-item style="flex: 1; margin: 0 5px; text-align: center;">
               <el-button class="customer-bun-mid" type="primary" @click="separateRollModal"
                          :disabled="buttonTags.separateRollFlag"
-                         style="margin-left: 10px; margin-bottom: 5px;">
+                         style="width: 100%;">
                 {{buttons.separateRoll}}
               </el-button>
             </el-form-item>
-            <el-form-item>
+            <el-form-item style="flex: 1; margin: 0 5px; text-align: center;">
               <el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.finishRollFlag"
-                         @click="finishRollModal" style="margin-left: 10px; margin-bottom: 5px;">
+                         @click="finishRollModal" style="width: 100%;">
                 {{ buttons.finishRoll }}
               </el-button>
             </el-form-item>
-            <el-form-item>
+            <el-form-item style="flex: 1; margin: 0 5px; text-align: center;">
               <el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.mergeRollFlag"
-                         @click="mergeRollModal" style="margin-left: 10px; margin-bottom: 5px;">
+                         @click="mergeRollModal" style="width: 100%;">
                 {{ buttons.mergeRoll }}
               </el-button>
             </el-form-item>
-            <el-form-item>
+            <el-form-item style="flex: 1; margin: 0 5px; text-align: center;">
               <el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.finishScheduleFlag"
-                         @click="showFinishScheduleModal" style="margin-left: 10px; margin-bottom: 5px;">
+                         @click="showFinishScheduleModal" style="width: 100%;">
                 {{ buttons.finishSchedule }}
               </el-button>
             </el-form-item>