aaa

Micheal-Bigmac · Jun 13, 2014 · bbfadc9 · bbfadc9
1 parent cd89c05
commit bbfadc9
Show file tree

Hide file tree

Showing 78 changed files with 927 additions and 488 deletions.
diff --git a/.myeclipse/profiler/SendMail.xml b/.myeclipse/profiler/SendMail.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE properties SYSTEM "http:https://java.sun.com/dtd/properties.dtd">
+<properties>
+<entry key="profiler.settings.instrument.empty.methods">true</entry>
+<entry key="ProfilerCPUSettings_profile_runnables">true</entry>
+<entry key="ProfilerCPUSettings_filter_type">2</entry>
+<entry key="ProfilerMemorySettings_track_every">10</entry>
+<entry key="ProfilerMemorySettings_mode">4</entry>
+<entry key="ProfilerCPUSettings_root_classes">com.oa.action.**
+com.oa.dao.**
+com.oa.email.receiver.**
+com.oa.email.send.**
+com.oa.extend.**
+com.oa.jbpm.handler.**
+com.oa.model.**
+com.oa.service.**
+com.oa.util.**
+</entry>
+<entry key="ProfilerCPUSettings_filter_value">com.oa.action.*,
+com.oa.dao.*,
+com.oa.email.receiver.*,
+com.oa.email.send.*,
+com.oa.extend.*,
+com.oa.jbpm.handler.*,
+com.oa.model.*,
+com.oa.service.*,
+com.oa.util.*</entry>
+<entry key="profiler.settings.istrument.getter.setter.methods">true</entry>
+<entry key="myeclipse.profiling.mode">0</entry>
+<entry key="ProfilerMemorySettings_stacktraces">-1</entry>
+</properties>
diff --git a/7软件创意奖-申报书.doc b/7软件创意奖-申报书.doc
diff --git a/7软件创意奖-申报书.doc~HEAD b/7软件创意奖-申报书.doc~HEAD
diff --git a/WebRoot/JSP/OpenError.jsp b/WebRoot/JSP/OpenError.jsp
@@ -12,6 +12,8 @@
 <title>Insert title here</title>
 </head>
 <body>
-操作失败，用户权限不够；
+<script>
+ alert("对不起，您权限不够");
+ </script>
 </body>
 </html>
diff --git a/WebRoot/JSP/addAgreement.jsp b/WebRoot/JSP/addAgreement.jsp
@@ -30,19 +30,13 @@ String basePath =request.getScheme()+":https://"+request.getServerName()+":"+request.g
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="AgreementAction!addAgree" class="form-horizontal" method="post">
+ <form id="form" action="AgreementAction!addAgree?method=1" class="form-horizontal" 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">
- <s:if test="#request.agreement == null">
- <input type="hidden" name="method" value="1" />
- </s:if>
- <s:else>
- <input type="hidden" name="method" value="4" />
- </s:else>
  <input type="hidden" name="agreement.id" value="${agreement.id}" />
 
  <input type="text" class="m-wrap span12" placeholder="" name="agreement.aggState" value="${agreement.aggState}"> <span class="help-block"></span>

diff --git a/WebRoot/JSP/addContractProductRecord.jsp b/WebRoot/JSP/addContractProductRecord.jsp
@@ -34,7 +34,7 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="ContractProductAction!addContractProduct" class="form-horizontal" method="post">
+ <form id="form" action="ContractProductAction!addContractProduct?method=1" class="form-horizontal" method="post">
  <h3 class="form-section">合同产品信息</h3>
  <div class="row-fluid">
  <div class="span6 ">

diff --git a/WebRoot/JSP/addDisciplinaryRecords.jsp b/WebRoot/JSP/addDisciplinaryRecords.jsp
@@ -29,19 +29,13 @@ String basePath =request.getScheme()+":https://"+request.getServerName()+":"+request.g
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="DisciplinaryRecordsAction!addDis" class="form-horizontal" method="post">
+ <form id="form" action="DisciplinaryRecordsAction!addDis?method=1" class="form-horizontal" 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">
- <s:if test="#request.disciplinaryRecords == null">
- <input type="hidden" name="method" value="1" />
- </s:if>
- <s:else>
- <input type="hidden" name="method" value="4" />
- </s:else>
  <input type="hidden" name="disciplinaryRecords.id" value="${disciplinaryRecords.id}" />
 
  <input type="text" class="m-wrap span12" placeholder="" name="disciplinaryRecords.personId.name" value="${disciplinaryRecords.personId.name}"> <span class="help-block"></span>

