From b1ee31eabfedcdb6e4382f64ddb8da68e01c50b7 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 12 Dec 2024 16:32:53 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=9B=BD=E7=A8=8E=E5=8F=91=E7=A5=A8=E3=80=81=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E3=80=81=E5=85=AC=E5=8F=B8=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E5=92=8C=E6=8A=A5=E9=94=80=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=E5=92=8C=E8=A1=A8=E5=A4=B4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=B0=83=E6=95=B4=E4=B8=BA=E7=BB=9F=E4=B8=80=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=20=E5=85=AC=E5=8F=B8=E6=88=90=E6=9C=AC=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E6=89=80=E6=9C=89=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=8F=AA=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../compantFixedAssets.html                   |  8 +--
 .../financial/companyCost/companyCost.html    | 11 ++--
 .../financial/companyCost/detail.html         | 50 +++++++++----------
 .../templates/financial/expense/expense.html  | 11 ++--
 .../financial/taxInvoice/taxInvoice.html      | 19 +++----
 5 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/compantFixedAssets.html b/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/compantFixedAssets.html
index 558d0345..0c6735cc 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/compantFixedAssets.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/compantFixedAssets.html
@@ -132,10 +132,10 @@
                     {title: '操作',align: 'center',
                         formatter: function(value, row, index) {
                             var actions = [];
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.compantFixedAssetsId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.compantFixedAssetsId + '\')"><i class="fa fa-eye"></i>详情</a> ');
-                            
-                            return actions.join('');
+                            actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.compantFixedAssetsId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            actions.push('<a href="javascript:void(0)" onclick="$.operate.detail(\'' + row.compantFixedAssetsId + '\')"><i class="fa fa-eye"></i>详情</a> ');
+                            var actionLinks = actions.join('');
+                            return $.table.dropdownToggle(actionLinks);
                         }
                     }
                 ]
diff --git a/ruoyi-admin/src/main/resources/templates/financial/companyCost/companyCost.html b/ruoyi-admin/src/main/resources/templates/financial/companyCost/companyCost.html
index 10240f2a..fec03b0b 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/companyCost/companyCost.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/companyCost/companyCost.html
@@ -19,7 +19,7 @@
                                 <input type="number" name="costYear"/>
                             </li>
                             <li>
-                                <label for="costMonth">月份：</label>
+                                <label>月份：</label>
                                 <select class="form-control" name="costMonth">
                                     <option value="">请选择</option>
                                     <option th:each="item : ${@dict.getType('sys_month')}" th:text="${item.dictLabel}" th:value="${item.dictValue}"></option>
@@ -45,7 +45,7 @@
                     <i class="fa fa-plus"></i> 添加
                 </a>
                 <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="financial:companyCost:export">
-                    <i class="fa fa-plus"></i> 导出
+                    <i class="fa fa-download"></i> 导出
                 </a>
             </div>
             <div class="col-sm-12 select-table table-striped">
@@ -97,10 +97,11 @@
                         align: 'center',
                         formatter: function(value, row, index) {
                             var actions = [];
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                            actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i>详情</a> ');
+                            actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i>详情</a> ');
                             // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
-                            return actions.join('');
+                            var actionLinks = actions.join('');
+                            return $.table.dropdownToggle(actionLinks);
                         }
                     }
                 ]
diff --git a/ruoyi-admin/src/main/resources/templates/financial/companyCost/detail.html b/ruoyi-admin/src/main/resources/templates/financial/companyCost/detail.html
index 86a4dd19..7cab2ecb 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/companyCost/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/companyCost/detail.html
@@ -27,7 +27,7 @@
                 <div class="form-group">
                     <label class="col-sm-3 control-label">备注：</label>
                     <div class="col-sm-8">
-                        <textarea name="remark" th:field="*{remark}" class="form-control"></textarea>
+                        <textarea name="remark" th:text="*{remark}" class="form-control" readonly></textarea>
                     </div>
                 </div>
             </div>
@@ -35,39 +35,39 @@
             <div class="form-group" hidden="hidden">
                 <label class="col-sm-3 control-label">经营成本：</label>
                 <div class="col-sm-8">
