From 62ed50bd73a754712f84655fe168fe2f5f2e3aab Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Mon, 19 Aug 2024 19:40:10 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9A=84=E5=9B=BD=E5=86=85?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E5=92=8C=E5=9B=BD=E5=A4=96=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E4=BF=AE=E6=94=B9=E5=9B=BD=E7=A8=8E?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=9A=84=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E7=9A=84=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=20=E4=BF=AE=E6=94=B9=E5=9B=BD=E7=A8=8E=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E4=B8=8A=E4=BC=A0=E5=8F=91=E7=9A=84=E5=9B=BD=E5=86=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E3=80=82=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84js=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../financial/taxInvoice/taxInvoice.html      | 18 ++++++++--------
 .../taxInvoice/uploadInvoiceRmb.html          | 21 ++++++++++++++-----
 .../taxInvoice/uploadInvoiceRmbDetail.html    | 11 ++++++++++
 ...akeInvoiceRMB.html => makeInvoiceRmb.html} | 19 +++++++++--------
 ...akeInvoiceUSD.html => makeInvoiceUsd.html} | 19 +++++++++--------
 5 files changed, 56 insertions(+), 32 deletions(-)
 rename ruoyi-admin/src/main/resources/templates/system/salesOrder/{makeInvoiceRMB.html => makeInvoiceRmb.html} (97%)
 rename ruoyi-admin/src/main/resources/templates/system/salesOrder/{makeInvoiceUSD.html => makeInvoiceUsd.html} (97%)

diff --git a/ruoyi-admin/src/main/resources/templates/financial/taxInvoice/taxInvoice.html b/ruoyi-admin/src/main/resources/templates/financial/taxInvoice/taxInvoice.html
index 3f3ec24c..f03faa93 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/taxInvoice/taxInvoice.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/taxInvoice/taxInvoice.html
@@ -78,15 +78,15 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="financial:taxInvoice:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="financial:taxInvoice:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="financial:taxInvoice:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
+<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="financial:taxInvoice:add">-->
+<!--                    <i class="fa fa-plus"></i> 添加-->
+<!--                </a>-->
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="financial:taxInvoice:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="financial:taxInvoice:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="financial:taxInvoice:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
diff --git a/ruoyi-admin/src/main/resources/templates/financial/taxInvoice/uploadInvoiceRmb.html b/ruoyi-admin/src/main/resources/templates/financial/taxInvoice/uploadInvoiceRmb.html
index 0edd8825..350be939 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/taxInvoice/uploadInvoiceRmb.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/taxInvoice/uploadInvoiceRmb.html
@@ -264,6 +264,16 @@
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: datetimepicker-js" />
 <th:block th:include="include :: bootstrap-fileinput-js" />
+<!-- buffer.min.js 和 filetype.min.js 是必需的，按列出的顺序进行高级 MIME 类型分析和更正确
+预览。这是自 v5.5.0 以来可用的功能，如果您想确保解析文件 mime 类型，则需要此功能
+即使本地文件的扩展名命名不正确，也能正确。这将确保更正确地预览
+选定的文件（注意：这将涉及在本地扫描文件内容时产生的少量处理开销）。如果你
+不要加载这些脚本，那么 MIME 类型解析将主要使用文件名中的扩展名派生
+以及一些基本的文件内容解析签名。-->
+<script src=“https://cdn.jsdelivr.net/gh/kartik-v/bootstrap-fileinput@5.5.0/js/plugins/buffer.min.js” type=“text/javascript”></script>
+<script src=“https://cdn.jsdelivr.net/gh/kartik-v/bootstrap-fileinput@5.5.0/js/plugins/filetype.min.js” type=“text/javascript”></script>
+<!--可选地，如果您需要翻译您的语言，请包含以下所述的区域设置文件（将LANG.js替换为您的语言区域设置）-->
+<script src=“https://cdn.jsdelivr.net/gh/kartik-v/bootstrap-fileinput@5.5.0/js/locales/zh.js”></script>
 <script th:inline="javascript">
 
   var materialProcessMethodDatas = [[${@dict.getType('processMethod')}]];
