发票-红字发票添加是否关联发票和情况说明

src/main/java/com/jeeplus/modules/workinvoice/entity/WorkInvoice.java

@@ -131,6 +131,9 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	private Integer redInvoiceFlag; //是否红字发票
 	private String redInvoiceRelevancyId;	//红字发票关联其他发票id
 	private String redInvoiceRelevancyNumber;	//红字发票关联其他发票编号
+	private Integer relatedInvoice;	//是否关联发票
+
+	private String situationDetail;	//情况说明
 	private List<String> redNotStatusList;
 	private List<WorkInvoiceCloud> workInvoiceCloudList;
 	private String isSzCloud; //判断是否是苏州分公司的发票数据
@@ -965,4 +968,19 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setIdCard(String idCard) {
 		this.idCard = idCard;
 	}
+	public Integer getRelatedInvoice() {
+		return relatedInvoice;
+	}
+
+	public void setRelatedInvoice(Integer relatedInvoice) {
+		this.relatedInvoice = relatedInvoice;
+	}
+
+	public String getSituationDetail() {
+		return situationDetail;
+	}
+
+	public void setSituationDetail(String situationDetail) {
+		this.situationDetail = situationDetail;
+	}
 }

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceService.java

@@ -815,7 +815,11 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 		String officeId = UserUtils.getUser().getOffice().getId();
 		Office office = officeService.get(officeId);
 		workInvoice.setOffice(office);
+		try{
 			super.save(workInvoice);
+		}catch (Exception e){
+			throw new RuntimeException(e);
+		}
 		//保存附件
 		this.saveAttachments(workInvoice);
 		String str = "";

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -70,6 +70,8 @@
 		a.electronic_invoice_flag as "electronicInvoiceFlag",
 		a.cancellation_process_instance_id as "cancellationProcessInstanceId",
 		a.cancellation_state as "cancellationState",
+		a.related_invoice as "relatedInvoice",
+		a.situation_detail as "situationDetail",
 		a.red_invoice_flag as "redInvoiceFlag",
 		a.red_invoice_relevancy_id as "redInvoiceRelevancyId",
 		a.red_invoice_relevancy_number as "redInvoiceRelevancyNumber",
@@ -1941,6 +1943,8 @@
 			red_invoice_flag,
 			red_invoice_relevancy_id,
 			red_invoice_relevancy_number,
+			related_invoice,
+			situation_detail,
 			id_card,
 			is_sz_cloud
 		) VALUES (
@@ -1991,7 +1995,9 @@
 		    #{actualDrawerId},
 		    #{redInvoiceFlag},
 		    #{redInvoiceRelevancyId},
-		    #{redInvoiceRelevancyNumber},
+			#{redInvoiceRelevancyNumber},
+			#{relatedInvoice},
+			#{situationDetail},
 		    #{idCard},
 		    #{isSzCloud}
 		)
@@ -2052,6 +2058,8 @@
 			,red_invoice_flag = #{redInvoiceFlag}
 			,red_invoice_relevancy_id = #{redInvoiceRelevancyId}
 			,red_invoice_relevancy_number = #{redInvoiceRelevancyNumber}
+		    ,related_invoice  = #{relatedInvoice}
+		    ,situation_detail  = #{situationDetail}
 			,id_card = #{idCard}
 		WHERE id = #{id}
 	</update>

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

@@ -126,14 +126,26 @@
 				$(".contractType").show();
 				$("#contractTypeDoc").attr("class","form-control judgment");
 			}
+
 			var redInvoiceFlag = '${workInvoice.redInvoiceFlag}';//后端获取值
 			if(undefined == redInvoiceFlag || null == redInvoiceFlag || '' == redInvoiceFlag || redInvoiceFlag == "0"){
 				document.getElementsByName("redInvoiceFlag")[1].checked = true;
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
+				$(".situationDetail").hide();
 			}else{
 				document.getElementsByName("redInvoiceFlag")[0].checked = true;
-				$(".redInvoice").show();
-
+				$(".relatedInvoice").show();
+				var relatedInvoice = '${workInvoice.relatedInvoice}';//后端获取值
+				if(undefined == relatedInvoice || null == relatedInvoice || '' == relatedInvoice || relatedInvoice == "0"){
+					document.getElementsByName("relatedInvoice")[1].checked = true;
+					$(".redInvoice").hide();
+					$(".situationDetail").show();
+				}else{
+					document.getElementsByName("relatedInvoice")[0].checked = true;
+					$(".redInvoice").show();
+					$(".situationDetail").hide();
+				}
 			}
 
 			var newDrawerRadio = '${workInvoice.newDrawer}';//后端获取值
@@ -171,15 +183,38 @@
 					}
 				});
 
