diff --git a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java index 76d6d8c20..22c785dde 100644 --- a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java +++ b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java @@ -41,7 +41,7 @@ public class SystemServiceController extends BaseController { @RequiresPermissions("system:service:view") @RequestMapping(value = "list") public String list(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) { - Page page = systemServiceService.findPage(new Page(request, response, 1), systemServiceInfo); + Page page = systemServiceService.findPage(new Page(request, response, 30), systemServiceInfo); model.addAttribute("page", page); return "/systemService/list"; } diff --git a/src/main/webapp/WEB-INF/views/systemService/form.jsp b/src/main/webapp/WEB-INF/views/systemService/form.jsp index be301a63c..31b979583 100644 --- a/src/main/webapp/WEB-INF/views/systemService/form.jsp +++ b/src/main/webapp/WEB-INF/views/systemService/form.jsp @@ -88,6 +88,12 @@ } }); + window.onload = function() { + $("[data-id=serviceType]").click(function() { + now = $("#serviceType").val(); + }); + } + function changeType(v, obj) { if ($(obj).val() == '') { $("#addBtn").attr("disabled", true); @@ -164,7 +170,7 @@ '
' + '*'+''+': ' + ' ' + - ' ' + '' + '' + '' + @@ -184,7 +190,7 @@ '
' + '' ); - + $("[name=tableType]").selectpicker('refresh'); if ($("#serviceType").val() == '1' || $("#serviceType").val() == '3') { $("#addBtn").attr("disabled", true); } @@ -239,7 +245,7 @@
- + @@ -254,7 +260,7 @@
- + @@ -284,7 +290,7 @@
*: - diff --git a/src/main/webapp/WEB-INF/views/systemService/list.jsp b/src/main/webapp/WEB-INF/views/systemService/list.jsp index f573bccc3..263d6db36 100644 --- a/src/main/webapp/WEB-INF/views/systemService/list.jsp +++ b/src/main/webapp/WEB-INF/views/systemService/list.jsp @@ -3,7 +3,7 @@ 系统业务类型管理列表 - + <%-- --%> @@ -36,29 +36,24 @@ function deleteService(id) {

+

+
-
-
-
- -
-
- +
- - - - - -
+
+ + + + +
- - : - - +
+ + @@ -66,36 +61,29 @@ function deleteService(id) { - - - - : - - +
+
+ + - - - - : - - - - - : - - - - -
+
+ " value="${systemServiceInfo.serviceName }"/> +
+
+ " value="${systemServiceInfo.serviceId }"/> +
+
+ - +
-
- + +
@@ -105,7 +93,7 @@ function deleteService(id) { - + diff --git a/src/main/webapp/static/pages/css/systemService.css b/src/main/webapp/static/pages/css/systemService.css index 88d4a09ca..08d1e1bb3 100644 --- a/src/main/webapp/static/pages/css/systemService.css +++ b/src/main/webapp/static/pages/css/systemService.css @@ -34,13 +34,9 @@ select, input { font-size: 12px; padding-left: 6px; } -.datatable-index { - width: 14px; - display: inline-block; -} -#datatables select { - height: 34px; - vertical-align: middle; +.child-required2 { + color: #e02222; + font-size: 12px; } .del-button { float: right; @@ -53,4 +49,11 @@ select, input { .table-item { margin-top: 5px; margin-bottom: 5px; +} +.btn-group.bootstrap-select.child-required2.select2 { + height: 34px; + width: 50% !important; + margin-left: 5px; + margin-top: 6px; + margin-bottom: 6px; } \ No newline at end of file