归档撤回、驳回后，去掉“删除归档”按钮,查看合同详情，与合同管理中的详情页面统一等

src/main/java/com/jeeplus/common/service/BaseService.java

@@ -94,6 +94,10 @@ public abstract class BaseService {
                     return sqlString.toString();
                 }
                 if (Role.DATA_SCOPE_COMPANY.equals(r.getDataScope())) {
+                    if(null == r.getBranchCompany()){
+                        sqlString.append(logic + " a.company_id = '" + r.getCompany().getId() + "'");
+                        return sqlString.toString();
+                    }
                     //查询分公司的所有部门
                     String key = BRANCH_OFFICE_PREFIX + r.getBranchCompany().getId();
                     String s = jedis.get(key);

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -286,9 +286,7 @@
                 ,{field:'projName',align:'center', title: '项目名称', fixed: 'left',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralCostProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
                     }}
-                ,{field:'projId',align:'center', title: '项目编码',minWidth:150,templet:function(d){
-                        return "<a class=\"attention-info\" title=\"" + d.projId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralCostProjectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projId + "</a>";
-                    }}
+                ,{field:'projId',align:'center', title: '项目编码',minWidth:150}
 				,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
 						return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contract + "</a>";
 					}}
@@ -371,19 +369,19 @@
 							if(d.recordedit1 != undefined && d.recordedit1 =="1")
 							{
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 重新归档</a>";
-								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";
+								/*xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";*/
 							}
 							if(d.recordedit2 != undefined && d.recordedit2 =="1")
 							{
 								//驳回操作
 								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 重新归档</a>";
-								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";
+								/*xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";*/
 							}
 							if(d.recordrecall != undefined && d.recordrecall =="1")
 							{
 								//撤回操作
 								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 重新归档</a>";
-								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";
+								/*xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";*/
 							}
 							if(d.recordcancel != undefined && d.recordcancel =="1")
 							{

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsView.jsp

@@ -422,10 +422,8 @@
 						<tr>
 							<th width="25%">报告编号</th>
 							<th width="25%">报告名称</th>
-							<th width="20%">工作内容类型</th>
-							<th width="10%">签章类型</th>
-							<th width="10%">创建日期</th>
-							<th width="10%">状态</th>
+							<th width="25%">创建日期</th>
+							<th width="25%">状态</th>
 						</tr>
 						</thead>
 						<tbody>
@@ -433,18 +431,12 @@
 							<c:when test="${not empty projectRecords.projectReportData}">
 								<c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
 									<tr>
-										<td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/projectcontentinfo/projectcontentinfo/form1?id=${projectReportData.id}','95%', '95%')">
+										<td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=${projectRecords.id}&view=view','95%', '95%')">
 												${projectReportData.number}
 										</a></td>
 										<td>
 												${projectReportData.name}
 										</td>
-										<td title="${fns:getContentTypeName(projectReportData.type,"")}">
-												${fns:getContentTypeName(projectReportData.type,"")}
-										</td>
-										<td title="${projectReportData.reportType}">
-												${projectReportData.reportType}
-										</td>
 										<td>
 											<fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
 										</td>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsView.jsp

@@ -422,10 +422,8 @@
 						<tr>
 							<th width="25%">报告编号</th>
 							<th width="25%">报告名称</th>
-							<th width="20%">工作内容类型</th>
-							<th width="10%">签章类型</th>
-							<th width="10%">创建日期</th>
-							<th width="10%">状态</th>
+							<th width="25%">创建日期</th>
+							<th width="25%">状态</th>
 						</tr>
 						</thead>
 						<tbody>
@@ -433,18 +431,12 @@
 							<c:when test="${not empty projectRecords.projectReportData}">
 								<c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
 									<tr>
-										<td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/projectcontentinfo/projectcontentinfo/form1?id=${projectReportData.id}','95%', '95%')">
+										<td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=${projectRecords.id}&view=view','95%', '95%')">
 												${projectReportData.number}
 										</a></td>
 										<td>
 												${projectReportData.name}
 										</td>
-										<td title="${fns:getContentTypeName(projectReportData.type,"")}">
-												${fns:getContentTypeName(projectReportData.type,"")}
-										</td>
-										<td title="${projectReportData.reportType}">
-												${projectReportData.reportType}
-										</td>
 										<td>
 											<fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
 										</td>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -287,9 +287,7 @@
                 ,{field:'projName',align:'center',fixed: 'left', title: '项目名称',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
                     }}
-                ,{field:'projId',align:'center', title: '项目编码',minWidth:150,templet:function(d){
-                        return "<a class=\"attention-info\" title=\"" + d.projId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projId + "</a>";
-                    }}
+                ,{field:'projId',align:'center', title: '项目编码',minWidth:150}
 				,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
 						return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contract + "</a>";
 					}}
@@ -374,17 +372,17 @@
 							if(d.recordedit1 != undefined && d.recordedit1 =="1")
 							{
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 重新归档</a>";
-								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";
+								/*xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";*/
 							}
 							if(d.recordedit2 != undefined && d.recordedit2 =="1")
 							{
 								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 重新归档</a>";
-								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";
+								/*xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";*/
 							}
 							if(d.recordrecall != undefined && d.recordrecall =="1")
 							{
 								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 重新归档</a>";
-								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";
+								/*xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";*/
 							}
 							if(d.recordcancel != undefined && d.recordcancel =="1")
 							{

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoList.jsp

@@ -227,7 +227,7 @@
                         "<span title=" + d.name + ">" + d.name + "</span></a>";
                     return xml;
                 }}
-                ,{field:'idCard',align:'center', title: '身份证号码',minWidth:150,edit: 'text'}
+                ,{field:'idCard',align:'center', title: '身份证号码',minWidth:150}
                 ,{field:'mobile',align:'center', title: '移动电话', minWidth:100}
                 ,{field:'office',align:'center', title: '部门', minWidth:100}
                 // ,{field:'role',align:'center', title: '岗位', minWidth:100}