@@ -378,10 +388,11 @@
     // 单图上传
     $(".file-upload").fileinput({
       uploadUrl: ctx + "common/uploadSingleFile",
+      language: 'zh', //设置语言
       maxFileCount: 1,
       autoReplace: true,
       allowedFileExtensions: ['bmp', 'gif', 'jpg', 'jpeg', 'png', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'html', 'htm', 'txt', 'text', 'rar', 'zip', 'gz', 'bz2', 'pdf', 'bpmn', 'bar', 'db'],
-      previewFileType: ['image', 'txt', 'text', 'pdf', 'bpmn', 'bar', 'db',"doc","docx"],
+      previewFileType: ['image', 'txt', 'text', 'pdf', 'bpmn', 'bar', 'db','doc','docx'],
       showUpload: false, // 不显示上传按钮
       showCaption: false, // 不显示标题
       showRemove: true, // 显示移除按钮
@@ -390,10 +401,10 @@
       removeIcon: "<i class='fa fa-trash'></i>", // 移除按钮图标
       browseLabel: "选择文件", // 浏览按钮文本
       removeLabel: "删除", // 移除按钮文本
-      layoutTemplates: {
-        main2: "{preview}\n" +
-                "{remove}\n" +
-                "{browse}"
+      preferIconicPreview: true, // this will force thumbnails to display icons for following file extensions
+      uploadExtraData: {
+        img_key: "1000",
+        img_keywords: "happy, nature",
       }
     }).on('filepreupload', function (event, data, previewId, index) {
       // 在文件上传前的处理
diff --git a/ruoyi-admin/src/main/resources/templates/financial/taxInvoice/uploadInvoiceRmbDetail.html b/ruoyi-admin/src/main/resources/templates/financial/taxInvoice/uploadInvoiceRmbDetail.html
index b4681382..04fd4681 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/taxInvoice/uploadInvoiceRmbDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/taxInvoice/uploadInvoiceRmbDetail.html
@@ -264,6 +264,17 @@
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: datetimepicker-js" />
 <th:block th:include="include :: bootstrap-fileinput-js" />
+<!--可选地，如果您需要翻译您的语言，请包含以下所述的区域设置文件（将LANG.js替换为您的语言区域设置）-->
+<script src=“https://cdn.jsdelivr.net/gh/kartik-v/bootstrap-fileinput@5.5.0/js/locales/zh.js”></script>
+<!-- buffer.min.js 和 filetype.min.js 是必需的，按列出的顺序进行高级 MIME 类型分析和更正确
+预览。这是自 v5.5.0 以来可用的功能，如果您想确保解析文件 mime 类型，则需要此功能
+即使本地文件的扩展名命名不正确，也能正确。这将确保更正确地预览
+选定的文件（注意：这将涉及在本地扫描文件内容时产生的少量处理开销）。如果你
+不要加载这些脚本，那么 MIME 类型解析将主要使用文件名中的扩展名派生
+以及一些基本的文件内容解析签名。-->
+<script src=“https://cdn.jsdelivr.net/gh/kartik-v/bootstrap-fileinput@5.5.0/js/plugins/buffer.min.js” type=“text/javascript”></script>
+<script src=“https://cdn.jsdelivr.net/gh/kartik-v/bootstrap-fileinput@5.5.0/js/plugins/filetype.min.js” type=“text/javascript”></script>
+
 <script th:inline="javascript">
 
     var materialProcessMethodDatas = [[${@dict.getType('processMethod')}]];
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceRMB.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceRmb.html
similarity index 97%
rename from ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceRMB.html
rename to ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceRmb.html
index 21ce9766..1c8247ff 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceRMB.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceRmb.html
@@ -430,15 +430,16 @@
           title: '财务员',
           field: 'financeMembers',
         },
-        {
-          title: '操作',
-          align: 'center',
-          formatter: function(value, row, index) {
-            var actions = [];
-            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.edit(\'' + row.invoiceHistoryId + '\')"><i class="fa fa-edit"></i>详情</a> ');
-            return actions.join('');
-          }
-        }]
+        // {
+        //   title: '操作',
+        //   align: 'center',
+        //   formatter: function(value, row, index) {
+        //     var actions = [];
+        //     actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.edit(\'' + row.invoiceHistoryId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+        //     return actions.join('');
+        //   }
+        // }
+      ]
     };
     $.table.init(options);
   });
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceUSD.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceUsd.html
similarity index 97%
rename from ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceUSD.html
rename to ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceUsd.html
index d236090d..4dc34002 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceUSD.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceUsd.html
@@ -430,15 +430,16 @@
                     title: '财务员',
                     field: 'financeMembers',
                 },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.edit(\'' + row.invoiceHistoryId + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                        return actions.join('');
-                    }
-                }]
+                // {
+                //     title: '操作',
+                //     align: 'center',
+                //     formatter: function(value, row, index) {
+                //         var actions = [];
+                //         actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.edit(\'' + row.invoiceHistoryId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                //         return actions.join('');
+                //     }
+                // }
+               ]
         };
         $.table.init(options);
     });