-				form.on('radio(redInvoiceFlagRadio)',function (event) {
+				form.on('radio(redInvoiceFlagRadio)', function (event) {
 					var radioVal = $(this).val();
-					if(radioVal == 1 || radioVal == 1){
+
+					if (radioVal == "1") {
+						$(".relatedInvoice").show();
+						document.getElementsByName("relatedInvoice")[0].checked = true;
+						$(".situationDetail").hide();
 						$(".redInvoice").show();
-					}else if(radioVal == 0 || radioVal == 0){
+					} else {
+						$(".relatedInvoice").hide();
+						$(".situationDetail").hide();
 						$(".redInvoice").hide();
 					}
-					form.render();
-				})
+					form.render("radio");
+				});
+
+				form.on('radio(relatedInvoiceRadio)', function (event) {
+					var radioVal = $(this).val();
+					if (radioVal == "1") {
+						$('textarea[name="situationDetail"]').val('');
+						$(".situationDetail").hide();
+						$(".redInvoice").show();
+					} else {
+						// 切换时清空数据
+						$("#redInvoiceRelevancyIdId").val("");
+						$("#redInvoiceRelevancyIdName").val("");
+						$("#invoiceNumberStr").val("")
+						$(".redInvoice").hide();
+						$(".situationDetail").show();
+					}
+					form.render("radio");
+				});
 
 				form.on('radio(newDrawerRadio)',function (event) {
 					var radioVal = $(this).val();
@@ -430,10 +465,14 @@
 			if (obj.value < 0) {
 				// 如果金额为负，则将红冲选择发票框进行展示,并自动将是否红字发票更新为是
 				$('input[name="redInvoiceFlag"][value="1"]').prop("checked", true);
+				$(".relatedInvoice").show();
+				$('input[name="relatedInvoice"][value="1"]').prop("checked", true);
 				$(".redInvoice").show();
-
+				$('textarea[name="situationDetail"]').val('');
+				$(".situationDetail").hide();
 			}else{
 				$('input[name="redInvoiceFlag"][value="0"]').prop("checked", true);
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
 			}
 			// 重新渲染表单，使得 layui 重新应用样式和事件
@@ -1200,7 +1239,19 @@
 						<input type="radio" name="redInvoiceFlag" lay-filter="redInvoiceFlagRadio" title="否" value="0">
 					</div>
 				</div>
-
+				<div class="layui-item layui-col-sm6 relatedInvoice">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>是否关联发票：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="是" value="1">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="否" value="0">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<div class="layui-input-block">
+						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control judgment "/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 redInvoice">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>关联红字发票：</label>
 					<div class="layui-input-block with-icon">

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

@@ -111,15 +111,39 @@
 					}
 				});
 