diff --git a/WebRoot/JSP/addOrderProductRecord.jsp b/WebRoot/JSP/addOrderProductRecord.jsp
@@ -35,7 +35,7 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="OrderProductRecordAction!addOrderProductRecord" class="form-horizontal" method="post">
+ <form id="form" action="OrderProductRecordAction!addOrderProductRecord?method=1" class="form-horizontal" method="post">
  <h3 class="form-section">订单产品信息</h3>
  <input type="hidden" name="orderProductRecord.id" value="${orderProductRecord.id}">
  <div class="row-fluid">

diff --git a/WebRoot/JSP/addOrganization.jsp b/WebRoot/JSP/addOrganization.jsp
@@ -26,19 +26,13 @@ String basePath =request.getScheme()+":https://"+request.getServerName()+":"+request.g
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="OrganizationAction!add" class="form-horizontal">
+ <form id="form" action="OrganizationAction!add?method=1" class="form-horizontal">
  <h3 class="form-section">机构管理</h3>
  <div class="row-fluid">
  <div class="span6 ">
  <div class="control-group">
  <label class="control-label">机构名称:</label>
  <div class="controls">
- <s:if test="#request.organization == null">
- <input type="hidden" name="method" value="1" />
- </s:if>
- <s:else>
- <input type="hidden" name="method" value="4" />
- </s:else>
  <input type="hidden" name="parentid" value="${param.parentid}"/>
 
  <input type="hidden" name="organization.id" value="${organization.id}" />

diff --git a/WebRoot/JSP/addPayPaln.jsp b/WebRoot/JSP/addPayPaln.jsp
@@ -35,7 +35,7 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="PayPlanAction!addPayPlan" class="form-horizontal" method="post">
+ <form id="form" action="PayPlanAction!addPayPlan?method=1" class="form-horizontal" method="post">
  <h3 class="form-section">付款计划信息</h3>
  <div class="row-fluid">
  <div class="span6 ">

diff --git a/WebRoot/JSP/addPaymentPaln.jsp b/WebRoot/JSP/addPaymentPaln.jsp
@@ -20,7 +20,7 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="PaymentPlanAction!addPaymentPlan" class="form-horizontal">
+ <form id="form" action="PaymentPlanAction!addPaymentPlan?method=1" class="form-horizontal">
  <h3 class="form-section">收款计划信息</h3>
  <div class="row-fluid">
  <div class="span6 ">

diff --git a/WebRoot/JSP/addPerformanceExamine.jsp b/WebRoot/JSP/addPerformanceExamine.jsp
@@ -34,7 +34,7 @@
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="PerformanceExamineAction!addPerformanceExamine" class="form-horizontal" method="post">
+ <form id="form" action="PerformanceExamineAction!addPerformanceExamine?method=1" class="form-horizontal" method="post">
  <h3 class="form-section">绩效考核</h3>
  <div class="row-fluid">
  <div class="span6 ">

diff --git a/WebRoot/JSP/addPerformanceParameters.jsp b/WebRoot/JSP/addPerformanceParameters.jsp
@@ -28,21 +28,14 @@ String basePath =request.getScheme()+":https://"+request.getServerName()+":"+request.g
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="PerformanceParametersAction!addPerformanceParameters" class="form-horizontal" method="post">
+ <form id="form" action="PerformanceParametersAction!addPerformanceParameters?method=1" class="form-horizontal" 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">
- <s:if test="#request.performanceParameters == null">
- <input type="hidden" name="method" value="1" />
- </s:if>
- <s:else>
- <input type="hidden" name="method" value="4" />
- </s:else>
- <input type="hidden" name="performanceParameters.id" value="${performanceParameters.id}" />
-
+ <input type="hidden" name="performanceParameters.id" value="${performanceParameters.id}" /> 
  <input type="text" class="m-wrap span12" placeholder="" name="performanceParameters.name" value="${performanceParameters.name}"> <span class="help-block"></span>
  </div>
  </div>

