考勤统计修改。

src/views/business/workAttendance-list.vue

@@ -47,6 +47,10 @@
               v-model="queryModel.companyId"
               height="200"
             ></el-select-tree>
+            &nbsp;
+            <el-checkbox v-model="queryModel.subordinate"
+              >是否包含下级单位</el-checkbox
+            >
           </el-form-item>
           <el-form-item label="统计区间" prop="timeRanges">
             <el-date-picker
@@ -65,7 +69,7 @@
           <el-form-item label="姓名" prop="name">
             <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
           </el-form-item>
-          <el-form-item v-if="position1Show" :label="position1" prop="position1">
+          <!-- <el-form-item v-if="position1Show" :label="position1" prop="position1">
             <el-input type="text" size="mini" v-model="queryModel.position1"></el-input>
           </el-form-item>
           <el-form-item v-if="position2Show" :label="position2" prop="position2">
@@ -73,7 +77,7 @@
           </el-form-item>
           <el-form-item v-if="position3Show" :label="position3" prop="position3">
             <el-input type="text" size="mini" v-model="queryModel.position3"></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item>
             <el-button
               type="primary"
@@ -90,14 +94,14 @@
           </el-form-item>
         </el-row>
       </div>
-      <div>
+      <!-- <div>
         <el-form-item v-if="position4Show" :label="position4" prop="position4">
           <el-input type="text" size="mini" v-model="queryModel.position4"></el-input>
         </el-form-item>
         <el-form-item v-if="position5Show" :label="position5" prop="position5">
           <el-input type="text" size="mini" v-model="queryModel.position5"></el-input>
         </el-form-item>
-      </div>
+      </div> -->
     </el-form>
     <el-divider></el-divider>
     <el-row class="button-group">
@@ -113,13 +117,16 @@
     <el-table ref="formTable" stripe :data="tableData" :height="tableHeight" style="width: 100%">
       <el-table-column label="序号" fixed="left" type="index" :index="indexMethod"></el-table-column>
       <el-table-column label="姓名" fixed="left" prop="name"></el-table-column>
-      <el-table-column prop="position1" :label="position1" v-if="position1Show"></el-table-column>
+      <el-table-column label="公司" prop="companyName" width="200"></el-table-column>
+      <el-table-column label="上级部门" prop="parentDepartmentName" width="200"></el-table-column>
+      <el-table-column label="部门" prop="departmentName" width="200"></el-table-column>
+      <!-- <el-table-column prop="position1" :label="position1" v-if="position1Show"></el-table-column>
       <el-table-column prop="position2" :label="position2" v-if="position2Show"></el-table-column>
       <el-table-column prop="position3" :label="position3" v-if="position3Show"></el-table-column>
       <el-table-column prop="position4" :label="position4" v-if="position4Show"></el-table-column>
-      <el-table-column prop="position5" :label="position5" v-if="position5Show"></el-table-column>
+      <el-table-column prop="position5" :label="position5" v-if="position5Show"></el-table-column> -->
       <el-table-column label="出勤天数" prop="workDays"></el-table-column>
-      <el-table-column label="休息天数" prop="restDays"></el-table-column>
+      <el-table-column label="请假天数" prop="restDays"></el-table-column>
       <el-table-column label="迟到次数" prop="lateNum"></el-table-column>
       <el-table-column label="早退次数" prop="leaveNum"></el-table-column>
       <el-table-column label="上班缺卡次数" prop="missCardOnWorkCount"></el-table-column>
@@ -172,6 +179,7 @@ export default {
       queryModel: {
         companyId: "",
         timeRanges: "",
+        subordinate: false,
         name: "",
         jobNumber: "",
         position1: "",
@@ -312,7 +320,10 @@ export default {
       if (self.queryModel.companyId == null) {
         self.queryModel.companyId = "";
       }
+      
       formData.append("companyId", self.queryModel.companyId);
+      formData.append("subordinate", self.queryModel.subordinate);
+
       formData.append("name", self.queryModel.name);
 
       var startDate = "";
@@ -401,6 +412,9 @@ export default {
         content.push("迟到");
       } else if (item.result == "3") {
         content.push("早退");
+      }else if(item.result == "4"){
+        content.push("请假");
+        fontColor = "#11A8CD";
       }
 
       return `<font color='${fontColor}'>` + content.join("") + "</font>";