'submit'

Micheal-Bigmac · Jun 16, 2014 · f9fd3de · f9fd3de
2 parents cd20324 + 522f70d
commit f9fd3de
Show file tree

Hide file tree

Showing 16 changed files with 46 additions and 148 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 Cooperation
 ===========
 
@@ -12,3 +13,9 @@ Cooperation
 =======
 Bigmac modify
 >>>>>>> 08603f9020c9f5eff6b02ee5e40cc3f422cec74c
+=======
+OA
+==
+
+该系统使用S2SH 框架做的，为了参加洛阳杯比赛，花费时间1个半月。 前台通过修改前台框架Bootstrap，把它改成一个通用的，通过Jquery div 控制。方便以后使用。 发送的一切请求，都是Ajax请求。该系统的详细介绍在项目中 还有视频介绍。
+>>>>>>> 522f70d92cdcf2b3a9e865c80bdb095a9118dd4d
diff --git a/WebRoot/JSP/addContractProductRecord.jsp b/WebRoot/JSP/addContractProductRecord.jsp
@@ -104,29 +104,12 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </div>
 
  <div class="form-actions">
- <button id="submit" type="button" class="btn btn-primary">保存</button>
+ <button id="submit" type="button" class="btn btn-primary" data-action="ContractProductAction!ContractProductRecordList">保存</button>
  <button type="button" class="btn">Cancel</button>
  </div>
  </form>
  <!-- END FORM-->
  </div>
  </div>
 </div>
-<script>
-$("#submit").click(function(e) {
- $.ajax({
- url: $('#form').attr('action'),
- data: $('#form').serialize(),
- success: function() {
- pageContent = $('.page-content .page-content-body');
- 
- $.ajax({
- url: 'ContractProductAction!ContractProductRecordList', 
- success: function(res) {
- pageContent.html(res);
- }
- });
- }
- });
-});
-</script>
+<script src="js/myAjaxify.js" type="text/javascript"/>
diff --git a/WebRoot/JSP/addOrderProductRecord.jsp b/WebRoot/JSP/addOrderProductRecord.jsp
@@ -105,29 +105,12 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  <!--/span-->
  </div>
  <div class="form-actions">
- <button type="button" id="submit" class="btn btn-primary">保存</button>
+ <button type="button" id="submit" class="btn btn-primary" data-action="OrderProductRecordAction!OrderProductRecordList">保存</button>
  <button type="button" class="btn">Cancel</button>
  </div>
  </form>
  <!-- END FORM-->
  </div>
  </div>
 </div>
-<script>
-$("#submit").click(function(e) {
- $.ajax({
- url: $('#form').attr('action'),
- data: $('#form').serialize(),
- success: function() {
- pageContent = $('.page-content .page-content-body');
- 
- $.ajax({
- url: 'OrderProductRecordAction!OrderProductRecordList', 
- success: function(res) {
- pageContent.html(res);
- }
- });
- }
- });
-});
-</script>
+<script src="js/myAjaxify.js" type="text/javascript"/>
diff --git a/WebRoot/JSP/addPayPaln.jsp b/WebRoot/JSP/addPayPaln.jsp
@@ -100,7 +100,7 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  <!--/span-->
  </div>
  <div class="form-actions">
- <button type="button" id="submit" class="btn btn-primary">保存</button>
+ <button type="button" id="submit" data-action="PayPlanAction!PayPlanList" class="btn btn-primary">保存</button>
  <button type="button" class="btn">Cancel</button>
  </div>
  </form>
@@ -110,23 +110,9 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
 </div>
 
 <script src="js/bootstrap-datepicker.js" type="text/javascript"></script>
+<script src="js/myAjaxify.js" type="text/javascript"/>
 <script>
