发票管理添加报告号字段

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceController.java

@@ -787,6 +787,7 @@ public class WorkInvoiceController extends BaseController {
 		String obj = request.getParameter("obj");
 		ProjectRecords projectRecords = projectRecordsService.getRuralInfo(obj);
 		map.put("pNumber",projectRecords.getProjectId());//项目编号
+		map.put("prdNumber",projectRecords.getReportData().getNumber());//报告号
 		map.put("cName",projectRecords.getWorkContractInfo().getClient().getName());//委托方
 		map.put("cInfoName",projectRecords.getWorkContractInfo().getName());//合同名称
 		map.put("cMoney",projectRecords.getWorkContractInfo().getContractPrice());//合同名称

src/main/resources/mappings/modules/projectrecord/ProjectRecordsDao.xml

@@ -68,11 +68,13 @@
 		,a.project_type as "projectType"
         ,su.name AS "createBy.name"
         ,o.top_company AS "office.name"
+		,ifnull(prd.number,'') as "reportData.number"
         FROM rural_project_records a
         <include refid="projectRecordsJoins"/>
         LEFT JOIN sys_user su ON su.id = a.create_by
         LEFT JOIN sys_office o ON o.id = a.office_id
-		WHERE a.id = #{id}
+        left join project_report_data prd on a.id = prd.project_id
+        WHERE a.id = #{id}
 	</select>
 	
 	<select id="findList" resultType="ProjectRecords" >

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceAudit.jsp

@@ -86,6 +86,12 @@
 					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.workContractInfo.client.name}"/>
 				</div>
 			</div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">报告号：</label>
+				<div class="layui-input-block">
+					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workInvoice.project.reportData.number}"/>
+				</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">--%>

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceForm.jsp

@@ -18,7 +18,9 @@
             if(validateForm.form()){
                 $("#inputForm").submit();
                 return true;
-            }
+            }else {
+				parent.layer.msg("信息未填写完整!", {icon: 5});
+			}
             return false;
         }
         $(document).ready(function() {
@@ -339,6 +341,12 @@
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.workContractInfo.client.name}"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">报告号：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workInvoice.project.reportData.number}"/>
+					</div>
+				</div>
 			</div>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>发票详情</h2></div>

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceModify.jsp

@@ -18,6 +18,8 @@
 			if(validateForm.form()){
 				$("#inputForm").submit();
 				return true;
+			}else {
+				parent.layer.msg("信息未填写完整!", {icon: 5});
 			}
 			return false;
 		}
@@ -346,6 +348,12 @@
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.workContractInfo.client.name}"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">报告号：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workInvoice.project.reportData.number}"/>
+					</div>
+				</div>
 			</div>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>发票详情</h2></div>

src/main/webapp/webpage/modules/workinvoice/workInvoiceForm.jsp

@@ -23,7 +23,9 @@
                 }
                 $("#inputForm").submit();
                 return true;
-            }
+            }else {
+				parent.layer.msg("信息未填写完整!", {icon: 5});
+			}
             return false;
         }
         $(document).ready(function() {
@@ -149,6 +151,7 @@
                     $("#cName").val(d.cName);
                     $("#officeName").val(d.officeName);
                     $("#officeId").val(d.officeId);
+					$("#prdNumber").val(d.prdNumber);
                 }
             })
         }
@@ -383,6 +386,12 @@
 						<form:input id ="cName" path="project.workContractInfo.client.name" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">报告号：</label>
+					<div class="layui-input-block">
+						<form:input id ="prdNumber" path="project.reportData.number" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+					</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">--%>

src/main/webapp/webpage/modules/workinvoice/workInvoiceModify.jsp

@@ -16,7 +16,9 @@
                 }
                 $("#inputForm").submit();
                 return true;
-            }
+            }else {
+				parent.layer.msg("信息未填写完整!", {icon: 5});
+			}
             return false;
         }
         $(document).ready(function() {
@@ -141,6 +143,7 @@
                     $("#cName").val(d.cName);
                     $("#officeName").val(d.officeName);
                     $("#officeId").val(d.officeId);
+					$("#prdNumber").val(d.prdNumber);
                 }
             })
         }
@@ -383,6 +386,12 @@
 						<form:input id ="cName" path="project.workContractInfo.client.name" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">报告号：</label>
+					<div class="layui-input-block">
+						<form:input id ="prdNumber" path="project.reportData.number" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+					</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">--%>

src/main/webapp/webpage/modules/workinvoice/workInvoiceView.jsp

@@ -83,6 +83,12 @@
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.workContractInfo.client.name}"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">报告号：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workInvoice.project.reportData.number}"/>
+					</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">--%>