-                    <input id="operatingCosts" name="operatingCosts" th:field="*{operatingCosts}" class="form-control" type="number">
+                    <input id="operatingCosts" name="operatingCosts" th:field="*{operatingCosts}" class="form-control" type="number" readonly>
                 </div>
             </div>
             <div class="container">
                 <h3>经营成本</h3>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">工资费用：</label>
+                    <label class="col-sm-3 control-label">工资费用：</label>
                     <div class="col-sm-8">
-                        <input name="salaryExpenses" th:field="*{salaryExpenses}" class="form-control" type="number" required>
+                        <input name="salaryExpenses" th:field="*{salaryExpenses}" class="form-control" type="number" readonly>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">厂租费用：</label>
+                    <label class="col-sm-3 control-label">厂租费用：</label>
                     <div class="col-sm-8">
-                        <input name="factoryRentalFees" th:field="*{factoryRentalFees}" class="form-control" type="number" required>
+                        <input name="factoryRentalFees" th:field="*{factoryRentalFees}" class="form-control" type="number" readonly>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">税金费用：</label>
+                    <label class="col-sm-3 control-label">税金费用：</label>
                     <div class="col-sm-8">
-                        <input name="taxExpenses" th:field="*{taxExpenses}" class="form-control" type="number" required>
+                        <input name="taxExpenses" th:field="*{taxExpenses}" class="form-control" type="number" readonly>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">工厂电费：</label>
+                    <label class="col-sm-3 control-label">工厂电费：</label>
                     <div class="col-sm-8">
-                        <input name="factoryElectricityFees" th:field="*{factoryElectricityFees}" class="form-control" type="number" required>
+                        <input name="factoryElectricityFees" th:field="*{factoryElectricityFees}" class="form-control" type="number" readonly>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">其他费用：</label>
+                    <label class="col-sm-3 control-label">其他费用：</label>
                     <div class="col-sm-8">
-                        <input name="ohterExpenses" th:field="*{ohterExpenses}" class="form-control" type="number" requirede>
+                        <input name="ohterExpenses" th:field="*{ohterExpenses}" class="form-control" type="number" readonly>
                     </div>
                 </div>
             </div>
@@ -75,45 +75,45 @@
             <div class="form-group" hidden="hidden">
                 <label class="col-sm-3 control-label">业务成本：</label>
                 <div class="col-sm-8">
-                    <input id="businessCost" name="businessCost" th:field="*{businessCost}" class="form-control" type="number">
+                    <input id="businessCost" name="businessCost" th:field="*{businessCost}" class="form-control" type="number" readonly>
                 </div>
             </div>
             <div class="container">
                 <h3>业务成本</h3>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">运输费用：</label>
+                    <label class="col-sm-3 control-label">运输费用：</label>
                     <div class="col-sm-8">
-                        <input name="transportationCosts" th:field="*{transportationCosts}" class="form-control" type="number" required>
+                        <input name="transportationCosts" th:field="*{transportationCosts}" class="form-control" type="number" readonly>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">推广费用：</label>
+                    <label class="col-sm-3 control-label">推广费用：</label>
                     <div class="col-sm-8">
-                        <input name="promotionExpenses" th:field="*{promotionExpenses}" class="form-control" type="number" required>
+                        <input name="promotionExpenses" th:field="*{promotionExpenses}" class="form-control" type="number" readonly>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">包装费用：</label>
+                    <label class="col-sm-3 control-label">包装费用：</label>
                     <div class="col-sm-8">
-                        <input name="packagingCost" th:field="*{packagingCost}" class="form-control" type="number" required>
+                        <input name="packagingCost" th:field="*{packagingCost}" class="form-control" type="number" readonly>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">业务费用：</label>
+                    <label class="col-sm-3 control-label">业务费用：</label>
                     <div class="col-sm-8">
-                        <input name="businessExpenses" th:field="*{businessExpenses}" class="form-control" type="number" required>
+                        <input name="businessExpenses" th:field="*{businessExpenses}" class="form-control" type="number" readonly>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">售后费用：</label>
+                    <label class="col-sm-3 control-label">售后费用：</label>
                     <div class="col-sm-8">
