From f43a88ca59086ca16754860836b6bc66b6d9f183 Mon Sep 17 00:00:00 2001
From: 19173159168 <majian314@163.com>
Date: Wed, 30 Jul 2025 23:49:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/orders/order/order.html    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/orders/order/order.html b/ruoyi-admin/src/main/resources/templates/orders/order/order.html
index a6c6be9..bf5f13d 100644
--- a/ruoyi-admin/src/main/resources/templates/orders/order/order.html
+++ b/ruoyi-admin/src/main/resources/templates/orders/order/order.html
@@ -83,6 +83,8 @@
         var removeFlag = [[${@permission.hasPermi('orders:order:remove')}]];
         var orderStatusDatas = [[${@dict.getType('key_order_status')}]];
         var rentalTypeDatas = [[${@dict.getType('key_order_rental_type')}]];
+        var depositFreeDatas = [[${@dict.getType('key_rent_deposit_free')}]];
+        var autoDeductDatas = [[${@dict.getType('key_rent_auto_deduct')}]];
         var prefix = ctx + "orders/order";
 
         $(function() {
@@ -158,11 +160,17 @@
                 },
                 {
                     field: 'isDepositFree',
-                    title: '是否开通免押'
+                    title: '是否开通免押',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(depositFreeDatas, value);
+                    }
                 },
                 {
                     field: 'isAutoDeduct',
-                    title: '是否开通代扣'
+                    title: '是否开通代扣',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(autoDeductDatas, value);
+                    }
                 },
                 {
                     field: 'firstOrderTime',
@@ -177,7 +185,7 @@
                     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.detail(\'' + row.orderId + '\',1300,700)"><i class="fa fa-edit"></i>查看</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderId + '\',1300,700)"><i class="fa fa-edit"></i>查看</a> ');
                         //actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderId + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }