Merge remote-tracking branch 'origin/master'

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

@@ -33,6 +33,11 @@
                 if(obj == 2){
                     $("#inputForm").attr("action","${ctx}/workinvoice/workInvoice/store");
                 }else{
+					var leng=$("#workInvoiceProjectRelationList tr").length;
+					if (leng==0){
+						parent.layer.msg("请添加项目信息!", {icon: 5});
+						return false;
+					}
                     $("#inputForm").attr("action","${ctx}/workinvoice/workInvoice/save");
                 }
                 $("#inputForm").submit();

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

@@ -20,6 +20,11 @@
                 if(obj == 2){
                     $("#flag").val("no");
                 }else{
+					var leng=$("#workInvoiceProjectRelationList tr").length;
+					if (leng==0){
+						parent.layer.msg("请添加项目信息!", {icon: 5});
+						return false;
+					}
                     $("#flag").val("yes");
                 }
                 $("#inputForm").submit();