diff --git a/WebRoot/JSP/addProduct.jsp b/WebRoot/JSP/addProduct.jsp
@@ -35,7 +35,7 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="ProductAction!addproduct" class="form-horizontal" method="post">
+ <form id="form" action="ProductAction!addproduct?method=1" class="form-horizontal" method="post">
  <h3 class="form-section">产品信息</h3>
  <div class="row-fluid">
  <div class="span6 ">

diff --git a/WebRoot/JSP/addPurchaseOrderRegisiter.jsp b/WebRoot/JSP/addPurchaseOrderRegisiter.jsp
@@ -36,7 +36,7 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="PurchaseOrderRegisiterAction!addPurchaseOrderRegisiter" class="form-horizontal" method="post">
+ <form id="form" action="PurchaseOrderRegisiterAction!addPurchaseOrderRegisiter?method=1" class="form-horizontal" method="post">
  <h3 class="form-section">采购订单信息</h3>
  <div class="row-fluid">
  <div class="span6 ">

diff --git a/WebRoot/JSP/addRole.jsp b/WebRoot/JSP/addRole.jsp
@@ -29,21 +29,14 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="RoleAction!addRole" class="form-horizontal">
+ <form id="form" action="RoleAction!addRole?method=1" class="form-horizontal">
  <h3 class="form-section">角色信息</h3>
  <div class="row-fluid">
  <div class="span6 ">
  <div class="control-group">
  <label class="control-label">角色名称:</label>
  <div class="controls">
- <s:if test="#request.role == null">
- <input type="hidden" name="method" value="1" />
- </s:if>
- <s:else>
- <input type="hidden" name="method" value="4" />
- </s:else>
  <input type="hidden" name="role.id" value="${role.id}" />
-
  <input type="text" class="m-wrap span12" placeholder="" name="role.name" value="${role.name}"> <span class="help-block"></span>
  </div>
  </div>

diff --git a/WebRoot/JSP/addSalesAgreement.jsp b/WebRoot/JSP/addSalesAgreement.jsp
@@ -36,7 +36,7 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="SalesAgreementAction!addSalesAgreement" class="form-horizontal" method="post">
+ <form id="form" action="SalesAgreementAction!addSalesAgreement?method=1" class="form-horizontal" method="post">
  <h3 class="form-section">销售合同信息</h3>
  <div class="row-fluid">
  <div class="span6 ">

diff --git a/WebRoot/JSP/addSupplierContract.jsp b/WebRoot/JSP/addSupplierContract.jsp
@@ -28,7 +28,7 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="SupplierContractAction!addSupplierContact" class="form-horizontal">
+ <form id="form" action="SupplierContractAction!addSupplierContact?method=1" class="form-horizontal">
  <h3 class="form-section">供应商联系人信息</h3>
  <div class="row-fluid">
  <div class="span6 ">

diff --git a/WebRoot/JSP/addSupplierManager.jsp b/WebRoot/JSP/addSupplierManager.jsp
@@ -16,7 +16,6 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </ul>
 </div>
 
-
 <div class="tab-pane active" id="tab_2">
  <div class="portlet box green">
  <div class="portlet-title">
@@ -29,7 +28,7 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </div>
  <div class="portlet-body form">
  <!-- BEGIN FORM-->
- <form id="form" action="SupplierManagerAction!addSupplierManager" class="form-horizontal">
+ <form id="form" action="SupplierManagerAction!addSupplierManager?method=1" class="form-horizontal">
  <h3 class="form-section">供应商信息</h3>
  <div class="row-fluid">
  <div class="span6 ">

diff --git a/WebRoot/JSP/agreementManage.jsp b/WebRoot/JSP/agreementManage.jsp
@@ -20,19 +20,32 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
 </div>
 
 <div class='row-fluid'> 
