项目管理

src/main/java/com/jeeplus/modules/oa/web/OaNotifyController.java

@@ -280,6 +280,8 @@ public class OaNotifyController extends BaseController {
 		if(oaNotify.getOffice() == null || StringUtils.isBlank(oaNotify.getOffice().getId())){
             oaNotify.setOffice(UserUtils.getSelectOffice());
         }
+		String content = oaNotify.getContent();
+		model.addAttribute("content",content);
 		oaNotify.setContent("");
 		model.addAttribute("oaNotify", oaNotify);
 		model.addAttribute("flagOffice", oaNotify.getFlagOffice());
@@ -291,6 +293,7 @@ public class OaNotifyController extends BaseController {
 
 			//根据公告id查询查看公告记录信息(先修改查看记录 再进行查询)
 			List<OaNotifyView> oaNotifyViewList = oaNotifyService.getOaNotifyViewList(oaNotify.getId());
+			System.out.println(oaNotifyViewList);
 			model.addAttribute("oaNotifyViewList", oaNotifyViewList);
 			return "modules/oa/oaNotifyView";
 		}
@@ -769,6 +772,8 @@ public class OaNotifyController extends BaseController {
 	 */
 	@RequestMapping(value = "homeView")
 	public String homeView(@RequestParam(value = "readAttr",required = false)String readAttr, OaNotify oaNotify, Model model) {
+		String content = oaNotify.getContent();
+		model.addAttribute("content",content);
 		if (StringUtils.isNotBlank(oaNotify.getId())){
 			oaNotifyService.updateReadFlag(oaNotify);
 			UserUtils.pushMeIm("");

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -2400,8 +2400,8 @@ public class WorkProjectNotifyController extends BaseController {
 					//获取合同信息
 					WorkContractInfo workContractInfo=this.queryWorkContract(ruralProjectRecords.getId());
 					if(null != workContractInfo){
-						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
-						model.addAttribute("workClientInfo", clientInfo);
+						//WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+						//model.addAttribute("workClientInfo", clientInfo);
 						if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
 							//收费标准
 							String [] biao=workContractInfo.getChargeCriterion().split(",");

src/main/webapp/webpage/modules/oa/oaNotifyHomeView.jsp

@@ -184,7 +184,10 @@
                 <label class="layui-form-label"><span class="require-item">*</span>内容：</label>
                 <div class="layui-input-block">
                     <div class="wrapForm">
-                        <div class="mask">
+                        <div class="mask" style="padding-top:15px">
+                             <textarea value="${content}" style="padding-top:15px">
+
+                            </textarea>
                             <form:textarea path="contents" disabled="true" htmlEscape="false" colspan="3" rows="6" maxlength="550"
                                            class="form-control "/>
                             <form:hidden id="content" path="content" htmlEscape="false" maxlength="64"

src/main/webapp/webpage/modules/oa/oaNotifyView.jsp

@@ -161,9 +161,12 @@
                 <label class="layui-form-label"><span class="require-item">*</span>内容：</label>
                 <div class="layui-input-block">
                     <div class="wrapForm">
-                        <div class="mask">
+                        <div class="mask" style="padding-top:15px">
+                            <textarea value="${content}">
+
+                            </textarea>
                             <form:textarea path="contents" disabled="true" htmlEscape="false" colspan="3" rows="6" maxlength="550"
-                                           class="form-control "/>
+                                           class="form-control "  />
                             <form:hidden id="content" path="content" htmlEscape="false" maxlength="64"
                                          class="form-control required"/>
                             <sys:ckeditorView replace="contents" uploadPath="/oa/oa"/>

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

@@ -708,7 +708,7 @@
 					}
 				}*/
 
-				//线上归档操作
+				//归档操作
 				if(d.projectReportStatusTwo == 0){
 					if(d.projectReportStatus == 5){
 							if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
@@ -716,33 +716,33 @@
 									xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?project.companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
 								}
 
-								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 归档</a>";
 							}
 							if(d.projectReportRecordStatus == 1){
 								if(8 != d.attachmentProjectSort){
 									xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
 								}
 
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 重新归档</a>";
 							}
 							if(d.projectReportRecordStatus == 2){
-								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回线上归档</a>";
+								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回归档</a>";
 							}
 							if(d.projectReportRecordStatus == 3){
 								if(8 != d.attachmentProjectSort){
 									xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
 								}
 
-								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 重新归档</a>";
 							}
 							if(d.projectReportRecordStatus == 4){
 								//驳回操作
 								if(d.newRecordTwoNotifyFlag == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordUrgentModify?companyType=${companyType}&id=" + d.prrId + "&view=urgent','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordUrgentModify?companyType=${companyType}&id=" + d.prrId + "&view=urgent','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' >重新归档</a>";
 								}else if(d.newRecordNotifyFlag == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordUrgentModify?companyType=${companyType}&id=" + d.prrId + "&view=urgent ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordUrgentModify?companyType=${companyType}&id=" + d.prrId + "&view=urgent ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' >重新归档</a>";
 								}else{
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' >重新归档</a>";
 								}
 							}
 					}
@@ -750,26 +750,26 @@
 					if(d.projectReportStatusTwo == 5){
 						console.log(1)
 						if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
-							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' >归档</a>";
 						}
 						if(d.projectReportRecordStatus == 1){
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 重新归档</a>";
 
 						}
 						if(d.projectReportRecordStatus == 2){
-							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回线上归档</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回归档</a>";
 						}
 						if(d.projectReportRecordStatus == 3){
-							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 重新归档</a>";
 						}
 						if(d.projectReportRecordStatus == 4){
 							//驳回操作
 							if(d.newRecordTwoNotifyFlag == 1){
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 重新归档</a>";
 							}else if(d.newRecordNotifyFlag == 1){
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 重新归档</a>";
 							}else{
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 重新归档</a>";
 							}
 						}
 					}
@@ -782,7 +782,7 @@
 									xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 资料缺失说明</a>";
 								}
 								if (d.defectRecordStatus==2){
-									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回说明</a>";
+									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回说明</a>";
 								}
 								if (d.defectRecordStatus==3){
 									xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId + "&reportId=" + d.id+" ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
@@ -802,7 +802,7 @@
 								xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 资料缺失说明</a>";
 							}
 							if (d.defectRecordStatus==2){
-								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回说明</a>";
+								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回说明</a>";
 							}
 							if (d.defectRecordStatus==3){
 								xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId + "&reportId=" + d.id+" ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -375,7 +375,42 @@
 							无合同信息
 						</c:when>
 						<c:otherwise>
+							<div id="tab-12" class="tab-pane active">
+								<div class="form-group-label"><h2>客户基础信息</h2>
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label">客户名称：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.clientName}"/>
+										</div>
+									</div>
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label">公司电话：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.telephone}"/>
+										</div>
+									</div>
+									<div class="layui-item layui-col-sm6 lw7">
+										<label class="layui-form-label double-line">拥有统一社会信用代码：</label>
+										<div class="layui-input-block">
+											<input type="radio" name="hasUscc" value="1" title="是" disabled <c:if test="${workContractInfo.hasUscc=='1'}">checked</c:if>>
+											<input type="radio" name="hasUscc" value="2" title="否" disabled <c:if test="${workContractInfo.hasUscc=='2'}">checked</c:if> >
+										</div>
+									</div>
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label double-line">统一社会信用代码：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.uscCode}"/>
+										</div>
+									</div>
+								</div>
+
+							</div>
+
 							<div class="form-group layui-row first lw9">
+								<div class="form-group-label"><h2>合同信息</h2></div>
 								<div class="layui-item layui-col-sm6">
 									<label class="layui-form-label ">合同名称：</label>
 									<div class="layui-input-block">
@@ -383,12 +418,6 @@
 									</div>
 								</div>
 								<div class="layui-item layui-col-sm6">
-									<label class="layui-form-label ">客户名称：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.clientName}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6">
 									<label class="layui-form-label "><span class="require-item">*</span>签订日期：</label>
 									<div class="layui-input-block">
 										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy年MM月dd日"/>"/>

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

@@ -567,11 +567,11 @@
 				top.layer.msg("质量复核流程正在运行当中,请撤回流程！", {icon: 0});
 				return ;
 			}
