From 4be6e699d927b4e062b851765b83b531e4797693 Mon Sep 17 00:00:00 2001
From: clunt <clunt@vip.163.com>
Date: Thu, 19 May 2022 19:31:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/order/master.html     | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html
index bbd1f444..1a0cd8e4 100644
--- a/ghy-admin/src/main/resources/templates/order/master.html
+++ b/ghy-admin/src/main/resources/templates/order/master.html
@@ -48,6 +48,9 @@
 <th:block th:include="include :: layout-latest-js"/>
 <th:block th:include="include :: ztree-js"/>
 <script th:inline="javascript">
+    var payTypes = [[${@dict.getType('pay_type')}]];
+    var orderTypes = [[${@dict.getType('goods_category_type')}]];
+
     var editFlag = [[${@permission.hasPermi('order:order:edit')}]];
     var prefix = ctx + "order/master";
 
@@ -94,7 +97,11 @@
                 },
                 {
                     field: 'orderType',
-                    title: '订单类型'
+                    title: '订单类型',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(orderTypes, value);
+                    }
                 },
                 {
                     field: 'orderStatus',
@@ -102,7 +109,11 @@
                 },
                 {
                     field: 'payType',
-                    title: '付款类型'
+                    title: '付款类型',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(payTypes, value);
+                    }
                 },
                 {
                     field: 'payStatus',
@@ -124,12 +135,24 @@
                     field: 'createTime',
                     title: '创建时间',
                     sortable: true
-                }
-                ]
+                }, {
+                    title: '操作',
+                    align: 'left',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                        return actions.join('');
+                    }
+                }]
         };
         $.table.init(options);
     }
 
+    function detail(id) {
+        var url = prefix ;
+        $.modal.open("字典数据", url);
+    }
+
 </script>
 </body>