社会组织、非公企业、个体商户新加详情功能

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/OrhonFgqyController.java

@@ -132,4 +132,15 @@ public class OrhonFgqyController extends com.ruoyi.common.core.controller.BaseCo
     {
         return toAjax(orhonFgqyService.deleteOrhonFgqyByIds(ids));
     }
+
+    /**
+     * 查询非公企业信息
+     */
+    @org.springframework.web.bind.annotation.GetMapping("/detail/{id}")
+    public String detail(@org.springframework.web.bind.annotation.PathVariable("id") String id, org.springframework.ui.ModelMap mmap)
+    {
+        com.ruoyi.system.domain.OrhonFgqy orhonFgqy = orhonFgqyService.selectOrhonFgqyById(id);
+        mmap.put("orhonFgqy", orhonFgqy);
+        return prefix + "/detail";
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/OrhonGtxxController.java

@@ -139,6 +139,18 @@ public class OrhonGtxxController extends BaseController
         return toAjax(orhonGtxxService.deleteOrhonGtxxByIds(ids));
     }
 
+    /**
+     * 查询个体信息
+     */
+    @GetMapping("/detail/{id}")
+    public String detail(@PathVariable("id") String id, ModelMap mmap)
+    {
+        OrhonGtxx orhonGtxx = orhonGtxxService.selectOrhonGtxxById(id);
+        mmap.put("orhonGtxx", orhonGtxx);
+        return prefix + "/detail";
+    }
+
+
     @Autowired
     private ISysDictTypeService dictTypeService;
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/OrhonShzzController.java

@@ -157,4 +157,15 @@ public class OrhonShzzController extends com.ruoyi.common.core.controller.BaseCo
     {
         return toAjax(orhonShzzService.deleteOrhonShzzByIds(ids));
     }
+
+    /**
+     * 查询社会组织信息
+     */
+    @org.springframework.web.bind.annotation.GetMapping("/detail/{id}")
+    public String detail(@org.springframework.web.bind.annotation.PathVariable("id") String id, org.springframework.ui.ModelMap mmap)
+    {
+        com.ruoyi.system.domain.OrhonShzz orhonShzz = orhonShzzService.selectOrhonShzzById(id);
+        mmap.put("orhonShzz", orhonShzz);
+        return prefix + "/detail";
+    }
 }

ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -965,6 +965,39 @@ var table = {
        			};
             	$.modal.openOptions(options);
             },
+			// 详细信息 全屏
+			detailFull: function(id) {
+                // table.set();
+                // var _url = $.operate.detailUrl(id);
+                // var options = {
+                //     title: table.options.modalName + "详细",
+                //     url: _url,
+                //     skin: 'layui-layer-gray',
+                //     btn: ['关闭'],
+                //     yes: function (index, layero) {
+                //         layer.close(index);
+                //     }
+                // };
+                // $.modal.openFull(options);
+                table.set();
+                var url = "/404.html";
+                if ($.common.isNotEmpty(id)) {
+                    url = table.options.detailUrl.replace("{id}", id);
+                } else {
+                    if(table.options.type == table_type.bootstrapTreeTable) {
+                        var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0];
+                        if ($.common.isEmpty(row)) {
+                            $.modal.alertWarning("请至少选择一条记录");
+                            return;
+                        }
+                        url = table.options.detailUrl.replace("{id}", row[table.options.uniqueId]);
+                    } else {
+                        var row = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
+                        url = table.options.detailUrl.replace("{id}", row);
+                    }
+                }
+                $.modal.openFull("修改" + table.options.modalName, url);
+			},
             // 详细访问地址
             detailUrl: function(id) {
             	var url = "/404.html";

ruoyi-admin/src/main/resources/templates/system/fgqy/fgqy.html

@@ -142,6 +142,7 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:fgqy:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:fgqy:remove')}]];
+        var detailFlag = [[${@permission.hasPermi('system:fgqy:detail')}]];
         var deptIdDatas = [[${@dict.getType('orhon_qyfl')}]];
         var typeDatas = [[${@dict.getType('orhon_qylx')}]];
         var isdyDatas = [[${@dict.getType('orhon_isdy')}]];
@@ -158,6 +159,7 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
+                detailUrl: prefix + "/detail/{id}",
                 modalName: "非公企业信息",
                 columns: [{
                     checkbox: true
@@ -211,6 +213,7 @@
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.id + '\')"><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.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailFull(\'' + row.id + '\')"><i class="fa fa-search"></i>详情</a>');
                         return actions.join('');
                     }
                 }]

ruoyi-admin/src/main/resources/templates/system/gtxx/gtxx.html

@@ -120,6 +120,7 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:gtxx:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:gtxx:remove')}]];
+        var detailFlag = [[${@permission.hasPermi('system:gtxx:detail')}]];
         var hymldmDict = [[${@dict.getType('hymldm')}]];
         var djztdmDict = [[${@dict.getType('djztdm')}]];
         var deptIdDatas = [[${@dict.getType('orhon_qyfl')}]];
@@ -132,6 +133,7 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
+                detailUrl: prefix + "/detail/{id}",
                 modalName: "个体信息",
                 columns: [{
                     checkbox: true
@@ -192,6 +194,7 @@
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.id + '\')"><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.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailFull(\'' + row.id + '\')"><i class="fa fa-search"></i>详情</a>');
                         return actions.join('');
                     }
                 }]

ruoyi-admin/src/main/resources/templates/system/shzz/shzz.html

@@ -148,6 +148,7 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:shzz:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:shzz:remove')}]];
+        var detailFlag = [[${@permission.hasPermi('system:shzz:detail')}]];
         var typeDatas = [[${@dict.getType('prhon_qylx')}]];
         var isdyDatas = [[${@dict.getType('orhon_isdy')}]];
         var isghDatas = [[${@dict.getType('is_gh')}]];
@@ -166,6 +167,7 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
+                detailUrl: prefix + "/detail/{id}",
                 modalName: "社会组织信息",
                 columns: [{
                     checkbox: true
@@ -209,6 +211,7 @@
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.id + '\')"><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.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailFull(\'' + row.id + '\')"><i class="fa fa-search"></i>详情</a>');
                         return actions.join('');
                     }
                 }]