From ffd15c2273bd967d7c87bdbc6f8224aaf9355436 Mon Sep 17 00:00:00 2001
From: yangwl <1726150332@qq.com>
Date: Sat, 13 Mar 2021 12:15:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/nanjing/ProRpList/SelectProRpList.html   |  4 ++--
 .../ProductChangeInfo/SelectProductChangeInfo.html     | 10 +++++-----
 .../resources/templates/nanjing/Report/Report.html     |  4 +++-
 .../WorkTrayHistoryInfo/WorkTrayHistoryInfo.html       |  7 ++++++-
 .../SelectWorkTrayRealTimeInfo.html                    |  7 ++++++-
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html b/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html
index 167538f6..3c45ffd0 100644
--- a/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html
+++ b/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html
@@ -44,7 +44,7 @@
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 <!--                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;查询全部</a>-->
-                            <a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:ProRpList:export"><i class="fa fa-download"></i> 导出</a>
+<!--                            <a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:ProRpList:export"><i class="fa fa-download"></i> 导出</a>-->
                         </li>
                     </ul>
                 </div>
@@ -65,7 +65,7 @@
             exportUrl: prefix + "/export",
             modalName: "ProRpList",
             pagination:false,
-            showExport: false,//工具栏上显示导出按钮
+            showExport: true,//工具栏上显示导出按钮
             exportOptions: {
                 ignoreColumn: false  //忽略第一列和最后一列
             },
diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/ProductChangeInfo/SelectProductChangeInfo.html b/ruoyi-admin/src/main/resources/templates/nanjing/ProductChangeInfo/SelectProductChangeInfo.html
index e31783e0..0ff68b0d 100644
--- a/ruoyi-admin/src/main/resources/templates/nanjing/ProductChangeInfo/SelectProductChangeInfo.html
+++ b/ruoyi-admin/src/main/resources/templates/nanjing/ProductChangeInfo/SelectProductChangeInfo.html
@@ -26,7 +26,7 @@
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;查询全部</a>
-                            <a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjingProductChangeInfo:export"><i class="fa fa-download"></i> 导出</a>
+<!--                            <a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjingProductChangeInfo:export"><i class="fa fa-download"></i> 导出</a>-->
                         </li>
                     </ul>
                 </div>
@@ -46,10 +46,10 @@
             url: prefix + "/list",
             exportUrl: prefix + "/export",
             modalName: "机种更换信息查询",
-            // showExport: true,//工具栏上显示导出按钮
-            // exportOptions: {
-            //     ignoreColumn: false  //忽略第一列和最后一列
-            // },
+            showExport: true,//工具栏上显示导出按钮
+            exportOptions: {
+                ignoreColumn: false  //忽略第一列和最后一列
+            },
             columns: [
                 {
                     field: 'id',
diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html b/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html
index fc322b6f..6727a5cd 100644
--- a/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html
+++ b/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html
@@ -63,7 +63,8 @@
                     for (var i = 0; i < (Object.keys(json.rows[0])).length; i++) {//Object.keys(obj) 获取key名称
                         var property = (Object.keys(json.rows[0]))[i];
                         console.log(property)
-                        if(property!='Barcode'){
+
+                        if(property!='Barcode' && property!="ProductBarcode"){
                             columnsArray.push({
                                     "title": property,
                                     "field": property,
@@ -73,6 +74,7 @@
                             );
 
                     }
+
                     }
                 }
                 // coulmnsData.push(columnsArray);
diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/WorkTrayHistoryInfo.html b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/WorkTrayHistoryInfo.html
index e6734b6c..87ca83dc 100644
--- a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/WorkTrayHistoryInfo.html
+++ b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/WorkTrayHistoryInfo.html
@@ -33,7 +33,7 @@
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;查询全部</a>
-                                <a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:WorkTrayHistoryInfo:export"><i class="fa fa-download"></i> 导出</a>
+<!--                                <a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:WorkTrayHistoryInfo:export"><i class="fa fa-download"></i> 导出</a>-->
                             </li>
                         </ul>
                     </div>
@@ -59,6 +59,7 @@
         </div>
     </div>
     <th:block th:include="include :: footer" />
+     <th:block th:include="include :: bootstrap-table-export-js" />
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('nanjing:WorkTrayHistoryInfo:edit')}]];
         var removeFlag = [[${@permission.hasPermi('nanjing:WorkTrayHistoryInfo:remove')}]];
@@ -70,6 +71,10 @@
                 exportUrl: prefix + "/export",
                 modalName: "工位历史生产信息",
                 // datas:formData,
+                showExport: true,//工具栏上显示导出按钮
+                exportOptions: {
+                    ignoreColumn: false  //忽略第一列和最后一列
+                },
                 columns: [
                     {
                         field: 'substation.stationCode',
diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/SelectWorkTrayRealTimeInfo.html b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/SelectWorkTrayRealTimeInfo.html
index 7040d217..e9fc07dc 100644
--- a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/SelectWorkTrayRealTimeInfo.html
+++ b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/SelectWorkTrayRealTimeInfo.html
@@ -24,7 +24,7 @@
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;查询全部</a>
-                            <a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:WorkTrayRealTimeInfo:export"><i class="fa fa-download"></i> 导出</a>
+<!--                            <a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:WorkTrayRealTimeInfo:export"><i class="fa fa-download"></i> 导出</a>-->
                         </li>
                     </ul>
                 </div>
@@ -36,6 +36,7 @@
     </div>
 </div>
 <th:block th:include="include :: footer" />
+<th:block th:include="include :: bootstrap-table-export-js" />
 <script th:inline="javascript">
     var prefix = ctx + "nanjing/selectWorkTrayRealTimeInfo";
     var datas = [[${@dict.getType('proState')}]];
@@ -44,6 +45,10 @@
             url: prefix + "/list",
             exportUrl: prefix + "/export",
             modalName: "托盘实时信息查询",
+            showExport: true,//工具栏上显示导出按钮
+            exportOptions: {
+                ignoreColumn: false  //忽略第一列和最后一列
+            },
             columns: [
                 {
                     field: 'rfidNum',