tt

VisualInspection/js/statistics/change_attendance.js

@@ -21,7 +21,7 @@ $(function(){
         getFsEmployee(GV("#fs_station"),function(obj){
             $("#fs_employee").html(obj);
             // 检索
-            getFsWorkInfo();
+            getFsWorkInfo(0);
         });
     });
 
@@ -40,7 +40,7 @@ $(function(){
 
     // 根据月份确定天数
     monthChange();
-     $("#month_name").html( $("#sel_month").find("option:selected").text());
+     $("#month_name").html( GV("#sel_month"));
 
 
     // 收费站中心选择
@@ -74,8 +74,8 @@ $(function(){
 
     // 查询
     $("#searchBtn").click(function(){        
-        $("#month_name").html( $("#sel_month").find("option:selected").text()  )
-        getFsWorkInfo();
+        $("#month_name").html( GV("#sel_month") )
+        getFsWorkInfo(1);
     })
     // end
 })
@@ -84,7 +84,7 @@ $(function(){
  * 检索出勤明细数据
  * @param {*} param 
  */
-function getFsWorkInfo(){
+function getFsWorkInfo(flag){
 
     var param = {
            "start_time": timeTranslate( GV("#sel_month") ) ,
@@ -100,6 +100,9 @@ function getFsWorkInfo(){
     }
 
     post_common_service("statistics/fs/unregular/work/info",param,function(data){
+        if(flag == 0 && $("#ca-a-table").children().length > 0 ){
+            return ;
+        }
         // 月份变化
         monthChange();
         $("#ca-a-table").empty();
@@ -126,7 +129,9 @@ function getTableContent(obj,seq){
         if(obj.subStatisticsFsWork[z].check_id !=undefined){
             map_class[getD(obj.subStatisticsFsWork[z].work_date)+"-"+obj.subStatisticsFsWork[z].class_type] = 2;
         }else{
-            map_class[getD(obj.subStatisticsFsWork[z].work_date)+"-"+obj.subStatisticsFsWork[z].class_type] = 1;
+            if(  map_class[getD(obj.subStatisticsFsWork[z].work_date)+"-"+obj.subStatisticsFsWork[z].class_type] == null ){
+                map_class[getD(obj.subStatisticsFsWork[z].work_date)+"-"+obj.subStatisticsFsWork[z].class_type] = 1;
+            }
         }
     }
     var class_html = [];

VisualInspection/js/statistics/common_attendance.js

@@ -26,7 +26,7 @@ $(function(){
         getFsEmployee(GV("#fs_station"),function(obj){
             $("#fs_employee").html(obj);
             // 检索
-            getFsWorkInfo();
+            getFsWorkInfo(0);
         });
     });
 
@@ -36,13 +36,13 @@ $(function(){
     //     $("#sel_month").append('<option value= "'+ months[i]  +'">'+ months[i] +'</option>');
     // }
 
-
     // 当前月份初始化
     // $("#sel_month").val(months[months.length-1 ]);
 
     // 根据月份确定天数
     monthChange();
-     $("#month_name").html( $("#sel_month").find("option:selected").text());
+ 
+     $("#month_name").html( GV("#sel_month"));
 
 
     // 收费站中心选择
@@ -76,8 +76,8 @@ $(function(){
 
     // 查询
     $("#searchBtn").click(function(){        
-        $("#month_name").html( $("#sel_month").find("option:selected").text()  )
-        getFsWorkInfo();
+        $("#month_name").html( GV("#sel_month") )
+        getFsWorkInfo(1);
     })
     // end
 
@@ -85,7 +85,7 @@ $(function(){
      * 检索出勤明细数据
      * @param {*} param 
      */
-    function getFsWorkInfo(){
+    function getFsWorkInfo(flag){
 
         var param = {
             "start_time": timeTranslate( GV("#sel_month") ) ,
@@ -101,6 +101,9 @@ $(function(){
         }
 
         post_common_service("statistics/fs/work/info",param,function(data){
+            if(flag == 0 && $("#c-a-tbody").children().length > 0 ){
+                return ;
+            }
             // 月份变化
             monthChange();
             $("#c-a-tbody").empty();
@@ -127,9 +130,13 @@ function getTableContent(obj,seq){
     var map_class = {};
     for(var z=0; z < obj.subStatisticsFsWork.length ;z++){
         if(obj.subStatisticsFsWork[z].check_id !=undefined){
+           
             map_class[getD(obj.subStatisticsFsWork[z].work_date)+"-"+obj.subStatisticsFsWork[z].class_type] = 2;
+        
         }else{
-            map_class[getD(obj.subStatisticsFsWork[z].work_date)+"-"+obj.subStatisticsFsWork[z].class_type] = 1;
+            if(  map_class[getD(obj.subStatisticsFsWork[z].work_date)+"-"+obj.subStatisticsFsWork[z].class_type] == null ){
+                map_class[getD(obj.subStatisticsFsWork[z].work_date)+"-"+obj.subStatisticsFsWork[z].class_type] = 1;
+            }
         }
     }
     var class_html = [];