From 1acabfb26bb2b9341fa8d467d446cd6a7771a037 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 23 Mar 2026 10:27:57 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-23=201=E3=80=81=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E5=8D=B7=E4=BC=98=E5=8C=96=202=E3=80=81=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=9D=90=E6=96=99=E4=B8=8A=E6=9C=BA=E8=AE=B0=E5=BD=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../searchMaterialOnMachineRecord.vue         | 22 +++++---------
 .../modules/yieldReport/com_finish_roll.vue   | 29 +++++++++----------
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/src/views/modules/schedule/searchMaterialOnMachineRecord.vue b/src/views/modules/schedule/searchMaterialOnMachineRecord.vue
index 619838d..cd006f8 100644
--- a/src/views/modules/schedule/searchMaterialOnMachineRecord.vue
+++ b/src/views/modules/schedule/searchMaterialOnMachineRecord.vue
@@ -181,13 +181,6 @@
       border
       v-loading="dataListLoading"
       style="width: 100%;">
-      <el-table-column
-        type="index"
-        header-align="center"
-        align="center"
-        width="60"
-        label="序号">
-      </el-table-column>
       <el-table-column
         header-align="center"
         align="center"
@@ -398,25 +391,26 @@ export default {
       totalCount: 0,
       tableHeight: 400,
       columnList: [
-        { columnProp: 'orderNo', columnLabel: '工单号', columnWidth: '120', headerAlign: 'center', align: 'left' },
-        { columnProp: 'seqNo', columnLabel: '派工单号', columnWidth: '150', headerAlign: 'center', align: 'left' },
-        { columnProp: 'itemNo', columnLabel: '工序号', columnWidth: '70', headerAlign: 'center', align: 'center' },
-        { columnProp: 'operationDesc', columnLabel: '工序描述', columnWidth: '100', headerAlign: 'center', align: 'left' },
-        { columnProp: 'workCenterNo', columnLabel: '加工中心', columnWidth: '100', headerAlign: 'center', align: 'left' },
-        { columnProp: 'resourceId', columnLabel: '机台', columnWidth: '100', headerAlign: 'center', align: 'left' },
+        { columnProp: 'histSeqNo', columnLabel: '序号', columnWidth: '80', headerAlign: 'center', align: 'center' },
         { columnProp: 'rmRollNo', columnLabel: '材料卷号', columnWidth: '150', headerAlign: 'center', align: 'left' },
         { columnProp: 'partNo', columnLabel: '材料编码', columnWidth: '120', headerAlign: 'center', align: 'left' },
         { columnProp: 'partDesc', columnLabel: '材料名称', columnWidth: '150', headerAlign: 'center', align: 'left' },
         { columnProp: 'spec', columnLabel: '规格型号', columnWidth: '120', headerAlign: 'center', align: 'left' },
+        { columnProp: 'histType', columnLabel: '操作类型', columnWidth: '80', headerAlign: 'center', align: 'center' },
         { columnProp: 'transQty', columnLabel: '上机数量', columnWidth: '100', headerAlign: 'center', align: 'right' },
         { columnProp: 'netIssueQty', columnLabel: '净发料数量', columnWidth: '100', headerAlign: 'center', align: 'right' },
-        { columnProp: 'histType', columnLabel: '操作类型', columnWidth: '80', headerAlign: 'center', align: 'center' },
         { columnProp: 'startDate', columnLabel: '上机时间', columnWidth: '150', headerAlign: 'center', align: 'center' },
         { columnProp: 'finishedFlagDesc', columnLabel: '是否结束', columnWidth: '80', headerAlign: 'center', align: 'center' },
         { columnProp: 'finishedDate', columnLabel: '结束时间', columnWidth: '150', headerAlign: 'center', align: 'center' },
         { columnProp: 'unissueFlagDesc', columnLabel: '是否退料', columnWidth: '80', headerAlign: 'center', align: 'center' },
         { columnProp: 'keyRMFlagDesc', columnLabel: '是否关键料', columnWidth: '90', headerAlign: 'center', align: 'center' },
         { columnProp: 'reportedBy', columnLabel: '操作人', columnWidth: '100', headerAlign: 'center', align: 'left' },
+        { columnProp: 'orderNo', columnLabel: '工单号', columnWidth: '120', headerAlign: 'center', align: 'left' },
+        { columnProp: 'seqNo', columnLabel: '派工单号', columnWidth: '150', headerAlign: 'center', align: 'left' },
+        { columnProp: 'itemNo', columnLabel: '工序号', columnWidth: '70', headerAlign: 'center', align: 'center' },
+        { columnProp: 'operationDesc', columnLabel: '工序描述', columnWidth: '100', headerAlign: 'center', align: 'left' },
+        { columnProp: 'workCenterNo', columnLabel: '加工中心', columnWidth: '100', headerAlign: 'center', align: 'left' },
+        { columnProp: 'resourceId', columnLabel: '机台', columnWidth: '100', headerAlign: 'center', align: 'left' },
         { columnProp: 'productPartNo', columnLabel: '产品编码', columnWidth: '120', headerAlign: 'center', align: 'left' },
         { columnProp: 'productPartDesc', columnLabel: '产品名称', columnWidth: '150', headerAlign: 'center', align: 'left' },
         { columnProp: 'orderStatus', columnLabel: '工单状态', columnWidth: '80', headerAlign: 'center', align: 'center' },
diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue
index 525411a..b8caebe 100644
--- a/src/views/modules/yieldReport/com_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_roll.vue
@@ -187,7 +187,6 @@
             <el-table
               height="180"
               :data="sfdcMaterialList"
-              :cell-style="customerCellStyle" :cell-class-name="customerCellClassName"
               border
               v-loading="dataListLoading"
               style="width: 100%; margin-top: -5px;">
@@ -494,7 +493,7 @@ export default {
           align: "center",
           columnLabel: "本卷耗用数量",
           columnWidth: 100,
-          columnHidden: true,
+          columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
@@ -1179,19 +1178,19 @@ export default {
 
     },
 
-    /*添加定制的css类*/
-    customerCellClassName({row, column, rowIndex, columnIndex}) {
-      if(column.property == 'netIssueQty'){
-        return 'customer-number-cell';
-      }
-    },
-
-    /*添加定制的cess样式*/
-    customerCellStyle({row, column, rowIndex, columnIndex}) {
-      if(column.property == 'netIssueQty'){
-        return 'padding: 0px 0px;';
-      }
-    },
+    // /*添加定制的css类*/
+    // customerCellClassName({row, column, rowIndex, columnIndex}) {
+    //   if(column.property == 'netIssueQty'){
+    //     return 'customer-number-cell';
+    //   }
+    // },
+    //
+    // /*添加定制的cess样式*/
+    // customerCellStyle({row, column, rowIndex, columnIndex}) {
+    //   if(column.property == 'netIssueQty'){
+    //     return 'padding: 0px 0px;';
+    //   }
+    // },
 
     /*检验良品的总数量*/
     checkValidApprovedQty(){