发票功能修改

src/main/resources/mappings/modules/workinvoicedetail/WorkInvoiceDetailDao.xml

@@ -609,6 +609,9 @@
 	</select>
 
 	<select id="countByNumAndComp" resultType="int">
-		SELECT count(1) from work_invoice_detail WHERE  number = #{invoiceNum} AND company_id = #{comId}
+		SELECT count(1) from work_invoice_detail a
+		left join work_invoice b on a.invoice_id = b.id
+		WHERE  a.number = #{invoiceNum} AND a.company_id = #{comId}
+		and b.invoice_state != 7
 	</select>
 </mapper>

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

@@ -30,6 +30,11 @@
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 			//debugger
 			if(validateForm.form()){
+				var invoiceType=$('input:radio[name="invoiceType"]:checked').val();
+				if(null == invoiceType || undefined == invoiceType || '' == invoiceType){
+					parent.layer.msg("请选择发票类型",{icon:0});
+					return false;
+				}
 				var leng=$("#workInvoiceProjectRelationList tr").length;
 				if (leng>1){
 					var count=0;
@@ -134,13 +139,13 @@
 			}else{
 				$("#ext").iCheck('check')
 			}
-			if("${workInvoice.invoiceType}" == "1"){
+			/*if("${workInvoice.invoiceType}" == "1"){
 				$("#invoiceType1").iCheck('check');
 				$(".invoicetype").show();
 			}else{
 				$("#invoiceType").iCheck('check');
 				$(".invoicetype").hide();
-			}
+			}*/
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
 					loading('正在提交，请稍等...');
@@ -660,7 +665,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>发票类型：</label>
 					<div class="layui-input-block">
-						<input type="radio" name="invoiceType" lay-filter="invoiceType" title="专票" checked id="invoiceType1" value="1">
+						<input type="radio" name="invoiceType" lay-filter="invoiceType" title="专票" id="invoiceType1" value="1">
 							<%--						<label for="invoiceType1">专票</label>--%>
 						<input type="radio" name="invoiceType" lay-filter="invoiceType" title="普票" id="invoiceType" value="2">
 							<%--						<label for="invoiceType">普票</label>--%>

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

@@ -30,6 +30,11 @@
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 			//debugger
 			if(validateForm.form()){
+				var invoiceType=$('input:radio[name="invoiceType"]:checked').val();
+				if(null == invoiceType || undefined == invoiceType || '' == invoiceType){
+					parent.layer.msg("请选择发票类型",{icon:0});
+					return false;
+				}
 				var leng=$("#workInvoiceProjectRelationList tr").length;
 				if (leng>1){
 					var count=0;
@@ -134,13 +139,13 @@
 			}else{
 				$("#ext").iCheck('check')
 			}
-			if("${workInvoice.invoiceType}" == "1"){
+			/*if("${workInvoice.invoiceType}" == "1"){
 				$("#invoiceType1").iCheck('check');
 				$(".invoicetype").show();
 			}else{
 				$("#invoiceType").iCheck('check');
 				$(".invoicetype").hide();
-			}
+			}*/
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
 					loading('正在提交，请稍等...');
@@ -630,7 +635,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>发票类型：</label>
 					<div class="layui-input-block">
-						<input type="radio" name="invoiceType" lay-filter="invoiceType" title="专票" checked id="invoiceType1" value="1">
+						<input type="radio" name="invoiceType" lay-filter="invoiceType" title="专票" id="invoiceType1" value="1">
 							<%--						<label for="invoiceType1">专票</label>--%>
 						<input type="radio" name="invoiceType" lay-filter="invoiceType" title="普票" id="invoiceType" value="2">
 							<%--						<label for="invoiceType">普票</label>--%>

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

@@ -30,6 +30,11 @@
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             //debugger
             if(validateForm.form()){
+				var invoiceType=$('input:radio[name="invoiceType"]:checked').val();
+				if(null == invoiceType || undefined == invoiceType || '' == invoiceType){
+					parent.layer.msg("请选择发票类型",{icon:0});
+					return false;
+				}
 				var leng=$("#workInvoiceProjectRelationList tr").length;
 				if (leng>1){
 					var count=0;
@@ -132,13 +137,13 @@
             }else{
                 $("#ext").iCheck('check')
             }
-            if("${workInvoice.invoiceType}" == "1"){
+            /*if("${workInvoice.invoiceType}" == "1"){
                 $("#invoiceType1").iCheck('check');
                 $(".invoicetype").show();
             }else{
                 $("#invoiceType").iCheck('check');
                 $(".invoicetype").hide();
-            }
+            }*/
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交，请稍等...');
@@ -660,7 +665,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>发票类型：</label>
 					<div class="layui-input-block">
-						<input type="radio" name="invoiceType" lay-filter="invoiceType" title="专票" checked id="invoiceType1" value="1">
+						<input type="radio" name="invoiceType" lay-filter="invoiceType" title="专票" id="invoiceType1" value="1">
 <%--						<label for="invoiceType1">专票</label>--%>
 						<input type="radio" name="invoiceType" lay-filter="invoiceType" title="普票" id="invoiceType" value="2">
 <%--						<label for="invoiceType">普票</label>--%>