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('编辑 '); - actions.push('详情 '); - - return actions.join(''); + actions.push('编辑 '); + actions.push('详情 '); + 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 @@
  • - + + @@ -35,39 +35,39 @@

    经营成本

    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    @@ -75,45 +75,45 @@

    业务成本

    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    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(' '+nodeName+' '); + actions.push(' '+nodeName+' '); } } - actions.push(' 审批历史 '); - actions.push(' 进度查看 '); + actions.push(' 审批历史 '); + actions.push(' 进度查看 '); } // 详情 - actions.push(' 详情 '); - return actions.join(''); + actions.push(' 详情 '); + 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 @@ - + 导出 @@ -265,19 +265,19 @@ //待审核详情 if (row.taxInvoiceStatus=="0"){ - actions.push('详情'); + actions.push('详情'); } if (row.taxInvoiceStatus=="0" && row.commonCurrency=="1"){ - actions.push('审核'); + actions.push('审核'); } if (row.taxInvoiceStatus=="0" && row.commonCurrency=="2"){ - actions.push('审核'); + actions.push('审核'); } //审核详情 if (row.taxInvoiceStatus=="1"){ - actions.push('详情'); + actions.push('详情'); } // if (row.taxInvoiceStatus=="1" ){ @@ -285,17 +285,18 @@ // } if (row.taxInvoiceStatus=="1" && row.commonCurrency=="1"){ - actions.push('上传发票'); + actions.push('上传发票'); } if (row.taxInvoiceStatus=="1" && row.commonCurrency=="2"){ - actions.push('上传发票'); + actions.push('上传发票'); } //上传发票详情 if (row.taxInvoiceStatus=="2" ){ - actions.push('详情'); + actions.push('详情'); } - return actions.join(''); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] };