-			//报告签发状态
+			/*//报告签发状态
 			if (projectReportStatusTwo == '2' || projectReportStatusTwo == '4'){
 				top.layer.msg("报告签发流程正在运行当中,请撤回流程！", {icon: 0});
 				return ;
-			}
+			}*/
 			$.ajax({
 				url: "${ctx}/ruralProject/ruralCostProjectMessage/projectUpgrade",
 				data:{
@@ -629,7 +629,7 @@
 						}
 					}
 				}
-				//报告签发操作
+				/*//报告签发操作
 				if(d.projectReportStatus == 5 && d.emergencyProject != 1){
 
 					if(d.projectReportStatusTwo == 0){
@@ -652,37 +652,37 @@
 						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?companyType=${companyType}&projectId=" + d.id + "&view=report ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改签发</a>";
 						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?companyType=${companyType}&projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 删除签发</a>";
 					}
-				}
+				}*/
 
-				//线上归档操作
+				//归档操作
 				if(d.projectReportStatusTwo == 0){
 					if(d.projectReportStatus == 5){
 							/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 							if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改质量复核</a>";
-								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 归档</a>";
 							}
 							if(d.projectReportRecordStatus == 1){
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改质量复核</a>";
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 重新归档</a>";
 							}
 							if(d.projectReportRecordStatus == 2){
-								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回线上归档</a>";
+								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回归档</a>";
 							}
 							if(d.projectReportRecordStatus == 3){
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改质量复核</a>";
-								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 重新归档</a>";
 							}
 							if(d.projectReportRecordStatus == 4){
 								//驳回操作
 								if(d.newRecordTwoNotifyFlag == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordUrgentModify?companyType=${companyType}&id=" + d.prrId + "&view=Reurgent','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
-									<%--xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档1</a>";--%>
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordUrgentModify?companyType=${companyType}&id=" + d.prrId + "&view=Reurgent','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 重新归档</a>";
+									<%--xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 重新归档1</a>";--%>
 								}else if(d.newRecordNotifyFlag == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordUrgentModify?companyType=${companyType}&id=" + d.prrId + "&view=Reurgent ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
-									<%--xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";--%>
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordUrgentModify?companyType=${companyType}&id=" + d.prrId + "&view=Reurgent ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 重新归档</a>";
+									<%--xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 重新归档</a>";--%>
 								}else{
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 重新归档</a>";
 								}
 							}
 					}
@@ -690,25 +690,25 @@
 					if(d.projectReportStatusTwo == 5){
 						/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 						if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
-							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 归档</a>";
 						}
 						if(d.projectReportRecordStatus == 1){
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 重新归档</a>";
 						}
 						if(d.projectReportRecordStatus == 2){
-							xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回线上归档</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回归档</a>";
 						}
 						if(d.projectReportRecordStatus == 3){
-							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 重新归档</a>";
 						}
 						if(d.projectReportRecordStatus == 4){
 							//驳回操作
 							if(d.newRecordTwoNotifyFlag == 1){
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 重新归档</a>";
 							}else if(d.newRecordNotifyFlag == 1){
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 重新归档</a>";
 							}else{
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 重新归档</a>";
 							}
 						}
 					}
@@ -721,7 +721,7 @@
 									xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?companyType=${companyType}&reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 资料缺失说明</a>";
 								}
 								if (d.defectRecordStatus==2){
-									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "&view=zixun\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回说明</a>";
+									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "&view=zixun\" onclick=\"return confirmx('确认要撤回该报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回说明</a>";
 								}
 								if (d.defectRecordStatus==3){
 									xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId + "&reportId=" + d.id+"&view=zixun ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改资料说明</a>";
@@ -743,7 +743,7 @@
 								xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?companyType=${companyType}&reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 资料缺失说明</a>";
 							}
 							if (d.defectRecordStatus==2){
-								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "&view=zixun\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回说明</a>";
+								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "&view=zixun\" onclick=\"return confirmx('确认要撤回该报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回说明</a>";
 							}
 							if (d.defectRecordStatus==3){
 								xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId + "&reportId=" + d.id+"&view=zixun ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改资料说明</a>";
@@ -1241,9 +1241,9 @@
                 ,{align:'center', title: '上报',  width:90,templet:function(d){
                         var st = getReportedState(d.reportedState);
                         if(st.action)
-                            var xml = "<span style='height: 32px;margin-top: 5px;margin-bottom: 5px;' onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?companyType=${companyType}&processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?companyType=${companyType}&processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else
-                            var xml = "<span style='height: 32px;margin-top: 5px;margin-bottom: 5px; 'style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
 				/*,{align:'center', title: '案例项目申报',  width:150,templet:function(d){