班次考勤统计完善。

src/views/base/companyInfo-detail.vue

@@ -54,9 +54,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="全称" prop="shortName">
+            <el-form-item label="全称" prop="fullName">
               <el-input
-                v-model="formModel.shortName"
+                v-model="formModel.fullName"
                 placeholder="请输入单位全称"
                 style="width: 400px"
               ></el-input>

src/views/base/companyInfo-list.vue

@@ -146,7 +146,7 @@
         width="200"
       ></el-table-column>
       <el-table-column
-        prop="shortName"
+        prop="fullName"
         label="全称"
         width="120"
       ></el-table-column>

src/views/business/workScheduleReport.vue

@@ -113,13 +113,19 @@
       <el-table-column label="序号" fixed="left" type="index" :index="indexMethod"></el-table-column>
       <el-table-column label="姓名" fixed="left" prop="name" width="100"></el-table-column>
       <el-table-column label="编号" prop="personId" width="100"></el-table-column>
-      <el-table-column label="单位" prop="departmentName" width="200"></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 label="出勤天数" prop="workDays"></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>
       <template v-for="col in dayColumns">
         <el-table-column :label="col.label" :prop="col.name" :key="col.name" width="200">
           <template slot-scope="{row}">
             <div style="display:flex;flex-direction:column;">
               <template v-for="(item,index) in row.workAttendanceMap[col.name]">
-                <div v-html="item" :key="index"></div>
+                <div v-html="showItem(item)" :key="index"></div>
               </template>
             </div>
           </template>
@@ -323,43 +329,22 @@ export default {
     showItem(item) {
       var content = [];
 
-      var arr = item.recordTime.split(" ");
-
-      if (arr.length > 1) {
-        content.push(arr[1]);
-      } else {
-        content.push(arr[0]);
-      }
-
-      content.push(" ");
-
-      if (item.classifier == 1) {
-        content.push("上班");
-      } else {
-        content.push("下班");
-      }
+      content.push(item.remark);
 
       var fontColor = "";
 
       if (item.result == "0") {
-        content.push("缺卡");
         fontColor = "red";
       } else if (item.result == "1") {
-        content.push("打卡");
         fontColor = "green";
       } else if (item.result == "2") {
-        content.push("迟到");
+        fontColor = "gray";
       } else if (item.result == "3") {
-        content.push("早退");
+        fontColor = "gray";
       }else if(item.result == "4"){
-        content.push("请假");
         fontColor = "#11A8CD";
       }
 
-      if(item.workOutRemark!=null){
-        content.push("(" + item.workOutRemark + ")");
-      }
-
       return `<font color='${fontColor}'>` + content.join("") + "</font>";
     },
     handleQuery() {