From 9985475f32f2c639c1c3f54ca69562bc05c925e0 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 1 Dec 2025 17:21:15 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-01=20=E6=9D=90=E6=96=99=E4=B8=8A?=
 =?UTF-8?q?=E6=9C=BA=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yieldReport/com_produce_material.vue      | 42 ++++++++++++++-----
 .../yieldReport/com_produce_report_normal.vue | 10 ++---
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/yieldReport/com_produce_material.vue b/src/views/modules/yieldReport/com_produce_material.vue
index cdf9f8f..146d59c 100644
--- a/src/views/modules/yieldReport/com_produce_material.vue
+++ b/src/views/modules/yieldReport/com_produce_material.vue
@@ -13,6 +13,7 @@
                   v-model="pageData.scanRmRollNo"
                   @keyup.native="recordTime"
                   @keyup.enter.native="checkRmRollNo"
+                  @clear="clearMaterialInfo"
                   placeholder="请扫描或输入材料卷号"
                   size="large"
                   clearable>
@@ -38,8 +39,8 @@
             </el-col>
           </el-row>
 
-          <!-- 物料信息显示区域 -->
-          <div v-if="materialInfo.partNo" class="material-info-card">
+          <!-- 物料信息显示区域 - 始终显示 -->
+          <div class="material-info-card">
             <div class="info-header">
               <i class="el-icon-document"></i>
               <span>物料信息</span>
@@ -47,11 +48,11 @@
             <div class="info-content">
               <div class="info-row">
                 <label class="info-label">物料编码：</label>
-                <span class="info-value">{{ materialInfo.partNo }}</span>
+                <span class="info-value">{{ materialInfo.partNo || '' }}</span>
               </div>
               <div class="info-row">
                 <label class="info-label">物料名称：</label>
-                <span class="info-value">{{ materialInfo.partDesc || '暂无' }}</span>
+                <span class="info-value">{{ materialInfo.partDesc || '' }}</span>
               </div>
             </div>
           </div>
@@ -279,12 +280,33 @@ export default {
 
     /*关闭modal*/
     closeDialog(){
+      // 清空物料信息
+      this.materialInfo = {
+        partNo: '',
+        partDesc: ''
+      };
+      // 清空输入框
+      this.pageData.scanRmRollNo = '';
+      this.pageData.rmRollNo = '';
+      this.pageData.bomItemNo = '';
+      
       //刷新报工的页面
       this.$emit('refreshPageData');
       //关闭当前的页面
       this.$emit('update:visible', false);
     },
 
+    /*清空物料信息*/
+    clearMaterialInfo(){
+      this.materialInfo = {
+        partNo: '',
+        partDesc: ''
+      };
+      this.pageData.rmRollNo = '';
+      this.pageData.bomItemNo = '';
+      this.bomList = [];
+    },
+
     /*记录每一次录入字符串的时间*/
     recordTime(){
       //判断是否清掉所有的内容
@@ -594,20 +616,20 @@ export default {
   padding: 0;
 
   .action-btn {
-    min-width: 100px;
-    padding: 10px 24px;
-    border-radius: 20px;
-    font-size: 14px;
+    min-width: 80px;
+    padding: 6px 16px;
+    border-radius: 16px;
+    font-size: 13px;
     font-weight: 500;
     cursor: pointer;
     transition: all 0.2s ease;
     display: inline-flex;
     align-items: center;
     justify-content: center;
-    gap: 6px;
+    gap: 4px;
 
     i {
-      font-size: 14px;
+      font-size: 13px;
     }
 
     &.primary {
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 4532012..b5d320b 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -204,7 +204,7 @@
               <span>质量检验</span>
             </div>
             <div class="section-content section-content-grid">
-              <el-button type="primary" size="small" @click="openProcessInspectionModal" :disabled="buttonTags.processInspectionFlag" icon="el-icon-view">
+              <el-button type="primary" size="small" @click="openProcessInspectionModal" :style="processInspectionButtonStyle" :disabled="buttonTags.processInspectionFlag" icon="el-icon-view">
                 过程检验
               </el-button>
               <el-button type="primary" size="small" @click="openMrbRegisterModal" icon="el-icon-document-add">
@@ -231,7 +231,7 @@
         <div class="list-panel-full">
           <div class="card-title">
             <i class="el-icon-tickets"></i>
-            <span>列表信息</span>
+            <span>过程记录</span>
           </div>
           <el-tabs v-model="activeTable" class="modern-tabs" type="border-card" @tab-click="tabClick">
               <el-tab-pane label="订单信息" name="order_info">
@@ -981,7 +981,7 @@ export default {
           columnProp: "eventTime",
           headerAlign: "center",
           align: "center",
-          columnLabel: "时间",
+          columnLabel: "开始时间",
           columnWidth: 125,
           columnHidden: false,
           columnImage: false,
@@ -3335,7 +3335,7 @@ export default {
         nextItemNo: ' 后道工序',
         onlyCurrentRoll: '仅显示当前卷信息',
         rollButtons: '卷操作',
-        listDesc: '列表信息',
+        listDesc: '过程记录',
         orderInfo: '订单信息',
         timeList: '时间',
         toolList: '刀模板记录',
@@ -3468,7 +3468,7 @@ export default {
           tableId: '*'
         }, {
           functionId: functionId,
-          languageValue: '列表信息',
+          languageValue: '过程记录',
           objectId: 'listDesc',
           objectType: 'label',
           tableId: '*'