-<select name="select2">
- <option>
- 按录入时间
- </option>
- <option>
- 按注销时间
- </option>
-</select>
-<input name="textfield" type="text" readonly="readonly" />
-<span>至</span>
-<input name="textfield" type="text" readonly="readonly" />
-<input class="btn" name="Submit" type="button" value="查 询" style='margin-bottom: 10px;'/>
-<input name="Submit" class="btn" type="button" value="高级搜索" style='margin-bottom: 10px;'/>
+<form name="formSelect" id="form_Select" method="post" action="FindAction!findByCondition">
+<table>
+ <tr>
+ <td>
+ <select id="findCondition" name="findCondition">
+ <option value="aggId">
+ 按合同编号
+ </option>
+ <option value="aggType">
+ 按合同类型
+ </option>
+ </select>
+ </td>
+ <td>
+ <input id="className" name="className" type="hidden" value="Agreement"/>
+ <input id="textfield" name="textfield" type="text" />
+ </td>
+ <td>
+ <input id="select" class="btn" name="Submit" type="submit" value="查 询" style='margin-bottom: 10px;'/>
+ </td>
+ <td>
+ <input name="Submit" class="btn" type="button" value="高级搜索" style='margin-bottom: 10px;'/>
+ </td>
+ </tr>
+</table>
+</form>
 </div>
 
 <SCRIPT language=JavaScript>
@@ -86,7 +99,7 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </tr>
  </thead>
  <tbody>
- <s:iterator value="#request.listAgree" var="agree">
+ <s:iterator value="#request.listObject" var="agree">
  <tr bgcolor="#FFFFFF">
  <td>${agree.id}</td>
  <td>${agree.personId.name}</td>
@@ -96,7 +109,7 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  <td>${agree.signContractDate}</td>
  <td>${agree.fullAboutDate}</td>
  <td><a class="ajaxify"
- href="AgreementAction!updateAgree?agreeId=${agree.id}">修改</a>/<a class="ajaxify"
+ href="AgreementAction!updateAgree?agreeId=${agree.id}&method=4">修改</a>/<a class="ajaxify"
  href="AgreementAction!deleteAgree?agreeId=${agree.id}&method=8">删除</a>
  </td>
  </tr>
@@ -106,6 +119,7 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </div>
  <div class="row-fluid">
  <s:set var="pageCount" value="(#request.totalSize-1)/10+1" />
+ <s:set var="url" value="#request.url" />
  <div class="span4" style="margin: 20px 0px 20px 0px;">
  共
  <span >${requestScope.pageCount}</span>
@@ -114,25 +128,42 @@ String basePath = request.getScheme()+":https://"+request.getServerName()+":"+request.
  </div>
  <div class="pagination pull-right">
  <ul>
- <li class="active"><a class="ajaxify" href="AgreementAction!find?index=1">首页</a></li>
+ <li class="active"><a class="ajaxify" href="${url }&index=1">首页</a></li>
  <s:if test='(#request.currentIndex) > 1'> 
- <li class="active"><a class="ajaxify" href="AgreementAction!find?index=${requestScope.currentIndex-1}">上页</a></li>
+ <li class="active"><a class="ajaxify" href="${url }&index=${requestScope.currentIndex-1}">上页</a></li>
  </s:if>
  <s:else>
  <li class="disabled"><a href="javascript:;">上页</a></li>
  </s:else>
 
  <s:if test='(#request.currentIndex) < #pageCount'> 
- <li class="active"><a class="ajaxify" href="AgreementAction!find?index=${requestScope.currentIndex+1}">下页</a></li>
+ <li class="active"><a class="ajaxify" href="${url }&index=${requestScope.currentIndex+1}">下页</a></li>
  </s:if>
  <s:else>
  <li class="disabled"><a href="javascript:;">下页</a></li>
  </s:else>
- <li class="active"><a class="ajaxify" href="AgreementAction!find?index=${pageCount }">末页</a></li>
+ <li class="active"><a class="ajaxify" href="${url }&index=${pageCount }">末页</a></li>
  </ul>
  </div>
  </div>
  </table>
  </form>
 </div>
-<script src="js/myAjaxify.js" type="text/javascript"></script>
+<script src="js/myAjaxify.js" type="text/javascript"></script>
+<script>
+$("#select").click(function(e) {
+ e.preventDefault();
+ var pageContent = $('.page-content .page-content-body');
+ 
+ $.ajax({
+ url: $('#form_Select').attr('action'),
+ data: $('#form_Select').serialize(),
+ success: function(res) {
+ pageContent.html(res);
+ },
+ error: function(){
+ alert("你输入的有问题");
+ }
+ });
+});
+</script>