-                        <input name="afterSalesExpenses" th:field="*{afterSalesExpenses}" class="form-control" type="number" required>
+                        <input name="afterSalesExpenses" th:field="*{afterSalesExpenses}" class="form-control" type="number" readonly>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">业务提成：</label>
+                    <label class="col-sm-3 control-label">业务提成：</label>
                     <div class="col-sm-8">
-                        <input name="businessCommission" th:field="*{businessCommission}" class="form-control" type="number" required>
+                        <input name="businessCommission" th:field="*{businessCommission}" class="form-control" type="number" readonly>
                     </div>
                 </div>
             </div>
diff --git a/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html b/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html
index 701bd533..b481455e 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html
@@ -202,15 +202,16 @@
                                 var todoUserIdList = row.todoUserId.split(",");
                                 if(todoUserIdList.includes(loginName)){
                                     var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
-                                    actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix1 + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+ row.instanceTypeName +"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
+                                    actions.push('<a href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix1 + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+ row.instanceTypeName +"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
                                 }
                             }
-                            actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
-                            actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
+                            actions.push('<a href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
+                            actions.push('<a href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
                         }
                         // 详情
-                        actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.expenseId + '\')"><i class="fa fa-eye"></i> 详情</a> ');
-                        return actions.join('');
+                        actions.push('<a href="javascript:void(0)" onclick="$.operate.detail(\'' + row.expenseId + '\')"><i class="fa fa-eye"></i> 详情</a> ');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }
             ],
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 f03faa93..a9356cb9 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/taxInvoice/taxInvoice.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/taxInvoice/taxInvoice.html
@@ -87,7 +87,7 @@
 <!--                <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">
+                <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="financial:taxInvoice:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -265,19 +265,19 @@
 
                         //待审核详情
                         if (row.taxInvoiceStatus=="0"){
-                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="beforeAuditInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>');
+                            actions.push('<a  href="javascript:void(0)" onclick="beforeAuditInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>');
                         }
 
                         if (row.taxInvoiceStatus=="0" && row.commonCurrency=="1"){
-                            actions.push('<a class="btn btn-success btn-xs ' + auditInvoiceFlag + '" href="javascript:void(0)" onclick="auditInvoiceRmb(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>审核</a>');
+                            actions.push('<a class=" ' + auditInvoiceFlag + '" href="javascript:void(0)" onclick="auditInvoiceRmb(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>审核</a>');
                         }
 
                         if (row.taxInvoiceStatus=="0" && row.commonCurrency=="2"){
-                            actions.push('<a class="btn btn-success btn-xs ' + auditInvoiceFlag + '" href="javascript:void(0)" onclick="auditInvoiceUsd(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>审核</a>');
+                            actions.push('<a class=" ' + auditInvoiceFlag + '" href="javascript:void(0)" onclick="auditInvoiceUsd(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>审核</a>');
                         }
                         //审核详情
                        if (row.taxInvoiceStatus=="1"){
-                           actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="auditInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>');
+                           actions.push('<a  href="javascript:void(0)" onclick="auditInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>');
                        }
 
                         // if (row.taxInvoiceStatus=="1" ){
@@ -285,17 +285,18 @@
                         // }
 
                         if (row.taxInvoiceStatus=="1" && row.commonCurrency=="1"){
-                            actions.push('<a class="btn btn-success btn-xs ' + uploadInvoiceFlag + '" href="javascript:void(0)" onclick="uploadInvoiceRmb(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>上传发票</a>');
+                            actions.push('<a class=" ' + uploadInvoiceFlag + '" href="javascript:void(0)" onclick="uploadInvoiceRmb(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>上传发票</a>');
                         }
 
                         if (row.taxInvoiceStatus=="1" && row.commonCurrency=="2"){
-                            actions.push('<a class="btn btn-success btn-xs ' + uploadInvoiceFlag + '" href="javascript:void(0)" onclick="uploadInvoiceUsd(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>上传发票</a>');
+                            actions.push('<a class=" ' + uploadInvoiceFlag + '" href="javascript:void(0)" onclick="uploadInvoiceUsd(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>上传发票</a>');
                         }
                         //上传发票详情
                         if (row.taxInvoiceStatus=="2" ){
-                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="uploadInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>');
+                            actions.push('<a  href="javascript:void(0)" onclick="uploadInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>');
                         }
-                        return actions.join('');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }]
             };