-				form.on('radio(redInvoiceFlagRadio)',function (event) {
+				form.on('radio(redInvoiceFlagRadio)', function (event) {
 					var radioVal = $(this).val();
-					if(radioVal == 1 || radioVal == 1){
+
+					if (radioVal == "1") {
+						$(".relatedInvoice").show();
+						document.getElementsByName("relatedInvoice")[0].checked = true;
+						$(".situationDetail").hide();
 						$(".redInvoice").show();
-					}else if(radioVal == 0 || radioVal == 0){
+					} else {
+						$(".relatedInvoice").hide();
+						$(".situationDetail").hide();
 						$(".redInvoice").hide();
 					}
-					form.render();
-				})
+					form.render("radio");
+				});
+
+				form.on('radio(relatedInvoiceRadio)', function (event) {
+					var radioVal = $(this).val();
+					if (radioVal == "1") {
+						$('textarea[name="situationDetail"]').val('');
+						$(".situationDetail").hide();
+						$(".redInvoice").show();
+					} else {
+						// 切换时清空数据
+						$("#redInvoiceRelevancyIdId").val("");
+						$("#redInvoiceRelevancyIdName").val("");
+						$("#invoiceNumberStr").val("")
+						$(".redInvoice").hide();
+						$(".situationDetail").show();
+					}
+					form.render("radio");
+				});
+
 				form.on('radio(newDrawerRadio)',function (event) {
 					var radioVal = $(this).val();
 					if(radioVal == 1 || radioVal == 1){
@@ -185,11 +209,22 @@
 			var redInvoiceFlag = '${workInvoice.redInvoiceFlag}';//后端获取值
 			if(undefined == redInvoiceFlag || null == redInvoiceFlag || '' == redInvoiceFlag || redInvoiceFlag == "0"){
 				document.getElementsByName("redInvoiceFlag")[1].checked = true;
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
+				$(".situationDetail").hide();
 			}else{
 				document.getElementsByName("redInvoiceFlag")[0].checked = true;
-				$(".redInvoice").show();
-
+				$(".relatedInvoice").show();
+				var relatedInvoice = '${workInvoice.relatedInvoice}';//后端获取值
+				if(undefined == relatedInvoice || null == relatedInvoice || '' == relatedInvoice || relatedInvoice == "0"){
+					document.getElementsByName("relatedInvoice")[1].checked = true;
+					$(".redInvoice").hide();
+					$(".situationDetail").show();
+				}else{
+					document.getElementsByName("relatedInvoice")[0].checked = true;
+					$(".redInvoice").show();
+					$(".situationDetail").hide();
+				}
 			}
 
 			var newDrawerRadio = '${workInvoice.newDrawer}';//后端获取值
@@ -379,10 +414,14 @@
 			if (obj.value < 0) {
 				// 如果金额为负，则将红冲选择发票框进行展示,并自动将是否红字发票更新为是
 				$('input[name="redInvoiceFlag"][value="1"]').prop("checked", true);
+				$(".relatedInvoice").show();
+				$('input[name="relatedInvoice"][value="1"]').prop("checked", true);
 				$(".redInvoice").show();
-
+				$('textarea[name="situationDetail"]').val('');
+				$(".situationDetail").hide();
 			}else{
 				$('input[name="redInvoiceFlag"][value="0"]').prop("checked", true);
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
 			}
 			// 重新渲染表单，使得 layui 重新应用样式和事件
@@ -1125,7 +1164,19 @@
 						<input type="radio" name="redInvoiceFlag" lay-filter="redInvoiceFlagRadio" title="否" value="0">
 					</div>
 				</div>
-
+				<div class="layui-item layui-col-sm6 relatedInvoice">
+					<label class="layui-form-label"><span class="require-item">*</span>是否关联发票：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="是" value="1">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="否" value="0">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<div class="layui-input-block">
+						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control judgment "/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 redInvoice">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>关联红字发票：</label>
 					<div class="layui-input-block with-icon">

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

@@ -129,11 +129,22 @@
 			var redInvoiceFlag = '${workInvoice.redInvoiceFlag}';//后端获取值
 			if(undefined == redInvoiceFlag || null == redInvoiceFlag || '' == redInvoiceFlag || redInvoiceFlag == "0"){
 				document.getElementsByName("redInvoiceFlag")[1].checked = true;
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
+				$(".situationDetail").hide();
 			}else{
 				document.getElementsByName("redInvoiceFlag")[0].checked = true;
-				$(".redInvoice").show();
-
+				$(".relatedInvoice").show();
+				var relatedInvoice = '${workInvoice.relatedInvoice}';//后端获取值
+				if(undefined == relatedInvoice || null == relatedInvoice || '' == relatedInvoice || relatedInvoice == "0"){
+					document.getElementsByName("relatedInvoice")[1].checked = true;
+					$(".redInvoice").hide();
+					$(".situationDetail").show();
+				}else{
+					document.getElementsByName("relatedInvoice")[0].checked = true;
+					$(".redInvoice").show();
+					$(".situationDetail").hide();
+				}
 			}
 
 			var newDrawerRadio = '${workInvoice.newDrawer}';//后端获取值
@@ -170,15 +181,38 @@
 						$("#telephone").attr("class","form-control isTel layui-input");
 					}
 				});
-				form.on('radio(redInvoiceFlagRadio)',function (event) {
+				form.on('radio(redInvoiceFlagRadio)', function (event) {
 					var radioVal = $(this).val();
-					if(radioVal == 1 || radioVal == 1){
+
+					if (radioVal == "1") {
+						$(".relatedInvoice").show();
+						document.getElementsByName("relatedInvoice")[0].checked = true;
+						$(".situationDetail").hide();
 						$(".redInvoice").show();
-					}else if(radioVal == 0 || radioVal == 0){
+					} else {
+						$(".relatedInvoice").hide();
+						$(".situationDetail").hide();
 						$(".redInvoice").hide();
 					}
-					form.render();
-				})
+					form.render("radio");
+				});
+
+				form.on('radio(relatedInvoiceRadio)', function (event) {
+					var radioVal = $(this).val();
+					if (radioVal == "1") {
+						$('textarea[name="situationDetail"]').val('');
+						$(".situationDetail").hide();
+						$(".redInvoice").show();
+					} else {
+						// 切换时清空数据
+						$("#redInvoiceRelevancyIdId").val("");
+						$("#redInvoiceRelevancyIdName").val("");
+						$("#invoiceNumberStr").val("")
+						$(".redInvoice").hide();
+						$(".situationDetail").show();
+					}
+					form.render("radio");
+				});
 
 				form.on('radio(newDrawerRadio)',function (event) {
 					var radioVal = $(this).val();
@@ -432,10 +466,14 @@
 			if (obj.value < 0) {
 				// 如果金额为负，则将红冲选择发票框进行展示,并自动将是否红字发票更新为是
 				$('input[name="redInvoiceFlag"][value="1"]').prop("checked", true);
+				$(".relatedInvoice").show();
+				$('input[name="relatedInvoice"][value="1"]').prop("checked", true);
 				$(".redInvoice").show();
-
+				$('textarea[name="situationDetail"]').val('');
+				$(".situationDetail").hide();
 			}else{
 				$('input[name="redInvoiceFlag"][value="0"]').prop("checked", true);
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
 			}
 			// 重新渲染表单，使得 layui 重新应用样式和事件
@@ -1202,7 +1240,19 @@
 						<input type="radio" name="redInvoiceFlag" lay-filter="redInvoiceFlagRadio" title="否" value="0">
 					</div>
 				</div>
-
+				<div class="layui-item layui-col-sm6 relatedInvoice">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>是否关联发票：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="是" value="1">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="否" value="0">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<div class="layui-input-block">
+						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control judgment "/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 redInvoice">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>关联红字发票：</label>
 					<div class="layui-input-block with-icon">

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

@@ -92,13 +92,12 @@
 					if(money < 0 && redInvoice == 0){
 						parent.layer.msg("发票金额为负数，请将是否红字发票请选择是，并选择关联的发票信息",{icon:0});
 						return false;
-
 					}
 					if(money >= 0 && redInvoice == 1){
 						parent.layer.msg("发票金额为正数，不可为红字发票，请将是否红字发票请选择否",{icon:0});
 						return false;
-
 					}
+
 					if($('#actualDrawerEmailAddress').val()==null||$('#actualDrawerEmailAddress').val()=="") {
 						parent.layer.msg("请填写电子邮箱!", {icon: 5});
 						return false;
@@ -138,11 +137,22 @@
 			var redInvoiceFlag = '${workInvoice.redInvoiceFlag}';//后端获取值
 			if(undefined == redInvoiceFlag || null == redInvoiceFlag || '' == redInvoiceFlag || redInvoiceFlag == "0"){
 				document.getElementsByName("redInvoiceFlag")[1].checked = true;
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
+				$(".situationDetail").hide();
 			}else{
 				document.getElementsByName("redInvoiceFlag")[0].checked = true;
-				$(".redInvoice").show();
-
+				$(".relatedInvoice").show();
+				var relatedInvoice = '${workInvoice.relatedInvoice}';//后端获取值
+				if(undefined == relatedInvoice || null == relatedInvoice || '' == relatedInvoice || relatedInvoice == "0"){
+					document.getElementsByName("relatedInvoice")[1].checked = true;
+					$(".redInvoice").hide();
+					$(".situationDetail").show();
+				}else{
+					document.getElementsByName("relatedInvoice")[0].checked = true;
+					$(".redInvoice").show();
+					$(".situationDetail").hide();
+				}
 			}
 
 
@@ -182,15 +192,38 @@
 				});
 
 
-				form.on('radio(redInvoiceFlagRadio)',function (event) {
+				form.on('radio(redInvoiceFlagRadio)', function (event) {
 					var radioVal = $(this).val();
-					if(radioVal == 1 || radioVal == 1){
+
+					if (radioVal == "1") {
+						$(".relatedInvoice").show();
+						document.getElementsByName("relatedInvoice")[0].checked = true;
+						$(".situationDetail").hide();
 						$(".redInvoice").show();
-					}else if(radioVal == 0 || radioVal == 0){
+					} else {
+						$(".relatedInvoice").hide();
+						$(".situationDetail").hide();
 						$(".redInvoice").hide();
 					}
-					form.render();
-				})
+					form.render("radio");
+				});
+
+				form.on('radio(relatedInvoiceRadio)', function (event) {
+					var radioVal = $(this).val();
+					if (radioVal == "1") {
+						$('textarea[name="situationDetail"]').val('');
+						$(".situationDetail").hide();
+						$(".redInvoice").show();
+					} else {
+						// 切换时清空数据
+						$("#redInvoiceRelevancyIdId").val("");
+						$("#redInvoiceRelevancyIdName").val("");
+						$("#invoiceNumberStr").val("")
+						$(".redInvoice").hide();
+						$(".situationDetail").show();
+					}
+					form.render("radio");
+				});
 
 				form.on('radio(newDrawerRadio)',function (event) {
 					var radioVal = $(this).val();
@@ -442,15 +475,18 @@
 			if (obj.value < 0) {
 				// 如果金额为负，则将红冲选择发票框进行展示,并自动将是否红字发票更新为是
 				$('input[name="redInvoiceFlag"][value="1"]').prop("checked", true);
+				$(".relatedInvoice").show();
+				$('input[name="relatedInvoice"][value="1"]').prop("checked", true);
 				$(".redInvoice").show();
-
+				$('textarea[name="situationDetail"]').val('');
+				$(".situationDetail").hide();
 			}else{
 				$('input[name="redInvoiceFlag"][value="0"]').prop("checked", true);
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
 			}
 			// 重新渲染表单，使得 layui 重新应用样式和事件
 			layui.form.render("radio");
-
 		}
 
 		function newBankShow (data){
@@ -1241,6 +1277,19 @@
 						<input type="radio" name="redInvoiceFlag" lay-filter="redInvoiceFlagRadio" title="否" value="0">
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6 relatedInvoice">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>是否关联发票：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="是" value="1">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="否" value="0">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<div class="layui-input-block">
+						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control judgment "/>
+					</div>
+				</div>
 
 				<div class="layui-item layui-col-sm6 redInvoice">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>关联红字发票：</label>

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

@@ -129,11 +129,22 @@
 			var redInvoiceFlag = '${workInvoice.redInvoiceFlag}';//后端获取值
 			if(undefined == redInvoiceFlag || null == redInvoiceFlag || '' == redInvoiceFlag || redInvoiceFlag == "0"){
 				document.getElementsByName("redInvoiceFlag")[1].checked = true;
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
+				$(".situationDetail").hide();
 			}else{
 				document.getElementsByName("redInvoiceFlag")[0].checked = true;
-				$(".redInvoice").show();
-
+				$(".relatedInvoice").show();
+				var relatedInvoice = '${workInvoice.relatedInvoice}';//后端获取值
+				if(undefined == relatedInvoice || null == relatedInvoice || '' == relatedInvoice || relatedInvoice == "0"){
+					document.getElementsByName("relatedInvoice")[1].checked = true;
+					$(".redInvoice").hide();
+					$(".situationDetail").show();
+				}else{
+					document.getElementsByName("relatedInvoice")[0].checked = true;
+					$(".redInvoice").show();
+					$(".situationDetail").hide();
+				}
 			}
 
 			var newDrawerRadio = '${workInvoice.newDrawer}';//后端获取值
@@ -170,16 +181,38 @@
 						$("#telephone").attr("class","form-control isTel layui-input");
 					}
 				});
-				form.on('radio(redInvoiceFlagRadio)',function (event) {
+				form.on('radio(redInvoiceFlagRadio)', function (event) {
 					var radioVal = $(this).val();
-					if(radioVal == 1 || radioVal == 1){
+
+					if (radioVal == "1") {
+						$(".relatedInvoice").show();
+						document.getElementsByName("relatedInvoice")[0].checked = true;
+						$(".situationDetail").hide();
 						$(".redInvoice").show();
-					}else if(radioVal == 0 || radioVal == 0){
+					} else {
+						$(".relatedInvoice").hide();
+						$(".situationDetail").hide();
 						$(".redInvoice").hide();
 					}
-					form.render();
-				})
+					form.render("radio");
+				});
 
+				form.on('radio(relatedInvoiceRadio)', function (event) {
+					var radioVal = $(this).val();
+					if (radioVal == "1") {
+						$('textarea[name="situationDetail"]').val('');
+						$(".situationDetail").hide();
+						$(".redInvoice").show();
+					} else {
+						// 切换时清空数据
+						$("#redInvoiceRelevancyIdId").val("");
+						$("#redInvoiceRelevancyIdName").val("");
+						$("#invoiceNumberStr").val("")
+						$(".redInvoice").hide();
+						$(".situationDetail").show();
+					}
+					form.render("radio");
+				});
 				form.on('radio(newDrawerRadio)',function (event) {
 					var radioVal = $(this).val();
 					console.log(radioVal);
@@ -432,10 +465,14 @@
 			if (obj.value < 0) {
 				// 如果金额为负，则将红冲选择发票框进行展示,并自动将是否红字发票更新为是
 				$('input[name="redInvoiceFlag"][value="1"]').prop("checked", true);
+				$(".relatedInvoice").show();
+				$('input[name="relatedInvoice"][value="1"]').prop("checked", true);
 				$(".redInvoice").show();
-
+				$('textarea[name="situationDetail"]').val('');
+				$(".situationDetail").hide();
 			}else{
 				$('input[name="redInvoiceFlag"][value="0"]').prop("checked", true);
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
 			}
 			// 重新渲染表单，使得 layui 重新应用样式和事件
@@ -1202,7 +1239,19 @@
 						<input type="radio" name="redInvoiceFlag" lay-filter="redInvoiceFlagRadio" title="否" value="0">
 					</div>
 				</div>
-
+				<div class="layui-item layui-col-sm6 relatedInvoice">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>是否关联发票：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="是" value="1">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="否" value="0">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<div class="layui-input-block">
+						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control judgment "/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 redInvoice">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>关联红字发票：</label>
 					<div class="layui-input-block with-icon">

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

@@ -100,11 +100,22 @@
 			var redInvoiceFlag = '${workInvoice.redInvoiceFlag}';//后端获取值
 			if(undefined == redInvoiceFlag || null == redInvoiceFlag || '' == redInvoiceFlag || redInvoiceFlag == "0"){
 				document.getElementsByName("redInvoiceFlag")[1].checked = true;
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
+				$(".situationDetail").hide();
 			}else{
 				document.getElementsByName("redInvoiceFlag")[0].checked = true;
-				$(".redInvoice").show();
-
+				$(".relatedInvoice").show();
+				var relatedInvoice = '${workInvoice.relatedInvoice}';//后端获取值
+				if(undefined == relatedInvoice || null == relatedInvoice || '' == relatedInvoice || relatedInvoice == "0"){
+					document.getElementsByName("relatedInvoice")[1].checked = true;
+					$(".redInvoice").hide();
+					$(".situationDetail").show();
+				}else{
+					document.getElementsByName("relatedInvoice")[0].checked = true;
+					$(".redInvoice").show();
+					$(".situationDetail").hide();
+				}
 			}
 
 
@@ -693,7 +704,19 @@
 					<input type="radio" name="redInvoiceFlag" disabled lay-filter="redInvoiceFlagRadio" title="否" value="0">
 				</div>
 			</div>
-
+			<div class="layui-item layui-col-sm6 relatedInvoice">
+				<label class="layui-form-label"><span class="require-item">*</span>是否关联发票：</label>
+				<div class="layui-input-block">
+					<input type="radio" name="relatedInvoice" disabled lay-filter="relatedInvoiceRadio" title="是" value="1">
+					<input type="radio" name="relatedInvoice" disabled lay-filter="relatedInvoiceRadio" title="否" value="0">
+				</div>
+			</div>
+			<div class="layui-item layui-col-sm12 with-textarea situationDetail">
+				<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+				<div class="layui-input-block">
+					<form:textarea path="situationDetail" readonly="true" htmlEscape="false" rows="4" class="form-control" style="background-color: #f1f1f1" />
+				</div>
+			</div>
 			<div class="layui-item layui-col-sm6 redInvoice">
 				<label class="layui-form-label"><span class="require-item">*</span>关联红字发票：</label>
 				<div class="layui-input-block">

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

@@ -144,15 +144,40 @@
 					form.render();
 				})
 
-				form.on('radio(redInvoiceFlagRadio)',function (event) {
+				form.on('radio(redInvoiceFlagRadio)', function (event) {
 					var radioVal = $(this).val();
-					if(radioVal == 1 || radioVal == 1){
+
+					if (radioVal == "1") {
+						$(".relatedInvoice").show();
+						document.getElementsByName("relatedInvoice")[0].checked = true;
+						$(".situationDetail").hide();
 						$(".redInvoice").show();
-					}else if(radioVal == 0 || radioVal == 0){
+					} else {
+						$(".relatedInvoice").hide();
+						$(".situationDetail").hide();
 						$(".redInvoice").hide();
 					}
-					form.render();
-				})
+
+					form.render("radio");
+				});
+
+				form.on('radio(relatedInvoiceRadio)', function (event) {
+					var radioVal = $(this).val();
+					if (radioVal == "1") {
+						$('textarea[name="situationDetail"]').val('');
+						$(".situationDetail").hide();
+						$(".redInvoice").show();
+					} else {
+						// 切换时清空数据
+						$("#redInvoiceRelevancyIdId").val("");
+						$("#redInvoiceRelevancyIdName").val("");
+						$("#invoiceNumberStr").val("")
+						$(".redInvoice").hide();
+						$(".situationDetail").show();
+					}
+
+					form.render("radio");
+				});
 
 
 				window.bankShow = function (data){
@@ -217,11 +242,22 @@
 			var redInvoiceFlag = '${workInvoice.redInvoiceFlag}';//后端获取值
 			if(undefined == redInvoiceFlag || null == redInvoiceFlag || '' == redInvoiceFlag || redInvoiceFlag == "0"){
 				document.getElementsByName("redInvoiceFlag")[1].checked = true;
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
+				$(".situationDetail").hide();
 			}else{
 				document.getElementsByName("redInvoiceFlag")[0].checked = true;
-				$(".redInvoice").show();
-
+				$(".relatedInvoice").show();
+				var relatedInvoice = '${workInvoice.relatedInvoice}';//后端获取值
+				if(undefined == relatedInvoice || null == relatedInvoice || '' == relatedInvoice || relatedInvoice == "0"){
+					document.getElementsByName("relatedInvoice")[1].checked = true;
+					$(".redInvoice").hide();
+					$(".situationDetail").show();
+				}else{
+					document.getElementsByName("relatedInvoice")[0].checked = true;
+					$(".redInvoice").show();
+					$(".situationDetail").hide();
+				}
 			}
 
             /*$('#money').keyup(function(){
@@ -400,10 +436,14 @@
 			if (obj.value < 0) {
 				// 如果金额为负，则将红冲选择发票框进行展示,并自动将是否红字发票更新为是
 				$('input[name="redInvoiceFlag"][value="1"]').prop("checked", true);
+				$(".relatedInvoice").show();
+				$('input[name="relatedInvoice"][value="1"]').prop("checked", true);
 				$(".redInvoice").show();
-
+				$('textarea[name="situationDetail"]').val('');
+				$(".situationDetail").hide();
 			}else{
 				$('input[name="redInvoiceFlag"][value="0"]').prop("checked", true);
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
 			}
 			// 重新渲染表单，使得 layui 重新应用样式和事件
@@ -1201,7 +1241,19 @@
 						<input type="radio" name="redInvoiceFlag" lay-filter="redInvoiceFlagRadio" title="否" value="0">
 					</div>
 				</div>
-
+				<div class="layui-item layui-col-sm6 relatedInvoice">
+					<label class="layui-form-label"><span class="require-item">*</span>是否关联发票：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="是" value="1">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="否" value="0">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<div class="layui-input-block">
+						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control judgment"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 redInvoice">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>关联红字发票：</label>
 					<div class="layui-input-block with-icon">

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

@@ -92,7 +92,7 @@
 					var money = $("#money").val();
 					var redInvoice=$('input:radio[name="redInvoiceFlag"]:checked').val();
 					if(money < 0 && redInvoice == 0){
-						parent.layer.msg("发票金额为负数，请将是否红字发票请选择是，并选择关联的发票信息",{icon:0});
+						parent.layer.msg("发票金额为负数，请将是否红字发票请选择是，并填写对应信息",{icon:0});
 						return false;
 
 					}
@@ -155,12 +155,24 @@
 			var redInvoiceFlag = '${workInvoice.redInvoiceFlag}';//后端获取值
 			if(undefined == redInvoiceFlag || null == redInvoiceFlag || '' == redInvoiceFlag || redInvoiceFlag == "0"){
 				document.getElementsByName("redInvoiceFlag")[1].checked = true;
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
+				$(".situationDetail").hide();
 			}else{
 				document.getElementsByName("redInvoiceFlag")[0].checked = true;
-				$(".redInvoice").show();
-
+				$(".relatedInvoice").show();
+				var relatedInvoice = '${workInvoice.relatedInvoice}';//后端获取值
+				if(undefined == relatedInvoice || null == relatedInvoice || '' == relatedInvoice || relatedInvoice == "0"){
+					document.getElementsByName("relatedInvoice")[1].checked = true;
+					$(".redInvoice").hide();
+					$(".situationDetail").show();
+				}else{
+					document.getElementsByName("relatedInvoice")[0].checked = true;
+					$(".redInvoice").show();
+					$(".situationDetail").hide();
+				}
 			}
+
 			console.log("获取开票信息")
 			setValuee('${workInvoice.client.id}')
 
@@ -187,15 +199,38 @@
 					}
 				});
 
-				form.on('radio(redInvoiceFlagRadio)',function (event) {
+				form.on('radio(redInvoiceFlagRadio)', function (event) {
 					var radioVal = $(this).val();
-					if(radioVal == 1 || radioVal == 1){
+
+					if (radioVal == "1") {
+						$(".relatedInvoice").show();
+						document.getElementsByName("relatedInvoice")[0].checked = true;
+						$(".situationDetail").hide();
 						$(".redInvoice").show();
-					}else if(radioVal == 0 || radioVal == 0){
+					} else {
+						$(".relatedInvoice").hide();
+						$(".situationDetail").hide();
 						$(".redInvoice").hide();
 					}
-					form.render();
-				})
+					form.render("radio");
+				});
+
+				form.on('radio(relatedInvoiceRadio)', function (event) {
+					var radioVal = $(this).val();
+					if (radioVal == "1") {
+						$('textarea[name="situationDetail"]').val('');
+						$(".situationDetail").hide();
+						$(".redInvoice").show();
+					} else {
+						// 切换时清空数据
+						$("#redInvoiceRelevancyIdId").val("");
+						$("#redInvoiceRelevancyIdName").val("");
+						$("#invoiceNumberStr").val("")
+						$(".redInvoice").hide();
+						$(".situationDetail").show();
+					}
+					form.render("radio");
+				});
 
 				form.on('radio(newDrawerRadio)',function (event) {
 					var radioVal = $(this).val();
@@ -482,10 +517,15 @@
 			if (obj.value < 0) {
 				// 如果金额为负，则将红冲选择发票框进行展示,并自动将是否红字发票更新为是
 				$('input[name="redInvoiceFlag"][value="1"]').prop("checked", true);
+				$(".relatedInvoice").show();
+				$('input[name="relatedInvoice"][value="1"]').prop("checked", true);
 				$(".redInvoice").show();
+				$('textarea[name="situationDetail"]').val('');
+				$(".situationDetail").hide();
 
 			}else{
 				$('input[name="redInvoiceFlag"][value="0"]').prop("checked", true);
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
 			}
 			// 重新渲染表单，使得 layui 重新应用样式和事件
@@ -1330,6 +1370,19 @@
 							<input type="radio" name="redInvoiceFlag" lay-filter="redInvoiceFlagRadio" title="否" value="0">
 						</div>
 				</div>
+				<div class="layui-item layui-col-sm6 relatedInvoice">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>是否关联发票：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="是" value="1">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="否" value="0">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<div class="layui-input-block">
+						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control"/>
+					</div>
+				</div>
 
 				<div class="layui-item layui-col-sm6 redInvoice">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>关联红字发票：</label>
@@ -1348,7 +1401,7 @@
 				<div class="layui-item layui-col-sm12 with-textarea">
 					<label class="layui-form-label double-line"><span class="require-item contractType">*</span>开票内容要求：</label>
 					<div class="layui-input-block">
-						<form:textarea path="content" id="contractTypeDoc" placeholder="请输入开票内容要求" htmlEscape="false" rows="4"    class="form-control"/>
+						<form:textarea path="content" id="contractTypeDoc" placeholder="请输入开票内容要求" htmlEscape="false" rows="4"    class="form-control judgment"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

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

@@ -137,15 +137,40 @@
 					form.render();
 				})
 
-				form.on('radio(redInvoiceFlagRadio)',function (event) {
+				form.on('radio(redInvoiceFlagRadio)', function (event) {
 					var radioVal = $(this).val();
-					if(radioVal == 1 || radioVal == 1){
+
+					if (radioVal == "1") {
+						$(".relatedInvoice").show();
+						document.getElementsByName("relatedInvoice")[0].checked = true;
+						$(".situationDetail").hide();
 						$(".redInvoice").show();
-					}else if(radioVal == 0 || radioVal == 0){
+					} else {
+						$(".relatedInvoice").hide();
+						$(".situationDetail").hide();
 						$(".redInvoice").hide();
 					}
-					form.render();
-				})
+
+					form.render("radio");
+				});
+
+				form.on('radio(relatedInvoiceRadio)', function (event) {
+					var radioVal = $(this).val();
+					if (radioVal == "1") {
+						$('textarea[name="situationDetail"]').val('');
+						$(".situationDetail").hide();
+						$(".redInvoice").show();
+					} else {
+						// 切换时清空数据
+						$("#redInvoiceRelevancyIdId").val("");
+						$("#redInvoiceRelevancyIdName").val("");
+						$("#invoiceNumberStr").val("")
+						$(".redInvoice").hide();
+						$(".situationDetail").show();
+					}
+
+					form.render("radio");
+				});
 
 				window.bankShow = function (data){
 					$('#bank').html('<option value="">请选择开户行信息</option>')
@@ -196,11 +221,22 @@
 			var redInvoiceFlag = '${workInvoice.redInvoiceFlag}';//后端获取值
 			if(undefined == redInvoiceFlag || null == redInvoiceFlag || '' == redInvoiceFlag || redInvoiceFlag == "0"){
 				document.getElementsByName("redInvoiceFlag")[1].checked = true;
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
+				$(".situationDetail").hide();
 			}else{
 				document.getElementsByName("redInvoiceFlag")[0].checked = true;
-				$(".redInvoice").show();
-
+				$(".relatedInvoice").show();
+				var relatedInvoice = '${workInvoice.relatedInvoice}';//后端获取值
+				if(undefined == relatedInvoice || null == relatedInvoice || '' == relatedInvoice || relatedInvoice == "0"){
+					document.getElementsByName("relatedInvoice")[1].checked = true;
+					$(".redInvoice").hide();
+					$(".situationDetail").show();
+				}else{
+					document.getElementsByName("relatedInvoice")[0].checked = true;
+					$(".redInvoice").show();
+					$(".situationDetail").hide();
+				}
 			}
 
 			var newDrawerRadio = '${workInvoice.newDrawer}';//后端获取值
@@ -390,10 +426,14 @@
 			if (obj.value < 0) {
 				// 如果金额为负，则将红冲选择发票框进行展示,并自动将是否红字发票更新为是
 				$('input[name="redInvoiceFlag"][value="1"]').prop("checked", true);
+				$(".relatedInvoice").show();
+				$('input[name="relatedInvoice"][value="1"]').prop("checked", true);
 				$(".redInvoice").show();
-
+				$('textarea[name="situationDetail"]').val('');
+				$(".situationDetail").hide();
 			}else{
 				$('input[name="redInvoiceFlag"][value="0"]').prop("checked", true);
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
 			}
 			// 重新渲染表单，使得 layui 重新应用样式和事件
@@ -1142,7 +1182,19 @@
 						<input type="radio" name="redInvoiceFlag" lay-filter="redInvoiceFlagRadio" title="否" value="0">
 					</div>
 				</div>
-
+				<div class="layui-item layui-col-sm6 relatedInvoice">
+					<label class="layui-form-label"><span class="require-item">*</span>是否关联发票：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="是" value="1">
+						<input type="radio" name="relatedInvoice" lay-filter="relatedInvoiceRadio" title="否" value="0">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<div class="layui-input-block">
+						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control judgment"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 redInvoice">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>关联红字发票：</label>
 					<div class="layui-input-block with-icon">

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

@@ -47,11 +47,22 @@
 			var redInvoiceFlag = '${workInvoice.redInvoiceFlag}';//后端获取值
 			if(undefined == redInvoiceFlag || null == redInvoiceFlag || '' == redInvoiceFlag || redInvoiceFlag == "0"){
 				document.getElementsByName("redInvoiceFlag")[1].checked = true;
+				$(".relatedInvoice").hide();
 				$(".redInvoice").hide();
+				$(".situationDetail").hide();
 			}else{
 				document.getElementsByName("redInvoiceFlag")[0].checked = true;
-				$(".redInvoice").show();
-
+				$(".relatedInvoice").show();
+				var relatedInvoice = '${workInvoice.relatedInvoice}';//后端获取值
+				if(undefined == relatedInvoice || null == relatedInvoice || '' == relatedInvoice || relatedInvoice == "0"){
+					document.getElementsByName("relatedInvoice")[1].checked = true;
+					$(".redInvoice").hide();
+					$(".situationDetail").show();
+				}else{
+					document.getElementsByName("relatedInvoice")[0].checked = true;
+					$(".redInvoice").show();
+					$(".situationDetail").hide();
+				}
 			}
 
 			$("#name").focus();
@@ -234,6 +245,20 @@
 					</div>
 				</div>
 
+				<div class="layui-item layui-col-sm6 relatedInvoice">
+					<label class="layui-form-label"><span class="require-item">*</span>是否关联发票：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="relatedInvoice" disabled lay-filter="relatedInvoiceRadio" title="是" value="1">
+						<input type="radio" name="relatedInvoice" disabled lay-filter="relatedInvoiceRadio" title="否" value="0">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<div class="layui-input-block">
+						<form:textarea path="situationDetail" readonly="true" placeholder="请输入情况说明" htmlEscape="false"  style="background-color: #f1f1f1"   rows="4" class="form-control judgment "/>
+					</div>
+				</div>
+
 				<div class="layui-item layui-col-sm6 redInvoice">
 					<label class="layui-form-label"><span class="require-item">*</span>关联红字发票：</label>
 					<div class="layui-input-block">
@@ -241,6 +266,7 @@
 						<input id="redInvoiceRelevancyNumber"  style="background-color: #f1f1f1" name="redInvoiceRelevancyNumber" htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.redInvoiceRelevancyNumber}"/>
 					</div>
 				</div>
+
 				<div class="layui-item layui-col-sm6 redInvoice">
 					<label class="layui-form-label">关联发票号：</label>
 					<div class="layui-input-block">