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

81041

2019-01-08 de072c451bdf8b49efea074e86d129e043e9df6b

 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;      // 获取表格模块

@@ -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 = {

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

            

            // 更新审查表格

            var updateSearchTimer;

            function updateSearch() {

               var temp = createSearchParam();

               clearInterval(updateSearch.timer);

               clearInterval(updateSearchTimer);

               // 查询后台

               $.ajax({

                  type: 'post'

@@ -686,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;

                           }

@@ -704,7 +718,7 @@
                     }

                     // console.log(456);

                     // 实时回调

                     updateSearch.timer = setTimeout(updateSearch, 4000);

                     updateSearchTimer = setTimeout(updateSearch, 4000);

                  }

               });

            }

@@ -824,9 +838,10 @@
            }

            

            // 更新验收表格

            var updateAcceptSearchTimer;

            function updateAcceptSearch() {

               var temp = acceptSearchParam();

               clearInterval(updateAcceptSearch.timer);

               clearInterval(updateAcceptSearchTimer);

               // 查询后台

               $.ajax({

                  type: 'post'

@@ -850,7 +865,7 @@
                     }else {

                        acceptPage.setAll(0);

                     }

							
                     layuiTbl.setCache(table.cache.acceptTbl);

                     // 遍历data的值更新数据

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

                        var _resData = resData[i];

@@ -859,7 +874,7 @@
                     }

                     //console.log(123);

                     // 实时回调

                     updateAcceptSearch.timer = setTimeout(updateAcceptSearch, 4000);

                     updateAcceptSearchTimer = setTimeout(updateAcceptSearch, 4000);

                  }

               });

            }

@@ -898,6 +913,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>