Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

81041

2019-01-09 eed5715ed72cda38a07d792b3750fdb077ff0492

 gx_tieta/WebRoot/iframe/setcurr.html

@@ -51,8 +51,8 @@
            var table = layui.table;

            

            var setCurr = parent.$('#setCurrIframe').data('setCurr');

            
            console.log(setCurr);

            var addBattStr = parent.$('#setCurrIframe').data('addBattStr');

            console.log(addBattStr);

            // 表格模块

         var tOptions = {

            elem: '#pageTbl'

@@ -133,7 +133,7 @@
                  type: 'post'

                  ,async: true

                  ,url: 'Fbs9100_setparamAction_action_updatePro_dis'

                  ,data: 'json='+JSON.stringify(param)

                  ,data: 'json='+JSON.stringify(param)+'&json_msg='+addBattStr

                  ,dataType: 'json'

                  ,success: function(res) {

                     var rs = JSON.parse(res.result);