Merge branch 'master' of http://gitlab.house365.com/xuzhou/njzsb

* 'master' of http://gitlab.house365.com/xuzhou/njzsb:
  表格传参

WebRoot/WEB-INF/pages/fstzs/Fstzs_Add.jsp

@@ -76,7 +76,6 @@
 				<s:token />
 				<input type="hidden" name="flag" value="${flag}">
 				<input type="hidden" name="fstzsXm.id" value="${fstzsXm.id}">
-
 				<div class="cell" style="width: 100%">
 					<table width="100%" border="0" class="ta-tb">
 
@@ -262,11 +261,8 @@
 		var numf = 0;
 		var numb = 0;
 		var flag = false;
-		var objNums = {
-			jkr : [],// 缴款人
-			yjmj :[],//应缴面积
-			yjje :[]//应缴金额
-		}
+		var objNums = []
+
 		//添加一行
 		$("#addOneRow").click(function () {
 			var index = 1;
@@ -288,9 +284,9 @@
 		$(document).on('click', '.delOneRow', function () {
 			var that = this
 			if ($(".add-tr tr").length < 2) {
-				$.messager.alert('提示','至少保留一行!');
+				$.messager.alert('提示', '至少保留一行!');
 			} else {
-				$.messager.confirm("删除","确定要删除吗?",function(result){
+				$.messager.confirm("删除", "确定要删除吗?", function (result) {
 					if (result) {
 						money = money - Number($(that).parent().prev().children().eq(0).text())
 						$(".line-all").text('')
@@ -299,7 +295,6 @@
 						addJkr();
 						addyjmj();
 						addyjje();
-
 					}
 
 				})
@@ -307,36 +302,51 @@
 			}
 		})
 		//添加缴款人
-		function addJkr(){
+		function addJkr() {
 			var texts = document.getElementsByClassName('db-num-text')
-			objNums.jkr =[]
-			for(var i=0;i<texts.length;i++){
-				if($(texts[i]).text()!==''){
-					objNums.jkr.push($(texts[i]).text())
+			objNums = []
+			for (var i = 0; i < texts.length; i++) {
+				if ($(texts[i]).text() !== '') {
+					var jkr = $(texts[i]).text()
+					var yjmj = $(texts[i]).parent().parent().children().eq(4).text()
+					var yjje = $(texts[i]).parent().parent().children().eq(5).children().text()
+					objNums.push({ jkr: jkr, yjmj: yjmj, yjje: yjje })
+
 				}
 			}
+
+
 		}
-		function addyjmj(){
+		function addyjmj() {
 			var yjmjArr = document.getElementsByClassName('line-yjmj')
-			objNums.yjmj=[]
+			objNums = []
 			//添加应缴面积
 			for (var i = 0; i < yjmjArr.length; i++) {
-				if($(yjmjArr[i]).text()!==''){
-					objNums.yjmj.push($(yjmjArr[i]).text())
+				if ($(yjmjArr[i]).text() !== '') {
+
+					var jkr = $(yjmjArr[i]).parent().children().eq(1).text()
+					var yjmj = $(yjmjArr[i]).text()
+					var yjje = $(yjmjArr[i]).next().children().eq(0).text()
+					objNums.push({ jkr: jkr, yjmj: yjmj, yjje: yjje })
 				}
 
 			}
+
 		}
-		function addyjje(){
+		function addyjje() {
 			var nums = document.getElementsByClassName('db-nums')
-			objNums.yjje = []
+			objNums = []
 			//添加应缴金额
 			for (var i = 0; i < nums.length; i++) {
-				if($(nums[i]).text()!==''){
-					objNums.yjje.push($(nums[i]).text())
+				if ($(nums[i]).text() !== '') {
+					var jkr = $(nums[i]).parent().parent().children().eq(1).text()
+					var yjmj = $(nums[i]).parent().prev().text()
+					var yjje = $(nums[i]).text()
+					objNums.push({ jkr: jkr, yjmj: yjmj, yjje: yjje })
 				}
 
 			}
+
 		}
 		//点击表格显示输入框
 		$(document).on('click', '.line-input', function () {
@@ -346,11 +356,15 @@
 		})
 		//失去焦点隐藏输入框
 		$(document).on('blur', '.line-input-text', function () {
-			var num = $(this).val()
+			if($(this).val()==''){
+				$.messager.alert('提示', '请输入缴款人!');
+			}else{
+				var num = $(this).val()
 				$(this).prev().text(num)
 				$(this).hide()
 				$(this).prev().show()
 				addJkr();
+			}
 
 		})
 
@@ -358,45 +372,70 @@
 		$(document).on('blur', '.db-money', function () {
 			numb = Number($(this).val())
 			var nums = document.getElementsByClassName('db-nums')
-
 			var num = Number($(this).val())
-			if(Number.isNaN(num) ){
-				$.messager.alert('提示','请输入正确的数字!');
-			}else{
-				$(this).prev().text(num===0?'':num)
+			if($(this).val()==''){
+				$.messager.alert('提示', '请输入应缴金额!');
+			}else if (Number.isNaN(num)) {
+				$.messager.alert('提示', '请输入正确的数字!');
+			} else {
+				$(this).prev().text(num === 0 ? '' : num)
 				$(this).hide()
 				$(this).prev().show()
 				//计算应缴面积
-				var yjmjNums =  numb/150
-				$(this).parent().prev().text((yjmjNums % 1 !== 0)?(yjmjNums).toFixed(2):yjmjNums)
+				var yjmjNums = numb / 150
+				$(this).parent().prev().text((yjmjNums % 1 !== 0) ? (yjmjNums).toFixed(2) : yjmjNums)
 			}
 			if (numb == numf) {
 				return
 			} else {
 				var ss = 0
-				objNums.yjje = []
+				objNums = []
 				//添加应缴金额
 				for (var i = 0; i < nums.length; i++) {
 					ss += Number($(nums[i]).text())
-					if($(nums[i]).text()!==''){
-						objNums.yjje.push($(nums[i]).text())
+					if ($(nums[i]).text() !== '') {
+						var jkr = $(nums[i]).parent().parent().children().eq(1).text()
+						var yjmj = $(nums[i]).parent().prev().text()
+						var yjje = $(nums[i]).text()
+						objNums.push({ jkr: jkr, yjmj: yjmj, yjje: yjje })
+
 					}
 				}
 				addyjmj()
-
 				money = ss
+
 			}
 			$(".line-all").text('')
 			$(".line-all").append(money)
 
+
 		})
 		$(document).on('focus', '.db-money', function () {
 			numf = Number($(this).val())
 		})
 
 		function tijiao() {
-			document.myform1.action="addFstzs.action";
-			document.myform1.submit();
+			$.ajax({
+				async: false,
+				url: "${ctx}/jsp/rfxm/checkAddFstzs.action",
+				type: 'post',
+				dataType: 'json',
+				async: false,
+				data: {objNums : objNums},
+				error: function (data) {
+					$.messager.alert('错误', data.message);
+				},
+				success: function (data) {
+					if (data.result) {
+						document.myform1.action = "addFstzs.action";
+						document.myform1.submit();
+					} else {
+						$.messager.alert('错误', '验证失败,'+data.message);
+						return;
+					}
+				}
+			});
+
 		}
 
 	</script>