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

81041

2019-01-10 c58d9f94318d9c8c3c3dfdbcfd6b7d0d436de992

 gx_tieta/WebRoot/ex-battinfo.jsp

@@ -139,6 +139,13 @@
        <script type="text/javascript" src="pages/js/common.js"></script>

        <script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>

        <script type="text/javascript">

           var permits;

         <%   Object obj=session.getAttribute("permits");

            if(obj!=null){

               String permits =obj.toString();  %>

               permits=<%=permits%>;

               //console.info(json);

         <%   }   %>

           layui.use(['form', 'table', 'layer', 'element'], function() {

              /* 页面导入layui模块 */

              var table = layui.table;      // 获取表格模块

@@ -180,7 +187,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){

@@ -248,6 +255,9 @@
            // 生成表格数据

            table.render(tOptions);

            

            // 检测是否可以审核权限

            var apprPermit = isHasPermit('install_appr_permit', permits);

            changeApprTbl(apprPermit, tOptions);

            

            // 待验收的表格 

            var acceptOptions = {

@@ -310,6 +320,9 @@
            // 生成表格数据

            table.render(acceptOptions);

            

            // 检测验收的权限

            var checkPermit = isHasPermit('install_check_permit', permits);

            changeCheckTbl(checkPermit, acceptOptions);

            

            // 待验收的表格 

            var acceptedOptions = {

@@ -406,6 +419,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() {

@@ -609,7 +637,7 @@
                     var resData = [];

                     if(rs.code == 1) {

                        var data = rs.data;

                        // console.log(data);

                        //console.log(data);

                        // 遍历数据的值

                        for(var i=0; i<data.length; i++) {

                           var _data = data[i];

@@ -626,12 +654,11 @@
                     

                     // 生成表格数据

                     table.render(tOptions);

							
                     // 启动自动刷新

                     updateSearch();

                  }

                  ,complete: function() {

                     layer.close(load);

                     // 启动自动刷新

                     updateSearch();

                  }

               });

            }

@@ -649,9 +676,10 @@
            }

            

            // 更新审查表格

            var updateSearchTimer;

            function updateSearch() {

               var temp = createSearchParam();

               clearInterval(updateSearch.timer);

               clearInterval(updateSearchTimer);

               // 查询后台

               $.ajax({

                  type: 'post'

@@ -672,8 +700,8 @@
                        for(var i=0; i<data.length; i++) {

                           var _data = data[i];

                           var _tmp = formaterResData(_data);

                           resData.push(_tmp);

                           if(_data.apply_note &&_data.apply_note != Page.all) {

                              resData.push(_tmp);

                              Page.setAll(_data.apply_note);

                              isUpdateTbl = true;

                           }

@@ -686,11 +714,15 @@
                     if(isUpdateTbl) {

                        $('#applyNum').text(Page.all);    // 设置徽章

                        tOptions.data = resData;   //  设置表格的数据

                        table.render(tOptions);

								
                        // 当前选项卡没有显示

                        if(tabsIndex != 0) {

                           table.render(tOptions);

                        }

                     }

							
                     // console.log(456);

                     // 实时回调

                     updateSearch.timer = setTimeout(updateSearch, 4000);

                     updateSearchTimer = setTimeout(updateSearch, 4000);

                  }

               });

            }

@@ -734,12 +766,12 @@
                     

                     // 生成表格数据

                     table.render(acceptOptions);

                     // console.log(table);

                     // 启动自动刷新

                     updateAcceptSearch();

                  }

                  ,complete: function() {

                     layer.close(load);

                     // 启动自动刷新

                     updateAcceptSearch();

							
                  }

               });

            }

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

               var temp = {

                  apply_en: 1

                  ,check_en: 0

                  ,check_en: 100

                  ,binf: {

                     page: acceptPage.getPage()

                  }

@@ -803,16 +835,17 @@
                  apply_en: 1

                  ,check_en: 1

                  ,binf: {

                     page: acceptPage.getPage()

                     page: acceptedPage.getPage()

                  }

               };

               return temp;

            }

            

            // 更新验收表格

            var updateAcceptSearchTimer;

            function updateAcceptSearch() {

               var temp = acceptSearchParam();

               clearInterval(updateAcceptSearch.timer);

               clearInterval(updateAcceptSearchTimer);

               // 查询后台

               $.ajax({

                  type: 'post'

@@ -836,16 +869,19 @@
                     }else {

                        acceptPage.setAll(0);

                     }

							
                     layuiTbl.setCache(table.cache.acceptTbl);

                     // 遍历data的值更新数据

                     for(var i=0; i<resData.length; i++) {

                        var _resData = resData[i];

                        _resData.doThings = '';

                        layuiTbl.updateTr(i, _resData);

                        // 当前选项卡没有显示

                        if(tabsIndex != 1) {

                           layuiTbl.updateTr(i, _resData);

                        }

                     }

							
                     //console.log(123);

                     // 实时回调

                     updateAcceptSearch.timer = setTimeout(updateAcceptSearch, 4000);

                     updateAcceptSearchTimer = setTimeout(updateAcceptSearch, 4000);

                  }

               });

            }

@@ -884,6 +920,27 @@
               

               return num;

            }

				
            // 修改审批表格样式

            function changeApprTbl(bool, opts) {

               var col = opts.cols[0];

               var doThings = col[col.length-1];

               // 移除审批按钮

               if(!bool) {

                  col.length = col.length-1;

               }

            }

				
            // 修改验收表格样式

            function changeCheckTbl(bool, opts) {

               var col = opts.cols[0];

               var doThings = col[col.length-1];

               // 移除审批按钮

               if(!bool) {

                  doThings.width = 200;

                  doThings.toolbar = '#acceptedBattGroupTools';

               }

            }

           });

        </script>

    </body>