From bc8b286d36fa192017cab3f1430bbd33e62f4a13 Mon Sep 17 00:00:00 2001
From: DouDou <877258667@qq.com>
Date: Wed, 12 Jun 2024 19:19:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=90=E6=96=99=E5=8D=B7?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduleReport/com_die_cutting_report.vue | 26 ++++++++++++++++---
 .../modules/scheduleReport/com_fqc_report.vue | 26 ++++++++++++++++---
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/scheduleReport/com_die_cutting_report.vue b/src/views/modules/scheduleReport/com_die_cutting_report.vue
index 490258e..dbceb56 100644
--- a/src/views/modules/scheduleReport/com_die_cutting_report.vue
+++ b/src/views/modules/scheduleReport/com_die_cutting_report.vue
@@ -110,18 +110,18 @@
                                                        style="width: 100px; height: 80px"/></span>
                   </template>
                 </el-table-column>
-                <el-table-column
+<!--                <el-table-column
                   fixed="left"
                   header-align="center"
                   align="center"
                   width="150"
                   :label=labels.rollListOperation>
                   <template slot-scope="scope">
-                    <!--                    <a class="customer-a" v-if="operatorData.operatorName != ''"
+                    &lt;!&ndash;                    <a class="customer-a" v-if="operatorData.operatorName != ''"
                                            @click="printSfdcFlowLabel(scope.row)"
-                                        >{{ labels.rollListPrint }}</a>-->
+                                        >{{ labels.rollListPrint }}</a>&ndash;&gt;
                   </template>
-                </el-table-column>
+                </el-table-column>-->
               </el-table>
             </el-tab-pane>
           </el-tabs>
@@ -401,6 +401,24 @@ export default {
           status: true,
           fixed: false
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303RollRmRollNo',
+          tableId: "5303Roll",
+          tableName: "下机卷",
+          columnProp: "rmRollNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "材料卷号",
+          columnWidth: 100,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: true,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
       ],
       searchData: {
         site: this.$store.state.user.site,
diff --git a/src/views/modules/scheduleReport/com_fqc_report.vue b/src/views/modules/scheduleReport/com_fqc_report.vue
index 7cd3e94..cd6aca8 100644
--- a/src/views/modules/scheduleReport/com_fqc_report.vue
+++ b/src/views/modules/scheduleReport/com_fqc_report.vue
@@ -76,18 +76,18 @@
                                                        style="width: 100px; height: 80px"/></span>
                   </template>
                 </el-table-column>
-                <el-table-column
+<!--                <el-table-column
                   fixed="left"
                   header-align="center"
                   align="center"
                   width="150"
                   :label=labels.rollListOperation>
                   <template slot-scope="scope">
-                    <!--                    <a class="customer-a" v-if="operatorData.operatorName != ''"
+                    &lt;!&ndash;                    <a class="customer-a" v-if="operatorData.operatorName != ''"
                                            @click="printSfdcFlowLabel(scope.row)"
-                                        >{{ labels.rollListPrint }}</a>-->
+                                        >{{ labels.rollListPrint }}</a>&ndash;&gt;
                   </template>
-                </el-table-column>
+                </el-table-column>-->
               </el-table>
             </el-tab-pane>
           </el-tabs>
@@ -138,6 +138,24 @@ export default {
           status: true,
           fixed: false
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303RollRmRollNo',
+          tableId: "5303Roll",
+          tableName: "下机卷",
+          columnProp: "rmRollNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "材料卷号",
+          columnWidth: 100,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: true,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 5303,