opt

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyCouponCodeAdminController.java

@@ -39,7 +39,6 @@ public class CandyCouponCodeAdminController extends BaseController {
     @Autowired
     private ICandyCouponCodeAdminService candyCouponCodeAdminService;
 
-    @RequiresPermissions("candy:coupon:code:view")
     @GetMapping()
     public String view(@RequestParam String couponId, ModelMap mmap) {
         mmap.put("couponId", couponId);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/code/code.html

@@ -28,7 +28,7 @@
 		</div>
 
 		<div class="btn-group-sm" id="toolbar" role="group">
-			<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="candy:coupon:code:export">
+			<a class="btn btn-warning multiple disabled" onclick="$.table.exportExcel()" shiro:hasPermission="candy:coupon:code:export">
 				<i class="fa fa-download"></i> 导出
 			</a>
 			<a class="btn btn-primary multiple disabled" onclick="invalidHandler()" shiro:hasPermission="candy:coupon:code:invalid">

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon1.html

@@ -48,7 +48,8 @@
     </div>
     <th:block th:include="include :: footer"/>
     <script th:inline="javascript">
-        var couponCodeListFlag = [[${@permission.hasPermi('system:role:edit')}]];
+        var dicCouponBusiType = [[${@dict.getType('zhengzai_coupon_busi_type')}]];
+        var dicCouponBindType = [[${@dict.getType('zhengzai_coupon_bind_type')}]];
         var prefix = ctx + "candy/coupon/mgt";
 
         $(function () {
@@ -77,11 +78,17 @@
                     },
                     {
                         field: 'bindType',
-                        title: '类型'
+                        title: '类型',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(dicCouponBindType, value);
+                        }
                     },
                     {
                         field: 'busiType',
-                        title: '适用范围'
+                        title: '适用范围',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(dicCouponBusiType, value);
+                        }
                     },
                     {
                         field: 'title',
@@ -115,6 +122,8 @@
                         align: 'center',
                         formatter: function (value, row, index) {
                             var actions = [];
+                            if (row.bindType) {
+                            }
                             actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="couponCodeList(\'' + row.couponId + '\')"><i class="fa fa-list-ul"></i>查看码列表</a> ');
                             return actions.join('');
                         }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon2.html

@@ -48,7 +48,8 @@
 </div>
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
-	var couponCodeListFlag = [[${@permission.hasPermi('system:role:edit')}]];
+	var dicCouponBusiType = [[${@dict.getType('zhengzai_coupon_busi_type')}]];
+	var dicCouponBindType = [[${@dict.getType('zhengzai_coupon_bind_type')}]];
 	var prefix = ctx + "candy/coupon/mgt";
 
 	$(function() {
@@ -77,11 +78,17 @@
 				},
 				{
 					field: 'bindType',
-					title: '类型'
+					title: '类型',
+					formatter: function(value, row, index) {
+						return $.table.selectDictLabel(dicCouponBindType, value);
+					}
 				},
 				{
 					field: 'busiType',
-					title: '适用范围'
+					title: '适用范围',
+					formatter: function(value, row, index) {
+						return $.table.selectDictLabel(dicCouponBusiType, value);
+					}
 				},
 				{
 					field: 'title',

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon4.html

@@ -48,7 +48,8 @@
 </div>
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
-	var couponCodeListFlag = [[${@permission.hasPermi('system:role:edit')}]];
+	var dicCouponBusiType = [[${@dict.getType('zhengzai_coupon_busi_type')}]];
+	var dicCouponBindType = [[${@dict.getType('zhengzai_coupon_bind_type')}]];
 	var prefix = ctx + "candy/coupon/mgt";
 
 	$(function() {
@@ -77,11 +78,17 @@
 				},
 				{
 					field: 'bindType',
-					title: '类型'
+					title: '类型',
+					formatter: function(value, row, index) {
+						return $.table.selectDictLabel(dicCouponBindType, value);
+					}
 				},
 				{
 					field: 'busiType',
-					title: '适用范围'
+					title: '适用范围',
+					formatter: function(value, row, index) {
+						return $.table.selectDictLabel(dicCouponBindType, value);
+					}
 				},
 				{
 					field: 'title',