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('查看 '); + actions.push('查看 '); //actions.push('删除'); return actions.join(''); }