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

hdw

2018-12-18 0e1721488e6d8f091d13403e20f0bbf5cf397b96

 gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html

@@ -84,7 +84,7 @@
                 

                 

                     <select id="newbattnum" data-mini="true">

                       <option value="0">新建电池组</option>

                       <option value=0>新建电池组</option>

                       

                     </select>

                     

@@ -363,7 +363,7 @@
   tempindex = JSON.parse(tempindex);

   tempnum =JSON.parse(tempnum);

   var suoyin = temp[33];

	
   var addbattnum = tempindex.length;

   $(function(){

   creatAllView(tempindex.length).trigger('create');

   creatBa(tempindex.length).trigger('create');

@@ -430,15 +430,14 @@
   // 格式化提交后台信息的对象数组修改

   function getUpdateArr(){

         var arr = new Array();

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

         console.info(addbattnum);

         for(var i=0;i<addbattnum;i++){

            var battString = "#battname"+i;

            var index = String(i);

            console.info(battString);

            var obj = {

               apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),

               num : tempnum[i],

					
               binf:{

                  StationId : $("#StationId").val(),   // 机房编号

                  StationName : ($("#station_name1").val()+"-"+$("#city").val()+"-"+$("#StationName3").val()+"-"+$("#StationName4").val()),   // 拼接机房名称

@@ -523,15 +522,37 @@
   }

 

 

 
 
 
 
   function creatBattGroupId(addbattnum){

      $.ajax({type: "post", 				
              url: "BattInfAction!searchMaxBattgroupId",				
              async:true,				
              dataType:'text',

              data:null,	
              success: function(data){

               data=JSON.parse(data);

               data=data.result;

               data =JSON.parse(data);

               //console.info(data)

               var groupid = data.data;

               //console.info(groupid);

               //tempgroupid.push(groupid);

               console.info(tempgroupid);

               for(var i=tempgroupid.length;i<addbattnum;i++){

                  tempgroupid.push(groupid++);

                  console.info(tempgroupid);

               }

            }

      });	
   }



 

    $('#newbattnum').change(function(){

    var addbattnum=$('#newbattnum').val()+tempindex.length;

    console.warn(addbattnum+'hihihi');

       creatAllView(3).trigger('create');

       var numbattnum = parseInt($('#newbattnum').val());

       var index =parseInt(tempindex.length);

       addbattnum=Math.floor((numbattnum)+(tempindex.length));

       console.warn(addbattnum);

       creatAllView(addbattnum).trigger('create');

       creatBattGroupId(addbattnum);

   });

 



@@ -542,4 +563,4 @@
   $('#changeErr').popup('open'); */

   </script>

   

</html> 
</html>