diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java index bb7f9106b..0f357a37f 100644 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java @@ -42,8 +42,8 @@ public class RequestInfoController extends BaseController{ */ @RequestMapping(value={"form"}) public String form(RequestInfo requestInfo, Model model) { - if(StringUtils.isNotEmpty(requestInfo.getRequestNumber())){ - requestInfo = requestInfoService.getRequestInfoByRequestNumber(requestInfo.getRequestNumber()); + if(requestInfo.getId()!=null){ + requestInfo = requestInfoService.getRequestInfoById(requestInfo.getId()); model.addAttribute("requestInfo", requestInfo); } model.addAttribute("requestInfo", requestInfo); @@ -59,7 +59,7 @@ public class RequestInfoController extends BaseController{ if(requestInfo.getId()!=null){ // 保存用户信息 requestInfoService.saveOrUpdate(requestInfo); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "保存success"); }else{ if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){ addMessage(model, "error"); diff --git a/src/main/webapp/WEB-INF/include/header.jsp b/src/main/webapp/WEB-INF/include/header.jsp index 28c53b828..dfefba161 100644 --- a/src/main/webapp/WEB-INF/include/header.jsp +++ b/src/main/webapp/WEB-INF/include/header.jsp @@ -46,6 +46,7 @@ + diff --git a/src/main/webapp/WEB-INF/tags/sys/message.tag b/src/main/webapp/WEB-INF/tags/sys/message.tag index 1c220fffa..e0406fd13 100644 --- a/src/main/webapp/WEB-INF/tags/sys/message.tag +++ b/src/main/webapp/WEB-INF/tags/sys/message.tag @@ -6,5 +6,5 @@
${content}
- +
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp index 19a1dde93..e44bb2714 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp @@ -13,7 +13,7 @@
-
+
@@ -87,15 +87,35 @@ rules: { requestNumber: { required: true, - } + }, + requestOrg: { + required: true, + }, + requestTime: { + required: true, + }, + requestContent: { + required: true, + }, + + }, messages: { requestNumber: { - required: "required", - } + required: "不能为空!", + }, + requestOrg: { + required: "不能为空!", + }, + requestTime: { + required: "不能为空!", + }, + requestContent: { + required: "This field is required!", + }, }, submitHandler: function(form){ - loading('正在提交,请稍等...'); + //loading('onloading...'); form.submit(); }, errorContainer: "#messageBox", diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index 6227eda29..3fb796fc6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -34,31 +34,30 @@
-  :  + : + + + +     + -   + + + + + -  :  : " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> -  :  : " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> -
@@ -68,7 +67,7 @@ - +
@@ -122,7 +121,7 @@
  • -
  • +