-$("#submit").click(function(e) {
- $.ajax({
- url: $('#form').attr('action'),
- data: $('#form').serialize(),
- success: function() {
- pageContent = $('.page-content .page-content-body');
- 
- $.ajax({
- url: 'PayPlanAction!PayPlanList', 
- success: function(res) {
- pageContent.html(res);
- }
- });
- }
- });
-});
+
 $('.datapicker').datepicker({
  autoclose : true,
  format: "yyyy-mm-dd",

diff --git a/WebRoot/JSP/addPaymentPaln.jsp b/WebRoot/JSP/addPaymentPaln.jsp
@@ -85,14 +85,15 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  <!--/span-->
  </div>
  <div class="form-actions">
- <button id="submit" type="button" class="btn btn-primary">保存</button>
+ <button id="submit" type="button" class="btn btn-primary" data-action="PaymentPlanAction!PaymentPlanList">保存</button>
  <button type="button" class="btn">Cancel</button>
  </div>
  </form>
  <!-- END FORM-->
  </div>
  </div>
 </div>
+<script src="js/myAjaxify.js" type="text/javascript"/>
 <script src="js/bootstrap-datepicker.js" type="text/javascript"></script>
 <script>
 $('.datapicker').datepicker({
@@ -102,21 +103,4 @@ $('.datapicker').datepicker({
  todayBtn: true,
  language: "zh-CN"
 });
-
-$("#submit").click(function(e) {
- $.ajax({
- url: $('#form').attr('action'),
- data: $('#form').serialize(),
- success: function() {
- pageContent = $('.page-content .page-content-body');
- 
- $.ajax({
- url: 'PaymentPlanAction!PaymentPlanList', 
- success: function(res) {
- pageContent.html(res);
- }
- });
- }
- });
-});
 </script>
diff --git a/WebRoot/JSP/addProduct.jsp b/WebRoot/JSP/addProduct.jsp
@@ -130,30 +130,12 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  <!--/span-->
  </div>
  <div class="form-actions">
- <button id="submit" type="button" class="btn btn-primary">保存</button>
+ <button id="submit" type="button" class="btn btn-primary" data-action="ProductAction!productList">保存</button>
  <button type="button" class="btn">Cancel</button>
  </div>
  </form>
  <!-- END FORM-->
  </div>
  </div>
 </div>
-
-<script>
-$("#submit").click(function(e) {
- $.ajax({
- url: $('#form').attr('action'),
- data: $('#form').serialize(),
- success: function() {
- e.preventDefault();
- pageContent = $('.page-content .page-content-body');
- $.ajax({
- url: 'ProductAction!productList', 
- success: function(res) {
- pageContent.html(res);
- }
- });
- }
- });
-});
-</script>
+<script src="js/myAjaxify.js" type="text/javascript"/>
diff --git a/WebRoot/JSP/addPurchaseOrderRegisiter.jsp b/WebRoot/JSP/addPurchaseOrderRegisiter.jsp
@@ -135,31 +135,14 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </div>
  </div>
  <div class="form-actions">
- <button id="submit" type="button" class="btn btn-primary">保存</button>
+ <button id="submit" type="button" class="btn btn-primary" data-action="PurchaseOrderRegisiterAction!PurchaseOrderRegisiterList">保存</button>
  <button type="button" class="btn">Cancel</button>
  </div>
  </form>
  <!-- END FORM-->
  </div>
  </div>
 </div>
-<script>
-$("#submit").click(function(e) {
- $.ajax({
- url: $('#form').attr('action'),
- data: $('#form').serialize(),
- success: function() {
- pageContent = $('.page-content .page-content-body');
- 
- $.ajax({
- url: 'PurchaseOrderRegisiterAction!PurchaseOrderRegisiterList', 
- success: function(res) {
- pageContent.html(res);
- }
- });
- }
- });
-});
-</script>
-
+<script src="js/myAjaxify.js" type="text/javascript"/>
+
  
diff --git a/WebRoot/JSP/addSalesAgreement.jsp b/WebRoot/JSP/addSalesAgreement.jsp
@@ -143,30 +143,12 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  <!--/span-->
  </div>
  <div class="form-actions">
- <button type="button" id="submit" class="btn btn-primary">保存</button>
+ <button type="button" id="submit" class="btn btn-primary" data-action="SalesAgreementAction!SalesAgreementList">保存</button>
  <button type="button" class="btn">Cancel</button>
  </div>
  </form>
  <!-- END FORM-->
  </div>
  </div>
 </div>
-<script>
-$("#submit").click(function(e) {
- $.ajax({
- url: $('#form').attr('action'),
- data: $('#form').serialize(),
- success: function() {
- e.preventDefault();
- pageContent = $('.page-content .page-content-body');
- 
- $.ajax({
- url: 'SalesAgreementAction!SalesAgreementList', 
- success: function(res) {
- pageContent.html(res);
- }
- });
- }
- });
-});
-</script>
+<script src="js/myAjaxify.js" type="text/javascript"/>
diff --git a/WebRoot/JSP/listDynamicForm.jsp b/WebRoot/JSP/listDynamicForm.jsp
@@ -64,7 +64,7 @@
  <table>
  <div class="row-fluid">
  <span class="newfont07">选择：<a href="#" id="selectAll">全选</a>-<a href="#" id="unselect">反选</a>
- <input class="btn" name="Submit" type="button" value="删除所选信息" id="deleteChose" data-action="DynamicFormAction!deleteDynamicForm|${url }&method=8" />
+ <%--<input class="btn" name="Submit" type="button" value="删除所选信息" id="deleteChose" data-action="DynamicFormAction!deleteDynamicForm|${url }a=1&method=8" />--%>
 
  </span> 
  </div>
@@ -113,7 +113,7 @@
  <a class="ajaxify" href="DynamicFormAction!listFormField?workflowid=${workflow.id}" 
  >定义表单</a>
  <s:if test="#workflow.form != null">
- <a class="ajaxify" href="DynamicFormAction!deleteDynamicForm?delid=${workflow.id }">删除定义表单</a>
+ <a class="ajaxify" href="DynamicFormAction!deleteDynamicForm?delid=${workflow.id }&method=8">删除定义表单</a>
  </s:if>
  </td>
  </tr>

diff --git a/WebRoot/JSP/submitDocument.jsp b/WebRoot/JSP/submitDocument.jsp
@@ -34,13 +34,14 @@
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="WorkFlowAction!addWorkFlow?method=1" class="form-horizontal" enctype="multipart/form-data" method="post">
+ <form id="form" action="WorkFlowAction!addWorkFlow" class="form-horizontal" enctype="multipart/form-data" method="post">
  <h3 class="form-section">流程信息</h3>
  <div class="row-fluid">
  <div class="span6 ">
  <div class="control-group">
  <label class="control-label">添加流程定义:</label>
  <div class="controls">
+ <input type="hidden" name="method" value="1" />
  <input class="m-wrap span12" name="uploadFiles" id="uploadFile" type="file" />
  </div>
  </div>
@@ -76,7 +77,7 @@ $("#submi").click(function(e) {
  e.preventDefault();
  
  $.ajaxFileUpload({
- url:$('#form').attr('action')+"?workFlow.id="+$('#param').val(),
+ url:$('#form').attr('action')+"?workFlow.id="+$('#param').val()+'&method=1',
  secureuri:false,
  fileElementId:'uploadFiles',
  success:function(data){

diff --git a/WebRoot/js/myAjaxify.js b/WebRoot/js/myAjaxify.js
@@ -45,7 +45,7 @@ $("#deleteChose").click(function(e){
  url:action[0],
  data:$('#fom').serialize(),
  success: function(e){
- alert("操作成功");
+
  reload();
  },
  error:function(){

diff --git a/src/com/oa/action/UserAction.java b/src/com/oa/action/UserAction.java
@@ -357,6 +357,7 @@ public String deleteDistributeRole() {
 
  public String back() {
  ServletActionContext.getRequest().getSession().removeAttribute("admin");
+
 // Map<String, String> loginUsers = (Map<String, String>)ServletActionContext.getRequest().getSession().getServletContext().getAttribute("loginUsers");
  /* Users user = (Users)ServletActionContext.getRequest().getSession().getAttribute("admin");
  System.out.println("user is "+user.getAccount());*/

diff --git a/src/com/oa/action/WorkFlowAction.java b/src/com/oa/action/WorkFlowAction.java
@@ -54,7 +54,7 @@ public String deleteWorkFlow(){
  public String addWorkFlow() {
  System.out.println("here=====");
  // System.out.println(workFlow.getId()+" add workflow");
- if (workFlow.getId() == null) {
+ if (workFlow == null) {
  System.out.println("WorkFlowAction addWorkFlow() id is null");
  boolean flag = false;
  try {

diff --git a/src/com/oa/dao/impl/ModuleDaoImp.java b/src/com/oa/dao/impl/ModuleDaoImp.java
@@ -497,7 +497,7 @@ public void UserNotDistributeRole(Users user) {
  for(int i=0; i<listParentModule.size(); i++) {
  LinkedHashMap<Module, List> categoryChildLinkedHashMap = new LinkedHashMap<Module, List>();
  Set<Module> childModules = listParentModule.get(i).getModules();
- if(category.containsKey(listParentModule.get(i))){
+ if(category.containsKey(listParentModule.get(i))) {
  continue;
  }
  if(childModules.size()>0) {
@@ -510,17 +510,20 @@ public void UserNotDistributeRole(Users user) {
  String sql4 = "from UserPrivilege ur where ur.inheritance = -1 and ur.moduleId = ?";
  UserPrivilege ur = (UserPrivilege)superDao.check(sql4, new Object[]{listChildModule.get(j)});
  if(ur != null) {
- List list = getAclState(ur.getUserValue());
- categoryChildLinkedHashMap.put(listChildModule.get(j), list);
- category.put(listParentModule.get(i), categoryChildLinkedHashMap);
+ List list = getAclState(ur.getUserValue());
+ categoryChildLinkedHashMap.put(listChildModule.get(j), list);
+ category.put(listParentModule.get(i), categoryChildLinkedHashMap);
+ System.out.println("category is not null");
  } else {
+ System.out.println("else, category is null");
  category.put(null,null);
  }
  }
  }
  }
 
  } else {
+ System.out.println("else2, category is null");
  category.put(listParentModule.get(i), null);
  }
  }

diff --git a/src/com/oa/extend/PrivilegeInterceptor.java b/src/com/oa/extend/PrivilegeInterceptor.java
@@ -54,10 +54,10 @@ public String intercept(ActionInvocation invocation) throws Exception {
  System.out.println("key is null");
  }
  Map<Module, List> mapValue = maps.get(key);
- if(key != null)
- System.out.println("map parent name is " + key.getName());
- Iterator<Module> iterChild = mapValue.keySet().iterator();
- while (iterChild.hasNext()) {
+ if(key != null) {
+  System.out.println("map parent name is " + key.getName());
+  Iterator<Module> iterChild = mapValue.keySet().iterator();
+  while (iterChild.hasNext()) {
  Module keyChild = iterChild.next();
  System.out.println("map child name is "
  + keyChild.getName());
@@ -89,6 +89,8 @@ public String intercept(ActionInvocation invocation) throws Exception {
  .hashCode();
  System.out.println("delete value is"+deleteValue);
  System.out.println("read value is "+readValue);
+ System.out.println("update value is"+updateValue);
+ System.out.println("create value is "+addValue);
  }
  if(addValue == value) {
  return invocation.invoke();
@@ -106,6 +108,7 @@ public String intercept(ActionInvocation invocation) throws Exception {
  }
  }
  }
+ }
  } 
  }
  return invocation.invoke();