发票项目可无合同修改

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -197,9 +197,16 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		if(projectRecords!=null){
 			String cid = projectRecords.getWorkContractInfo().getId();
 			WorkContractInfo workContractInfo = contractInfoService.get(cid);
-			WorkClientInfo workClientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
-			workContractInfo.setClient(workClientInfo);
-			projectRecords.setWorkContractInfo(workContractInfo);
+			WorkClientInfo workClientInfo = new WorkClientInfo();
+			if(null != workContractInfo){
+				workClientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+				workContractInfo.setClient(workClientInfo);
+				projectRecords.setWorkContractInfo(workContractInfo);
+			}else{
+				WorkContractInfo workContract = new WorkContractInfo();
+				workContract.setClient(workClientInfo);
+				projectRecords.setWorkContractInfo(workContract);
+			}
 		}
 		return projectRecords;
 	}

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

@@ -61,7 +61,7 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label"><span class="require-item">*</span>发票申请编号：</label>
+				<label class="layui-form-label">发票申请编号：</label>
 				<div class="layui-input-block">
 					<div class="input-group">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.number}"/>
@@ -72,19 +72,19 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
+				<label class="layui-form-label">合同名称：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.workContractInfo.name}"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label"><span class="require-item">*</span>项目编号：</label>
+				<label class="layui-form-label">项目编号：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.projectId}"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
+				<label class="layui-form-label">委托方：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.workContractInfo.client.name}"/>
 				</div>

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

@@ -444,7 +444,7 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label"><span class="require-item">*</span>发票申请编号：</label>
+				<label class="layui-form-label">发票申请编号：</label>
 				<div class="layui-input-block">
 					<div class="input-group">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.number}"/>
@@ -455,19 +455,19 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
+				<label class="layui-form-label">合同名称：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.workContractInfo.name}"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label"><span class="require-item">*</span>项目编号：</label>
+				<label class="layui-form-label">项目编号：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.projectId}"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
+				<label class="layui-form-label">委托方：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.workContractInfo.client.name}"/>
 				</div>

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

@@ -369,19 +369,19 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
+					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block">
 						<form:input id ="cInfoName" path="project.workContractInfo.name" 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>
+					<label class="layui-form-label">项目编号：</label>
 					<div class="layui-input-block">
 						<form:input id ="pNumber" path="project.projectId" 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>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<form:input id ="cName" path="project.workContractInfo.client.name" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
 					</div>

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

@@ -369,19 +369,19 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
+					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block">
 						<form:input id ="cInfoName" path="project.workContractInfo.name" 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>
+					<label class="layui-form-label">项目编号：</label>
 					<div class="layui-input-block">
 						<form:input id ="pNumber" path="project.projectId" 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>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<form:input id ="cName" path="project.workContractInfo.client.name" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
 					</div>

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

@@ -162,7 +162,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>发票申请编号：</label>
+					<label class="layui-form-label">发票申请编号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
 							<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.number}"/>
@@ -173,19 +173,19 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
+					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.workContractInfo.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>项目编号：</label>
+					<label class="layui-form-label">项目编号：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.projectId}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.workContractInfo.client.name}"/>
 					</div>

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

@@ -55,7 +55,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>发票申请编号：</label>
+					<label class="layui-form-label">发票申请编号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
 							<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.number}"/>
@@ -66,19 +66,19 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
+					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.workContractInfo.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>项目编号：</label>
+					<label class="layui-form-label">项目编号：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.projectId}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.workContractInfo.client.name}"/>
 					</div>