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

81041

2019-01-15 6fc11b72fa9f3812e91814c935cc06b8d04f2f51

 gx_tieta/WebRoot/mobil/wcheckAccept.html

@@ -110,8 +110,6 @@
      </div>

      <!-- 主体内容 -->

      <div data-role="main">

         <div class="pre-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-l ui-btn-icon-notext">图标</a></div>

         <div class="next-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext">图标</a></div>	
         <!-- 表格容器 -->

         <div class="tbl-container"></div>

         <table data-role="table" class="ui-responsive ui-shadow" id="tab" >

@@ -205,6 +203,12 @@
                ,full: true

                ,anim: 4

                ,content: 'iframe/homeinfo1.html'

                ,success: function() {

                   $('div[data-role=page]').hide();

                }

                ,end: function() {

                   $('div[data-role=page]').show();

                }

            });

            layer.full(iframePopup);

      // applyendyanshou(arr);      

@@ -244,12 +248,13 @@
    });

      

   $("#sure").click(function(){

       var temp = getCookie("wapproval");

      temp = JSON.parse(temp);

      // var temp = getCookie("wapproval");

      //temp = JSON.parse(temp);

      var data = temp;

      if(data[i].check_en==0){

      console.info(data);

      if(data[0].check_en==0){//一个基站内的所有电池组同时申请，因此判断一组电池组状态即可。

         alert("现场未提交申请验收");

      }else if(data[i].check_en==2){

      }else if(data[0].check_en==2){

         exBattGroupAjax(data);

      }

   });

@@ -292,6 +297,12 @@
                ,full: true

                ,anim: 4

                ,content: 'iframe/seenhomeinfo.html'

                ,success: function() {

                   $('div[data-role=page]').hide();

                }

                ,end: function() {

                   $('div[data-role=page]').show();

                }

            });

            layer.full(iframePopup);

   });

@@ -386,6 +397,7 @@
   // 通过审批请求

   function exBattGroupAjax(data) {

      // 请求后台

      loadshow();

      $.ajax({

         type: 'post'

         ,async: true

@@ -396,9 +408,11 @@
            var rs = JSON.parse(res.result);

            // console.log(rs);

            if(rs.code == 1) {

               loadclose();

               alert("确认验收成功");

               window.location.href="wcheckAccept-index.html";

            }else {

               loadclose();

               alert('确认验收失败');

            }      

         }