Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git i...

whyclj

2019-01-07 b3460365bca5a645e3e37d69dd606ae8bea8cbb0

 gx_tieta/WebRoot/ex-battinfo.jsp

@@ -180,7 +180,7 @@
               // console.log(data.index);    //得到当前Tab的所在下标

               // console.log(data.elem);    //得到当前的Tab大容器

               tabsIndex = data.index;      // 标识显示的选项卡内容

               console.log(tabsIndex);

               //console.log(tabsIndex);

               if(tabsIndex == 0) {

                  pagePage.init(Page, search);            // 待审核

               }else if(tabsIndex == 1){

@@ -407,6 +407,21 @@
            });

            

            

            // 已验收操作栏

            table.on('tool(acceptedTbl)', function(obj) {

               switch(obj.event) {

                  case 'accept':

                     acceptBattGroup(obj.data);

                  break;

                  case 'control':

                     controlPage(obj.data);

                  break;

                  case 'look':

                     lookHomeInfo(obj.data);

                  break;

               }

            });

				
            // 批量申请

            $('#exBattGroups').click(function() {

               var checkStatus = table.checkStatus('pageTbl'); //idTest 即为基础参数 id 对应的值

@@ -626,12 +641,11 @@
                     

                     // 生成表格数据

                     table.render(tOptions);

							
                     // 启动自动刷新

                     updateSearch();

                  }

                  ,complete: function() {

                     layer.close(load);

                     // 启动自动刷新

                     updateSearch();

                  }

               });

            }

@@ -688,7 +702,7 @@
                        tOptions.data = resData;   //  设置表格的数据

                        table.render(tOptions);

                     }

							
                     // console.log(456);

                     // 实时回调

                     updateSearch.timer = setTimeout(updateSearch, 4000);

                  }

@@ -734,12 +748,12 @@
                     

                     // 生成表格数据

                     table.render(acceptOptions);

                     // console.log(table);

                     // 启动自动刷新

                     updateAcceptSearch();

                  }

                  ,complete: function() {

                     layer.close(load);

                     // 启动自动刷新

                     updateAcceptSearch();

							
                  }

               });

            }

@@ -748,7 +762,7 @@
            function acceptSearchParam() {

               var temp = {

                  apply_en: 1

                  ,check_en: 0

                  ,check_en: 100

                  ,binf: {

                     page: acceptPage.getPage()

                  }

@@ -843,7 +857,7 @@
                        _resData.doThings = '';

                        layuiTbl.updateTr(i, _resData);

                     }

							
                     //console.log(123);

                     // 实时回调

                     updateAcceptSearch.timer = setTimeout(updateAcceptSearch, 4000);

                  }