报销单排序问题调整

src/main/webapp/webpage/modules/projectAccessory/workAttachmentForm.jsp

@@ -203,10 +203,6 @@
 			});
 		};
 
-		function ceshi() {
-			alert(1);
-		}
-
 		function openInfo(id,value) {
 			top.layer.open({
 				type: 2,

src/main/webapp/webpage/modules/workreimbursement/treeForm/all/workReimbursementAllFormAdd.jsp

@@ -693,14 +693,26 @@
             }
             var idx1 = $("#workAccountList tr[id^='workAccountList']").length + 1;
 
-            console.log("添加行下标：",idx1)
+            // 筛选出符合条件的tr：id以workAccountList开头，且第一个td中的第二个input值不为1
+            var validTrs = $("#workAccountList tr[id^='workAccountList']").filter(function() {
+                // 找到当前tr下的第一个td
+                var firstTd = $(this).find('td:first');
+                // 找到第一个td中的第二个input（索引从0开始，第二个即eq(1)）
+                var secondInput = firstTd.find('input:eq(3)');
+                // 返回值不等于1的情况（注意值是字符串类型，用!== '1'更严谨）
+                return secondInput.val() !== '1';
+            });
+
+            // 符合条件的tr数量加1作为idx1
+            var number = validTrs.length + 1;
+
             if(list == '#workAccountList'){
 
                 tpl = tpl.replace("workAccountList[0].financialSubjects","workAccountList["+idx1+"].financialSubjects");
                 tpl = tpl.replace("workAccountList[0].financialSubjectss","workAccountList["+idx1+"].financialSubjectss");
                 tpl = tpl.replace("not_project_reimbursement_div","not_project_reimbursement_div\" style=\"display:none;\"");
                 tpl = tpl.replace("project_reimbursement_div\" style=\"display:none;\"","project_reimbursement_div");
-                bornTemplete(list, idx, tpl, row, idx1);
+                bornTemplete(list, idx, tpl, row, idx1,number);
                 //将报销人和部门自动赋值
                 // if (idx==0 && flag){
                 var id="#workAccountList"+idx1+"_reimbursementNameId";
@@ -713,15 +725,15 @@
             }
             var idx2 = $("#reimbursementVATTaxes tr").length;
             if(list == '#reimbursementVATTaxes'){
-                bornTemplete(list, idx, tpl, row, idx2);
+                bornTemplete(list, idx, tpl, row, idx2,number);
             }
             if(list == '#reimbursementElectronicInvoiceVATTaxes'){
-                bornTemplete(list, idx, tpl, row, idx2);
+                bornTemplete(list, idx, tpl, row, idx2,number);
             }
         }
-        function bornTemplete(list, idx, tpl, row, idx1){
+        function bornTemplete(list, idx, tpl, row, idx1,number){
             $(list).append(Mustache.render(tpl, {
-                idx: idx+1, delBtn: true, row: row,
+                idx: idx+1, delBtn: true, row: row,number:number,
                 order:idx1 + 1,
             }));
             $(list+idx).find("select").each(function(){
@@ -2206,7 +2218,7 @@
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2><span style="color: red;font-size: 14px"> (可在报销单后新增数电发票xml格式的附件获取发票信息)</span></h2></div>
                 <div class="layui-item nav-btns">
-                    <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                    <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
                 </div>
                 <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
                     <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details tree_table">
@@ -2342,7 +2354,7 @@
                 <input id="workAccountList{{idx}}_delFlag" name="workAccountList[{{idx}}].delFlag" type="hidden" value="0"/>
             </td>
             <td  onclick='listTr(this)' style="vertical-align: middle;">
-                <span class='default_shut' name="workAccountList{{idx}}.serialNumber" style="padding-right: 15px; "></span>{{idx}}
+                <span class='default_shut' name="workAccountList{{idx}}.serialNumber" style="padding-right: 15px; "></span>{{number}}
             </td>
             <td style="vertical-align: middle;">
                 <div class="project_reimbursement_div"  style="width: 200px">

src/main/webapp/webpage/modules/workreimbursement/treeForm/all/workReimbursementAllModifyApply.jsp

@@ -669,14 +669,26 @@
             }
             var idx1 = $("#workAccountList tr[id^='workAccountList']").length + 1;
 
-            console.log("添加行下标：",idx1)
+            // 筛选出符合条件的tr：id以workAccountList开头，且第一个td中的第二个input值不为1
+            var validTrs = $("#workAccountList tr[id^='workAccountList']").filter(function() {
+                // 找到当前tr下的第一个td
+                var firstTd = $(this).find('td:first');
+                // 找到第一个td中的第二个input（索引从0开始，第二个即eq(1)）
+                var secondInput = firstTd.find('input:eq(3)');
+                // 返回值不等于1的情况（注意值是字符串类型，用!== '1'更严谨）
+                return secondInput.val() !== '1';
+            });
+
+            // 符合条件的tr数量加1作为idx1
+            var number = validTrs.length + 1;
+
             if(list == '#workAccountList'){
 
                 tpl = tpl.replace("workAccountList[0].financialSubjects","workAccountList["+idx1+"].financialSubjects");
                 tpl = tpl.replace("workAccountList[0].financialSubjectss","workAccountList["+idx1+"].financialSubjectss");
                 tpl = tpl.replace("not_project_reimbursement_div","not_project_reimbursement_div\" style=\"display:none;\"");
                 tpl = tpl.replace("project_reimbursement_div\" style=\"display:none;\"","project_reimbursement_div");
-                bornTemplete(list, idx, tpl, row, idx1);
+                bornTemplete(list, idx, tpl, row, idx1,number);
                 //将报销人和部门自动赋值
                 // if (idx==0 && flag){
                 var id="#workAccountList"+idx1+"_reimbursementNameId";
@@ -689,15 +701,15 @@
             }
             var idx2 = $("#reimbursementVATTaxes tr").length;
             if(list == '#reimbursementVATTaxes'){
-                bornTemplete(list, idx, tpl, row, idx2);
+                bornTemplete(list, idx, tpl, row, idx2,number);
             }
             if(list == '#reimbursementElectronicInvoiceVATTaxes'){
-                bornTemplete(list, idx, tpl, row, idx2);
+                bornTemplete(list, idx, tpl, row, idx2,number);
             }
         }
-        function bornTemplete(list, idx, tpl, row, idx1){
+        function bornTemplete(list, idx, tpl, row, idx1,number){
             $(list).append(Mustache.render(tpl, {
-                idx: idx+1, delBtn: true, row: row,
+                idx: idx+1, delBtn: true, row: row,number:number,
                 order:idx1 + 1,
             }));
             $(list+idx).find("select").each(function(){
@@ -2191,7 +2203,7 @@
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后新增数电发票xml格式的附件获取发票信息)</span></h2></div>
                 <div class="layui-item nav-btns">
-                    <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                    <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
                 </div>
                 <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
                     <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details tree_table">
@@ -2327,7 +2339,7 @@
                 <input id="workAccountList{{idx}}_delFlag" name="workAccountList[{{idx}}].delFlag" type="hidden" value="0"/>
             </td>
             <td  onclick='listTr(this)' style="vertical-align: middle;">
-                <span class='default_shut' name="workAccountList{{idx}}.serialNumber" style="padding-right: 15px; "></span>{{idx}}
+                <span class='default_shut' name="workAccountList{{idx}}.serialNumber" style="padding-right: 15px; "></span>{{number}}
             </td>
             <td style="vertical-align: middle;">
                 <div class="project_reimbursement_div"  style="width: 200px">

src/main/webapp/webpage/modules/workreimbursement/treeForm/new/workReimbursementNewModifyApply.jsp

@@ -669,14 +669,26 @@
             }
             var idx1 = $("#workAccountList tr[id^='workAccountList']").length + 1;
 
-            console.log("添加行下标：",idx1)
+            // 筛选出符合条件的tr：id以workAccountList开头，且第一个td中的第二个input值不为1
+            var validTrs = $("#workAccountList tr[id^='workAccountList']").filter(function() {
+                // 找到当前tr下的第一个td
+                var firstTd = $(this).find('td:first');
+                // 找到第一个td中的第二个input（索引从0开始，第二个即eq(1)）
+                var secondInput = firstTd.find('input:eq(3)');
+                // 返回值不等于1的情况（注意值是字符串类型，用!== '1'更严谨）
+                return secondInput.val() !== '1';
+            });
+
+            // 符合条件的tr数量加1作为idx1
+            var number = validTrs.length + 1;
+
             if(list == '#workAccountList'){
 
                 tpl = tpl.replace("workAccountList[0].financialSubjects","workAccountList["+idx1+"].financialSubjects");
                 tpl = tpl.replace("workAccountList[0].financialSubjectss","workAccountList["+idx1+"].financialSubjectss");
                 tpl = tpl.replace("not_project_reimbursement_div","not_project_reimbursement_div\" style=\"display:none;\"");
                 tpl = tpl.replace("project_reimbursement_div\" style=\"display:none;\"","project_reimbursement_div");
-                bornTemplete(list, idx, tpl, row, idx1);
+                bornTemplete(list, idx, tpl, row, idx1,number);
                 //将报销人和部门自动赋值
                 // if (idx==0 && flag){
                 var id="#workAccountList"+idx1+"_reimbursementNameId";
@@ -689,15 +701,15 @@
             }
             var idx2 = $("#reimbursementVATTaxes tr").length;
             if(list == '#reimbursementVATTaxes'){
-                bornTemplete(list, idx, tpl, row, idx2);
+                bornTemplete(list, idx, tpl, row, idx2,number);
             }
             if(list == '#reimbursementElectronicInvoiceVATTaxes'){
-                bornTemplete(list, idx, tpl, row, idx2);
+                bornTemplete(list, idx, tpl, row, idx2,number);
             }
         }
-        function bornTemplete(list, idx, tpl, row, idx1){
+        function bornTemplete(list, idx, tpl, row, idx1,number){
             $(list).append(Mustache.render(tpl, {
-                idx: idx+1, delBtn: true, row: row,
+                idx: idx+1, delBtn: true, row: row,number:number,
                 order:idx1 + 1,
             }));
             $(list+idx).find("select").each(function(){
@@ -2188,7 +2200,7 @@
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后新增数电发票xml格式的附件获取发票信息)</span></h2></div>
                 <div class="layui-item nav-btns">
-                    <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                    <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
                 </div>
                 <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
                     <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details tree_table">
@@ -2324,7 +2336,7 @@
                 <input id="workAccountList{{idx}}_delFlag" name="workAccountList[{{idx}}].delFlag" type="hidden" value="0"/>
             </td>
             <td  onclick='listTr(this)' style="vertical-align: middle;">
-                <span class='default_shut' name="workAccountList{{idx}}.serialNumber" style="padding-right: 15px; "></span>{{idx}}
+                <span class='default_shut' name="workAccountList{{idx}}.serialNumber" style="padding-right: 15px; "></span>{{number}}
             </td>
             <td style="vertical-align: middle;">
                 <div class="project_reimbursement_div"  style="width: 200px">

src/main/webapp/webpage/modules/workreimbursement/treeForm/replenish/workReimbursementReplenishAudit.jsp

@@ -731,14 +731,26 @@
 			}
 			var idx1 = $("#workAccountList tr[id^='workAccountList']").length + 1;
 
-			console.log("添加行下标：",idx1)
+			// 筛选出符合条件的tr：id以workAccountList开头，且第一个td中的第二个input值不为1
+			var validTrs = $("#workAccountList tr[id^='workAccountList']").filter(function() {
+				// 找到当前tr下的第一个td
+				var firstTd = $(this).find('td:first');
+				// 找到第一个td中的第二个input（索引从0开始，第二个即eq(1)）
+				var secondInput = firstTd.find('input:eq(3)');
+				// 返回值不等于1的情况（注意值是字符串类型，用!== '1'更严谨）
+				return secondInput.val() !== '1';
+			});
+
+			// 符合条件的tr数量加1作为idx1
+			var number = validTrs.length + 1;
+
 			if(list == '#workAccountList'){
 
 				tpl = tpl.replace("workAccountList[0].financialSubjects","workAccountList["+idx1+"].financialSubjects");
 				tpl = tpl.replace("workAccountList[0].financialSubjectss","workAccountList["+idx1+"].financialSubjectss");
 				tpl = tpl.replace("not_project_reimbursement_div","not_project_reimbursement_div\" style=\"display:none;\"");
 				tpl = tpl.replace("project_reimbursement_div\" style=\"display:none;\"","project_reimbursement_div");
-				bornTemplete(list, idx, tpl, row, idx1);
+				bornTemplete(list, idx, tpl, row, idx1,number);
 				//将报销人和部门自动赋值
 				// if (idx==0 && flag){
 				var id="#workAccountList"+idx1+"_reimbursementNameId";
@@ -751,15 +763,15 @@
 			}
 			var idx2 = $("#reimbursementVATTaxes tr").length;
 			if(list == '#reimbursementVATTaxes'){
-				bornTemplete(list, idx, tpl, row, idx2);
+				bornTemplete(list, idx, tpl, row, idx2,number);
 			}
 			if(list == '#reimbursementElectronicInvoiceVATTaxes'){
-				bornTemplete(list, idx, tpl, row, idx2);
+				bornTemplete(list, idx, tpl, row, idx2,number);
 			}
 		}
-		function bornTemplete(list, idx, tpl, row, idx1){
+		function bornTemplete(list, idx, tpl, row, idx1,number){
 			$(list).append(Mustache.render(tpl, {
-				idx: idx+1, delBtn: true, row: row,
+				idx: idx+1, delBtn: true, row: row,number:number,
 				order:idx1 + 1,
 			}));
 			$(list+idx).find("select").each(function(){
@@ -2185,7 +2197,7 @@
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后新增数电发票xml格式的附件获取发票信息)</span></h2></div>
 				<div class="layui-item nav-btns">
-					<a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>
+					<a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
 				</div>
 				<div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
 					<table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details tree_table">
@@ -2321,7 +2333,7 @@
                 <input id="workAccountList{{idx}}_delFlag" name="workAccountList[{{idx}}].delFlag" type="hidden" value="0"/>
             </td>
             <td  onclick='listTr(this)' style="vertical-align: middle;">
-                <span class='default_shut' name="workAccountList{{idx}}.serialNumber" style="padding-right: 15px; "></span>{{idx}}
+                <span class='default_shut' name="workAccountList{{idx}}.serialNumber" style="padding-right: 15px; "></span>{{number}}
             </td>
             <td style="vertical-align: middle;">
                 <div class="project_reimbursement_div"  style="width: 200px">

src/main/webapp/webpage/modules/workreimbursement/treeForm/specific/workReimbursementSpecificModifyApply.jsp

@@ -669,13 +669,26 @@
             }
             var idx1 = $("#workAccountList tr[id^='workAccountList']").length + 1;
 
+            // 筛选出符合条件的tr：id以workAccountList开头，且第一个td中的第二个input值不为1
+            var validTrs = $("#workAccountList tr[id^='workAccountList']").filter(function() {
+                // 找到当前tr下的第一个td
+                var firstTd = $(this).find('td:first');
+                // 找到第一个td中的第二个input（索引从0开始，第二个即eq(1)）
+                var secondInput = firstTd.find('input:eq(3)');
+                // 返回值不等于1的情况（注意值是字符串类型，用!== '1'更严谨）
+                return secondInput.val() !== '1';
+            });
+
+            // 符合条件的tr数量加1作为idx1
+            var number = validTrs.length + 1;
+
             if(list == '#workAccountList'){
 
                 tpl = tpl.replace("workAccountList[0].financialSubjects","workAccountList["+idx1+"].financialSubjects");
                 tpl = tpl.replace("workAccountList[0].financialSubjectss","workAccountList["+idx1+"].financialSubjectss");
                 tpl = tpl.replace("not_project_reimbursement_div","not_project_reimbursement_div\" style=\"display:none;\"");
                 tpl = tpl.replace("project_reimbursement_div\" style=\"display:none;\"","project_reimbursement_div");
-                bornTemplete(list, idx, tpl, row, idx1);
+                bornTemplete(list, idx, tpl, row, idx1,number);
                 //将报销人和部门自动赋值
                 // if (idx==0 && flag){
                 var id="#workAccountList"+idx1+"_reimbursementNameId";
@@ -688,15 +701,15 @@
             }
             var idx2 = $("#reimbursementVATTaxes tr").length;
             if(list == '#reimbursementVATTaxes'){
-                bornTemplete(list, idx, tpl, row, idx2);
+                bornTemplete(list, idx, tpl, row, idx2,number);
             }
             if(list == '#reimbursementElectronicInvoiceVATTaxes'){
-                bornTemplete(list, idx, tpl, row, idx2);
+                bornTemplete(list, idx, tpl, row, idx2,number);
             }
         }
-        function bornTemplete(list, idx, tpl, row, idx1){
+        function bornTemplete(list, idx, tpl, row, idx1,number){
             $(list).append(Mustache.render(tpl, {
-                idx: idx+1, delBtn: true, row: row,
+                idx: idx+1, delBtn: true, row: row,number:number,
                 order:idx1 + 1,
             }));
             $(list+idx).find("select").each(function(){
@@ -2201,7 +2214,7 @@
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后新增数电发票xml格式的附件获取发票信息)</span></h2></div>
                 <div class="layui-item nav-btns">
-                    <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                    <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
                 </div>
                 <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
                     <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details tree_table">
@@ -2337,7 +2350,7 @@
                 <input id="workAccountList{{idx}}_delFlag" name="workAccountList[{{idx}}].delFlag" type="hidden" value="0"/>
             </td>
             <td  onclick='listTr(this)' style="vertical-align: middle;">
-                <span class='default_shut' name="workAccountList{{idx}}.serialNumber" style="padding-right: 15px; "></span>{{idx}}
+                <span class='default_shut' name="workAccountList{{idx}}.serialNumber" style="padding-right: 15px; "></span>{{number}}
             </td>
             <td style="vertical-align: middle;">
                 <div class="project_reimbursement_div"  style="width: 200px">