Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -216,7 +216,11 @@ public class ActTaskController extends BaseController {
 						}else {
 							SysRoleActivity r = systemService.getRoleActivityByEnname(buffer+role.getEnname());
 							if(r!=null&&!"".equals(r)){
-								a.setRoleName(r.getName());
+								if("signatureProjectReportWorkAudit".equals(activityProcess.getProcessKey()) && "bmzr".equals(role.getEnname())){
+									a.setRoleName("签章责任人");
+								}else{
+									a.setRoleName(r.getName());
+								}
 								a.setAssigneeName(user.getName());
 							}else if(r==null&&"qyr".equals(role.getEnname())){
 								a.setRoleName("签约人");

src/main/webapp/webpage/include/head.jsp

@@ -36,7 +36,7 @@
 
 <!-- jeeplus -->
 <link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-<script src="${ctxStatic}/common/jeeplus.js?17" type="text/javascript"></script>
+<script src="${ctxStatic}/common/jeeplus.js?19" type="text/javascript"></script>
 <script type="text/javascript" src="${ctxStatic}/common/openShow.js"></script>
 
 <!-- jquery ui -->

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkList.jsp

@@ -525,7 +525,7 @@
                 /*{checkbox: true, fixed: true},*/
                 {field:'index',align:'center', title: '序号',width:60}
                 // ,{field:'projectNum',align:'center', title: '项目编号',  width:160}
-                ,{field:'projectNum',align:'center', title: '项目编号',minWidth:200,templet:function(d){
+                ,{field:'projectNum',align:'center', title: '项目编号',width:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + '签章信息' + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看签章申请', '${ctx}/projectReport/projectReportSignature/view?id=" + d.id +"','95%', '95%')\">" + d.projectNum + "</a>";
                     }}
                 ,{field:'projectName',align:'center', title: '签章项目',  minWidth:200,templet:function(d){
@@ -541,7 +541,7 @@
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:100}
                 ,{align:'center', title: '审定单状态',  width:100,templet:function(d){
-                        var st = getAuditState(d.approvalStatus);
+                        var st = getSignatureState(d.approvalStatus);
                         if(st.action)
                             var xml ="<span onclick=\"openDialogView('流程追踪', '${ctx}/projectReport/projectReportSignature/getApprovalProcess?approvalId=" + d.approvalId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else
@@ -549,7 +549,7 @@
                         return xml;
                     }}
                 ,{align:'center', title: '报告状态',  width:100,templet:function(d){
-                        var st = getAuditState(d.reportStatus);
+                        var st = getSignatureState(d.reportStatus);
                         if(st.action)
                             var xml ="<span onclick=\"openDialogView('流程追踪', '${ctx}/projectReport/projectReportSignature/getProcess?reportId=" + d.reportId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else
@@ -557,7 +557,7 @@
                         return xml;
                     }}
 
-                ,{field:'op',align:'center',title:"操作",minWidth:160,templet:'#barDemo'}
+                ,{field:'op',align:'center',title:"操作",width:160,templet:'#barDemo'}
             ]]
             ,data: [
                 <c:if test="${ not empty page.list}">

src/main/webapp/webpage/modules/sys/sysLogin.jsp

@@ -18,7 +18,7 @@
 	<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 	<!-- jeeplus -->
 	<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-	<script src="${ctxStatic}/common/jeeplus.js?17" type="text/javascript"></script>
+	<script src="${ctxStatic}/common/jeeplus.js?19" type="text/javascript"></script>
 	<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 	<!-- text fonts -->
 	<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />

src/main/webapp/webpage/modules/sys/sysLogin2.jsp

@@ -16,7 +16,7 @@
 		<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 		<!-- jeeplus -->
 		<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-		<script src="${ctxStatic}/common/jeeplus.js?17" type="text/javascript"></script>
+		<script src="${ctxStatic}/common/jeeplus.js?19" type="text/javascript"></script>
 		<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 		<!-- text fonts -->
 		<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />