项目登记列表，增加“报告号”

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -125,6 +125,17 @@ public class RuralCostProjectRecordsController extends BaseController {
 					records1.setWorkContractInfo(contractInfo);
 				}
 			}
+			//获取项目报告号
+			if(records1.getReportData()==null){
+				ruralProjectMessageService.queryReportData(records1);
+				if (records1.getProjectReportData() != null && records1.getProjectReportData().size() > 0) {
+					ProjectReportData reportData = records1.getProjectReportData().get(0);
+					ProjectReportData projectReportData = new ProjectReportData();
+					projectReportData.setNumber(reportData.getNumber());
+//					records1.setReportData(projectReportData);
+					records1.setProjectReportNumber(reportData.getNumber());
+				}
+			}
 			//判断是否为admin
 			if (UserUtils.isManager()){
 				records1.setFlagAdmin("1");

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -119,6 +119,7 @@ public class RuralProjectRecordsController extends BaseController {
 		List<RuralProjectRecords> list = page.getList();
 		for (int i = 0; i < list.size(); i++) {
 			RuralProjectRecords records1 = list.get(i);
+			//无合同状态下，获取委托方的名称
 			if (records1.getWorkContractInfo() == null) {
 				projectRecordsService.queryLinkmanInfos(records1);
 				if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
@@ -128,6 +129,17 @@ public class RuralProjectRecordsController extends BaseController {
 					records1.setWorkContractInfo(contractInfo);
 				}
 			}
+			//获取项目报告号
+			if(records1.getReportData()==null){
+				ruralProjectMessageService.queryReportData(records1);
+				if (records1.getProjectReportData() != null && records1.getProjectReportData().size() > 0) {
+					ProjectReportData reportData = records1.getProjectReportData().get(0);
+					ProjectReportData projectReportData = new ProjectReportData();
+					projectReportData.setNumber(reportData.getNumber());
+//					records1.setReportData(projectReportData);
+					records1.setProjectReportNumber(reportData.getNumber());
+				}
+			}
 			//判断是否为admin
 			if (UserUtils.isManager()){
 				records1.setFlagAdmin("1");

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

@@ -528,14 +528,22 @@
 						}},
 					{field: 'clientName', align:'center', title: '报告号',width:170,templet: function(d){
 							if(0 == d.pid){
-								return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+								if(""!= d.projectReportNumber){
+									return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+								}else{
+									return "<span title='暂无报告'  style='color: #009688'>暂无报告</span>";
+								}
 							}else{
 								return "<font></font>";
 							}
 						}},
                     {field: 'projectLeader', align:'center', title: '合同名称',width:180,templet: function(d){
 							if(0 == d.pid){
-								return "<a class=\"attention-info pid\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";
+								if(""!= d.contractName){
+									return "<a class=\"attention-info pid\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";
+								}else{
+									return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
+								}
 							}else{
 								return "<font></font>";
 							}

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

@@ -92,7 +92,41 @@
                 }
             });
         }
+		//打开对话框(查看)
+		function openDialogReportView(title,url,id,width,height){
 
+
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralCostProjectMessage/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						top.layer.open({
+							type: 2,
+							skin: 'one-btn',
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							content: url ,
+							btn: ['关闭'],
+							cancel: function(index){
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+		}
         function openDialogre(title,url,width,height,target,buttons) {
 
             if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
@@ -294,6 +328,13 @@
                 /*,{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: 'clientName', align:'center', title: '报告号',width:170,templet: function(d){
+						if(""!= d.projectReportNumber){
+							return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+						}else{
+							return "<span title='暂无报告'  style='color: #009688'>暂无报告</span>";
+						}
+					}}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
 						if(""!= d.contract){
 							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
@@ -369,6 +410,7 @@
                     ,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
                     ,"contract":"${projectRecords.workContractInfo.name}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
+                    ,"projectReportNumber":"${projectRecords.projectReportNumber}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectStatus":"${projectRecords.projectStatus}"
 					,"projectReportRecordStatus":"${projectRecords.projectReportRecordStatus}"

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

@@ -112,7 +112,41 @@
                 }
             });
         }
+		//打开对话框(查看)
+		function openDialogReportView(title,url,id,width,height){
 
+
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralProjectMessage/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						top.layer.open({
+							type: 2,
+							skin: 'one-btn',
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							content: url ,
+							btn: ['关闭'],
+							cancel: function(index){
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+		}
         function openDialogre(title,url,width,height,target,buttons) {
 
             if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
@@ -319,6 +353,13 @@
                 /*,{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: 'clientName', align:'center', title: '报告号',width:170,templet: function(d){
+						if(""!= d.projectReportNumber){
+							return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+						}else{
+							return "<span title='暂无报告'  style='color: #009688'>暂无报告</span>";
+						}
+					}}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
                 		if(""!= d.contract){
 							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
@@ -397,6 +438,7 @@
                     ,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
                     ,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
                     ,"contract":"${projectRecords.workContractInfo.name}"
+                    ,"projectReportNumber":"${projectRecords.projectReportNumber}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectStatus":"${projectRecords.projectStatus}"

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportView.jsp

@@ -48,7 +48,8 @@
 					<label class="layui-form-label">项目编号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
-							<form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectId}"/>
+<%--							<form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>--%>
 							<span class="input-group-btn">
                                 <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'rural_project_audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
                              </span>
@@ -82,19 +83,22 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所在省份：</label>
 					<div class="layui-input-block">
-						<form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>
+<%--						<form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所在地级市：</label>
 					<div class="layui-input-block">
-						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>
+<%--						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所在区县：</label>
 					<div class="layui-input-block">
-						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.county}"/>
+<%--						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -142,7 +146,9 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label">项目类别：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(projectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+
+<%--						<input htmlEscape="false" readonly="true" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>--%>
 					</div>
 				</div>
 					<%--<div class="layui-item layui-col-sm6 lw6">

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

@@ -528,14 +528,22 @@
 						}},
 					{field: 'clientName', align:'center', title: '报告号',width:170,templet: function(d){
 							if(0 == d.pid){
-								return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+								if(""!= d.projectReportNumber){
+									return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+								}else{
+									return "<span title='暂无报告'  style='color: #009688'>暂无报告</span>";
+								}
 							}else{
 								return "<font></font>";
 							}
 						}},
                     {field: 'projectLeader', align:'center', title: '合同名称',width:180,templet: function(d){
 							if(0 == d.pid){
-								return "<a class=\"attention-info pid\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";
+								if(""!= d.contractName){
+									return "<a class=\"attention-info pid\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";
+								}else{
+									return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
+								}
 							}else{
 								return "<font></font>";
 							}