非在编 加班统计

src/views/attendance/overtimechart.vue

@@ -9,8 +9,16 @@
             v-model="select.department_id" placeholder="请选择">
             <el-option v-for="item in departments" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
-          </el-select>
-          <el-button icon="el-icon-search" type="primary" plain size="small" style="margin-left: 6px;"
+          </el-select>
+          <el-switch
+           style="margin-left:15px"
+            v-model="select.is_formal"
+            :active-value="1"
+            :inactive-value="0"
+            active-text="在编人员"
+            inactive-text="非在编人员">
+          </el-switch>
+          <el-button icon="el-icon-search" type="primary" plain size="small" style="margin-left: 15px;"
             @click="getList">搜索</el-button>
         </template>
       </vxe-toolbar>
@@ -63,7 +71,8 @@
           page: 1,
           page_size: 10,
           month: this.$moment().format('YYYY-MM'),
-          department_id: ''
+          department_id: '',
+          is_formal:1
         },
         my_department_id:"",
         is_bgs:false, // 是否是办公室

src/views/attendance/statistics.vue

@@ -38,7 +38,8 @@
                   {{ row.attendance[item.date]['qingxiujia'][0].qingjialeibie }}
                 </div>
                 <div v-else-if="row.attendance[item.date]['chuchai'] && row.attendance[item.date]['chuchai'][0]">
-                  出差
+                  <!-- 出差 -->
+                  ✔️
                 </div>
 
                 <div v-else-if="(row.attendance[item.date].hasOwnProperty('0')) && row.attendance[item.date]['0'].sign_in_at">
@@ -61,7 +62,8 @@
                   {{ row.attendance[item.date]['qingxiujia'][1].qingjialeibie }}
                 </div>
                 <div v-else-if="row.attendance[item.date]['chuchai'] && row.attendance[item.date]['chuchai'][1]">
-                  出差
+                  <!-- 出差 -->
+                  ✔️
                 </div>
 
                 <div v-else-if="(row.attendance[item.date].hasOwnProperty('0')) && row.attendance[item.date]['0'].sign_out_at">

src/views/flow/list.vue

@@ -150,15 +150,13 @@
                 @click="showExport"
               >导出</el-button
               >
-<!--              <el-button-->
-<!--                v-if="$route.path === '/flow/list/todo'"-->
-<!--                icon="el-icon-edit"-->
-<!--                type="primary"-->
-<!--                size="small"-->
-<!--                plain-->
-<!--                @click="multiDeal"-->
-<!--              >批量审批</el-button-->
-<!--              >-->
+             <!-- <el-button
+               v-if="$route.path === '/flow/list/todo'"
+               icon="el-icon-edit"
+               type="primary"
+               size="small"
+               plain
+               @click="multiDeal">批量审批</el-button> -->
             </div>
           </template>
         </vxe-toolbar>