From 9ab9817e748e08bd7b1d484e7f3ca9e9800a86cc Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 17 Nov 2025 13:52:57 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-17=20=E8=AE=A2=E5=8D=95=E4=BA=A7?=
 =?UTF-8?q?=E5=87=BA=E6=A0=87=E7=AD=BE=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../searchSfdcRollsReport.vue                 | 62 +++++++++++++++----
 1 file changed, 49 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue b/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue
index 0a7e28f..29a0b3a 100644
--- a/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue
+++ b/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue
@@ -59,8 +59,8 @@
         </download-excel>
         <el-button @click="openAttributeChangeDialog()" type="warning">属性变动</el-button>
       </el-form-item>
-
     </el-form>
+
     <el-table
       :height="height"
       :data="dataList"
@@ -85,12 +85,12 @@
         :label="item.columnLabel">
         <template slot-scope="scope">
           <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                             style="width: 100px; height: 80px"/></span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
     </el-table>
     <el-pagination
+      style="margin-top: 0px"
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
       :current-page="pageIndex"
@@ -252,13 +252,31 @@ import {updateInventoryStockAttribute} from "../../../../api/wms/wms";
           {
             userId: this.$store.state.user.name,
             functionId: 104003007,
-            serialNumber: '104003007TableSfdcRollsSite',
+            serialNumber: '104003007TableSfdcRollsRollNo',
             tableId: "104003007Table",
             tableName: "订单产出标签报表",
-            columnProp: "site",
+            columnProp: "rollNo",
             headerAlign: "center",
             align: "left",
-            columnLabel: "工厂编码",
+            columnLabel: "卷标签",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104003007,
+            serialNumber: '104003007TableSfdcRollsRollQty',
+            tableId: "104003007Table",
+            tableName: "订单产出标签报表",
+            columnProp: "rollQty",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "卷数量",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -270,31 +288,49 @@ import {updateInventoryStockAttribute} from "../../../../api/wms/wms";
           {
             userId: this.$store.state.user.name,
             functionId: 104003007,
-            serialNumber: '104003007TableSfdcRollsRollNo',
+            serialNumber: '104003007TablePartNo',
             tableId: "104003007Table",
             tableName: "订单产出标签报表",
-            columnProp: "rollNo",
+            columnProp: "partNo",
             headerAlign: "center",
             align: "left",
-            columnLabel: "卷标签",
+            columnLabel: "物料编码",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 150
+            columnWidth: 120
           },
           {
             userId: this.$store.state.user.name,
             functionId: 104003007,
-            serialNumber: '104003007TableSfdcRollsRollQty',
+            serialNumber: '104003007TablePartDesc',
             tableId: "104003007Table",
             tableName: "订单产出标签报表",
-            columnProp: "rollQty",
+            columnProp: "partDesc",
             headerAlign: "center",
             align: "left",
-            columnLabel: "卷数量",
+            columnLabel: "物料名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104003007,
+            serialNumber: '104003007TablePartDesc',
+            tableId: "104003007Table",
+            tableName: "订单产出标签报表",
+            columnProp: "spec",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "规格型号",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,