Преглед на файлове

整理列表上传去除未填行,添加上传参数wbsCode

user5 преди 4 години
родител
ревизия
9aebbe594e

+ 13 - 4
src/main/webapp/webpage/modules/sg/free/adjustmentForm.js

@@ -112,15 +112,23 @@ layui.config({
     var objdata = JSON.parse(jsondata);
     var blcount = 0;
     var feecount = 0;
+    //创建一个新的数组,用来存放有数据的列表行
+    var listData = new Array();
     for (var i = 0;i<objdata.length;i++) {
-    blcount=Number(blcount)+Number(objdata[i].bl) ;
-    feecount=Number(feecount)+Number(objdata[i].fee);
-}
+        blcount=Number(blcount)+Number(objdata[i].bl) ;
+        feecount=Number(feecount)+Number(objdata[i].fee);
+        if(0 != Number(objdata[i].bl) && 0 != Number(objdata[i].fee)){
+            listData.push(objdata[i]);
+        }
+    }
+    //将 listData 数据转换为json格式
+    jsondata = JSON.stringify(listData);
     if(blcount!=100||feecount!=moneycount2){
     layer.msg('比例/金额分配不正确!',{icon: 5,offset:['40%','40%']});
     return false;
 }
     var newid2 = parent.$('#newid').val();//获取父类input框的值
+    var wbsCode = parent.$('#wbsCode').val();//获取父类input框的值
     var xmmc2 = parent.$('#xmmc1').val();
     var fyje2 = parent.$('#fyje1').val();
     //加载提示
@@ -134,7 +142,7 @@ layui.config({
     type:"post",
     url:"${ctx}/jkxl/saveSubNodes",
     // data:JSON.stringify({id:newid2,type:xmmc2,fee:fyje2}),
-    data:{id:newid2,type:xmmc2,fee:fyje2,tableData:jsondata},
+    data:{id:newid2,code:wbsCode,tableData:jsondata},
     success:function(result){
     parent.location.reload();
 }
@@ -146,6 +154,7 @@ layui.config({
     active[type] ? active[type].call(this) : '';
 })
     var newid2 = parent.$('#newid').val();
+    var wbsCode = parent.$('#wbsCode').val();
     var xmmc2 = parent.$('#xmmc1').val();
     var fyje2 = parent.$('#fyje1').val();
     $("#mylable2").text(xmmc2);

+ 3 - 2
src/main/webapp/webpage/modules/sg/free/wbslist.js

@@ -28,7 +28,7 @@ layui.config({
             ////对操作进行初始化
             var xml = "";
             if(d.requireSubNode){ //调整按钮
-                xml +="<a style='margin-top: 3px;' class='layui-btn layui-btn-xs'  onclick=\"adjustment('"+d.subNodeId+"','"+d.hj+"','${ctx}/jkxl/getSubElements?wbsCode=" + d.id + "')\">调整</a>"
+                xml +="<a style='margin-top: 3px;' class='layui-btn layui-btn-xs'  onclick=\"adjustment('"+d.wbssbm+"','"+d.subNodeId+"','"+d.hj+"','${ctx}/jkxl/getSubElements?wbsCode=" + d.id + "')\">调整</a>"
             }else {
                 xml +=""
             }
@@ -262,8 +262,9 @@ layui.use(['table', 'form', 'element', 'treetable'], function () {
         })
     }
 
-    function adjustment(id,totalFee,url){ //调整 弹出层
+    function adjustment(wbsCode,id,totalFee,url){ //调整 弹出层
         $("#newid").val(id); //将id写入当前页面input框中
+        $("#wbsCode").val(wbsCode); //将wbsCode写入当前页面input框中
         $("#fyje1").val(totalFee);
         $("#xmmc1").val("合计");
         layui.use(['table','layer'],function(){

+ 1 - 0
src/main/webapp/webpage/modules/sg/free/wbslist.jsp

@@ -82,6 +82,7 @@
     </fieldset>
     <div class="" style="margin-left: 10px;width:70%;margin-right: 10px;">
         <input hidden="hidden" name="" id="newid" value=""/>
+        <input hidden="hidden" name="" id="wbsCode" value=""/>
         <input hidden="hidden" name="" id="xmmc1" value=""/>
         <input hidden="hidden" name="" id="fyje1" value=""/>
         <table class="layui-hide" id="xmmc" lay-filter="freestr"></table>