开票界面新增 开票类型选项

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

@@ -623,15 +623,19 @@ public class WorkInvoiceAllTwoController extends BaseController {
 			WorkInvoice t = workInvoiceService.get(workInvoice.getId());//从数据库取出记录的值
 			MyBeanUtils.copyBeanNotNull2Bean(workInvoice, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
 			workInvoiceService.save(t);//保存
+			//开票与项目关系处理
+			workInvoiceService.updateWorkInvoiceProjectRelationInfo(workInvoice);
 		}else{//新增表单保存
 			WorkClientInfo workClientInfo =workClientInfoService.get(workInvoice.getClient().getId());
-			ProjectRecords workProject =projectRecordsService.getRuralProjectRecodes(workInvoice.getProject().getId());
+//			ProjectRecords workProject =projectRecordsService.getRuralProjectRecodes(workInvoice.getProject().getId());
 			workInvoice.setClient(workClientInfo);
-			workInvoice.setProject(workProject);
+//			workInvoice.setProject(workProject);
 			workInvoice.setCompanyId(UserUtils.getSelectCompany().getId());
 			workInvoice.setOffice(UserUtils.getSelectOffice());
 			workInvoice.setInvoiceState("1");
 			workInvoiceService.save(workInvoice);//保存
+			//开票与项目关系处理
+			workInvoiceService.updateWorkInvoiceProjectRelationInfo(workInvoice);
 		}
 		addMessage(redirectAttributes, "保存发票成功");
 		return "redirect:"+Global.getAdminPath()+"/workinvoiceAllTwo/workinvoiceAllTwo/?repage";

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

@@ -842,7 +842,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"><span class="require-item">*</span>开票类型：</label>
 					<div class="layui-input-block">
 						<input type="radio" name="newDrawer" lay-filter="newDrawerRadio" title="企业开票" value="1">
 						<input type="radio" name="newDrawer" lay-filter="newDrawerRadio" title="个人开票" value="2">

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

@@ -802,7 +802,7 @@
 				</div>
 
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>开票人：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>开票类型：</label>
 					<div class="layui-input-block">
 						<input type="radio" name="newDrawer" lay-filter="newDrawerRadio" title="企业开票" value="1">
 						<input type="radio" name="newDrawer" lay-filter="newDrawerRadio" title="个人开票" value="2">

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

@@ -811,7 +811,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"><span class="require-item">*</span>开票类型：</label>
 					<div class="layui-input-block">
 						<input type="radio" name="newDrawer" lay-filter="newDrawerRadio" title="企业开票" value="1">
 						<input type="radio" name="newDrawer" lay-filter="newDrawerRadio" title="个人开票" value="2">

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

@@ -533,7 +533,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"><span class="require-item">*</span>开票类型：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false" readonly="true" id="newDrawer"  class="form-control layui-input" value="<c:choose><c:when test="${workInvoice.newDrawer eq '1'}">企业开票</c:when><c:when test="${workInvoice.newDrawer eq '2'}">个人开票</c:when></c:choose>"/>
 				</div>
@@ -576,7 +576,7 @@
 			</div>
 
 			<div class="layui-item layui-col-sm6 count2">
-				<label class="layui-form-label">姓名</label>
+				<label class="layui-form-label">姓名：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.newDrawerName}"/>
 				</div>

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

@@ -820,7 +820,7 @@
 				</div>
 
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>开票人：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>开票类型：</label>
 					<div class="layui-input-block">
 						<input type="radio" name="newDrawer" lay-filter="newDrawerRadio" title="企业开票" value="1">
 						<input type="radio" name="newDrawer" lay-filter="newDrawerRadio" title="个人开票" value="2">

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

@@ -846,7 +846,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"><span class="require-item">*</span>开票类型：</label>
 					<div class="layui-input-block">
 						<input type="radio" name="newDrawer" lay-filter="newDrawerRadio" title="企业开票" value="1">
 						<input type="radio" name="newDrawer" lay-filter="newDrawerRadio" title="个人开票" value="2">

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

@@ -801,7 +801,7 @@
 				</div>
 
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>开票人：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>开票类型：</label>
 					<div class="layui-input-block">
 						<input type="radio" name="newDrawer" lay-filter="newDrawerRadio" title="企业开票" value="1">
 						<input type="radio" name="newDrawer" lay-filter="newDrawerRadio" title="个人开票" value="2">

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

@@ -120,7 +120,7 @@
 				</div>
 
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">开票人：</label>
+					<label class="layui-form-label">开票类型：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" id="newDrawer"  class="form-control layui-input" value="<c:choose><c:when test="${workInvoice.newDrawer eq '1'}">企业开票</c:when><c:when test="${workInvoice.newDrawer eq '2'}">个人开票</c:when></c:choose>"/>
 					</div>
@@ -163,7 +163,7 @@
 				</div>
 
 				<div class="layui-item layui-col-sm6 count2">
-					<label class="layui-form-label">姓名</label>
+					<label class="layui-form-label">姓名：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   style="background-color: #f1f1f1" class="form-control layui-input" value="${workInvoice.newDrawerName}"/>
 					</div>