zhonghuizhen пре 9 месеци
родитељ
комит
e662d01ae2
1 измењених фајлова са 37 додато и 36 уклоњено
  1. 37 36
      src/views/business/attendance/attendanceStatistics.vue

+ 37 - 36
src/views/business/attendance/attendanceStatistics.vue

@@ -80,44 +80,44 @@
         <!-- 考勤情况 -->
         <!-- 考勤情况 -->
         <el-table-column label="考勤情况">
         <el-table-column label="考勤情况">
           <el-table-column
           <el-table-column
-            key="ying_chu_qin_shu"
-            prop="ying_chu_qin_shu"
+            key="ying_chu_qin_tian_shu"
+            prop="ying_chu_qin_tian_shu"
             label="应出勤天数"
             label="应出勤天数"
             width="110"
             width="110"
           />
           />
           <el-table-column
           <el-table-column
-            key="shi_ji_chu_qin_shu"
-            prop="shi_ji_chu_qin_shu"
+            key="shi_ji_chu_qin_tian_shu"
+            prop="shi_ji_chu_qin_tian_shu"
             label="实际出勤天数"
             label="实际出勤天数"
             width="110"
             width="110"
           />
           />
           <el-table-column
           <el-table-column
-            key="xiu_xi_shu"
-            prop="xiu_xi_shu"
+            key="xiu_xi_tian_shu"
+            prop="xiu_xi_tian_shu"
             label="休息天数"
             label="休息天数"
             width="90"
             width="90"
           />
           />
           <el-table-column
           <el-table-column
-            key="zheng_chang_shu"
-            prop="zheng_chang_shu"
+            key="zheng_chang_tian_shu"
+            prop="zheng_chang_tian_shu"
             label="正常天数"
             label="正常天数"
             width="90"
             width="90"
           />
           />
           <el-table-column
           <el-table-column
-            key="yi_chang_shu"
-            prop="yi_chang_shu"
+            key="yi_chang_tian_shu"
+            prop="yi_chang_tian_shu"
             label="异常天数"
             label="异常天数"
             width="90"
             width="90"
           />
           />
           <el-table-column
           <el-table-column
-            key="total_ban_ci_shi_chang"
-            prop="total_ban_ci_shi_chang"
+            key="ban_ci_shi_chang"
+            prop="ban_ci_shi_chang"
             label="标准工作时长(小时)"
             label="标准工作时长(小时)"
             min-width="140"
             min-width="140"
           />
           />
           <el-table-column
           <el-table-column
-            key="total_gong_zuo_shi_chan"
-            prop="total_gong_zuo_shi_chan"
+            key="gong_zuo_shi_chang"
+            prop="gong_zuo_shi_chang"
             label="实际工作时长(小时)"
             label="实际工作时长(小时)"
             min-width="140"
             min-width="140"
           />
           />
@@ -125,14 +125,14 @@
         <!-- 异常统计 -->
         <!-- 异常统计 -->
         <el-table-column label="异常统计">
         <el-table-column label="异常统计">
           <el-table-column
           <el-table-column
-            key="yi_chang_he_ji"
-            prop="yi_chang_he_ji"
+            key="yi_chang_ci_shu"
+            prop="yi_chang_ci_shu"
             label="异常合计"
             label="异常合计"
             width="90"
             width="90"
           >
           >
             <template #default="{ row }">
             <template #default="{ row }">
               <span :style="{ color: 'red' }">
               <span :style="{ color: 'red' }">
-                {{ row.yi_chang_he_ji }}次
+                {{ row.yi_chang_ci_shu }}次
               </span>
               </span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
@@ -149,14 +149,14 @@
             </template>
             </template>
           </el-table-column>
           </el-table-column>
           <el-table-column
           <el-table-column
-            key="total_chi_dao_shi_chang"
-            prop="total_chi_dao_shi_chang"
+            key="chi_dao_shi_chang"
+            prop="chi_dao_shi_chang"
             label="迟到时长(分钟)"
             label="迟到时长(分钟)"
             min-width="120"
             min-width="120"
           >
           >
             <template #default="{ row }">
             <template #default="{ row }">
               <span :style="{ color: 'red' }">
               <span :style="{ color: 'red' }">
-                {{ row.total_chi_dao_shi_chang }}
+                {{ row.chi_dao_shi_chang }}
               </span>
               </span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
@@ -341,6 +341,7 @@ export default {
          'param': {
          'param': {
                     'buMen': searchParam['Q^bu_men_^SL'],
                     'buMen': searchParam['Q^bu_men_^SL'],
                     'locationId': second || first,
                     'locationId': second || first,
+                    'gongHao': searchParam['Q^gong_hao_^S'],
                     'yongHuId': searchUser,
                     'yongHuId': searchUser,
                     'kaishiJianShiJ^S': this.daterRange[0],
                     'kaishiJianShiJ^S': this.daterRange[0],
                     'kaishiJianShiJ^E': this.daterRange[1]
                     'kaishiJianShiJ^E': this.daterRange[1]
@@ -402,44 +403,44 @@ export default {
           name: 'gong_hao_'
           name: 'gong_hao_'
         },
         },
         {
         {
-          field_name: 'ying_chu_qin_shu',
+          field_name: 'ying_chu_qin_tian_shu',
           label: '应出勤天数',
           label: '应出勤天数',
-          name: 'ying_chu_qin_shu'
+          name: 'ying_chu_qin_tian_shu'
         },
         },
         {
         {
-          field_name: 'shi_ji_chu_qin_shu',
+          field_name: 'shi_ji_chu_qin_tian_shu',
           label: '实际出勤天数',
           label: '实际出勤天数',
-          name: 'shi_ji_chu_qin_shu'
+          name: 'shi_ji_chu_qin_tian_shu'
         },
         },
         {
         {
-          field_name: 'xiu_xi_shu',
+          field_name: 'xiu_xi_tian_shu',
           label: '休息天数',
           label: '休息天数',
-          name: 'xiu_xi_shu'
+          name: 'xiu_xi_tian_shu'
         },
         },
         {
         {
-          field_name: 'zheng_chang_shu',
+          field_name: 'zheng_chang_tian_shu',
           label: '正常天数',
           label: '正常天数',
-          name: 'zheng_chang_shu'
+          name: 'zheng_chang_tian_shu'
         },
         },
         {
         {
-          field_name: 'yi_chang_shu',
+          field_name: 'yi_chang_tian_shu',
           label: '异常天数',
           label: '异常天数',
-          name: 'yi_chang_shu'
+          name: 'yi_chang_tian_shu'
         },
         },
         {
         {
-          field_name: 'total_ban_ci_shi_chang',
+          field_name: 'ban_ci_shi_chang',
           label: '标准工作时长(分钟)',
           label: '标准工作时长(分钟)',
-          name: 'total_ban_ci_shi_chang'
+          name: 'ban_ci_shi_chang'
         },
         },
         {
         {
-          field_name: 'total_gong_zuo_shi_chan',
+          field_name: 'gong_zuo_shi_chang',
           label: '实际工作时长(分钟)',
           label: '实际工作时长(分钟)',
-          name: 'total_gong_zuo_shi_chan'
+          name: 'gong_zuo_shi_chang'
         },
         },
         {
         {
-          field_name: 'yi_chang_he_ji',
+          field_name: 'yi_chang_ci_shu',
           label: '异常合计',
           label: '异常合计',
-          name: 'yi_chang_he_ji'
+          name: 'yi_chang_ci_shu'
         },
         },
         {
         {
           field_name: 'chi_dao_ci_shu',
           field_name: 'chi_dao_ci_shu',