考勤记录

src/views/base/workPersonScheduling-list.vue

@@ -94,15 +94,18 @@
         type="index"
         label="序号"
         :index="indexMethod"
+        fixed="left"
         width="50"
       ></el-table-column>
       <el-table-column
         prop="companyName"
         label="部门"
-        width="90"
+        width="120"
+        show-overflow-tooltip
+        fixed="left"
       ></el-table-column>
-      <el-table-column prop="id" label="编号" width="90"></el-table-column>
-      <el-table-column prop="name" label="名称" width="150"></el-table-column>
+      <el-table-column prop="id" label="编号" width="90" fixed="left"></el-table-column>
+      <el-table-column prop="name" label="名称" width="90" fixed="left"></el-table-column>
       <template v-for="col in dayList">
         <el-table-column
           :label="col.day + ''"

src/views/business/workScheduleAttendance-day-list.vue

@@ -72,24 +72,33 @@
         prop="shiftNumbers"
         label="班次"
         width="180"
-      ></el-table-column>
+      >
+      <template slot-scope="{ row }">
+          <span v-if="row.onWorkStatus != 1 && row.onWorkStatus != 1">
+            {{row.onWorkStatusN}}
+          </span>
+          <span v-else>
+            {{row.shiftNumbers}}
+          </span>
+      </template>
+      </el-table-column>
       <el-table-column prop="onWorkResult" label="上班" width="180">
         <template slot-scope="{ row }">
           <span v-if="row.onWorkStatus == 1 && row.onWorkResult == 1">
             <el-image
               style="width: 40px; height: 40px"
               src="http://rccs.oss-cn-hangzhou.aliyuncs.com/jp_housekeeper/img/work_yes.png"
-              :fit="fit"
+              fit="fill"
             ></el-image>
           </span>
           <span v-else-if="row.onWorkStatus == 1 && row.onWorkResult != 1">
             <el-image
               style="width: 40px; height: 40px"
               src="http://rccs.oss-cn-hangzhou.aliyuncs.com/jp_housekeeper/img/work_no.png"
-              :fit="fit"
+              fit="fill"
             ></el-image>
           </span>
-          <span v-else>{{ row.onWorkStatusN }}</span>
+          <span v-else></span>
         </template>
       </el-table-column>
       <el-table-column prop="offWorkResult" label="下班" width="180">
@@ -98,17 +107,17 @@
             <el-image
               style="width: 40px; height: 40px"
               src="http://rccs.oss-cn-hangzhou.aliyuncs.com/jp_housekeeper/img/work_yes.png"
-              :fit="fit"
+              fit="fill"
             ></el-image>
           </span>
           <span v-else-if="row.offWorkStatus == 1 && row.offWorkResult != 1">
             <el-image
               style="width: 40px; height: 40px"
               src="http://rccs.oss-cn-hangzhou.aliyuncs.com/jp_housekeeper/img/work_no.png"
-              :fit="fit"
+              fit="fill"
             ></el-image>
           </span>
-          <span v-else>{{ row.offWorkStatusN }}</span>
+          <span v-else></span>
         </template>
       </el-table-column>
       <el-table-column
@@ -245,7 +254,8 @@ export default {
     var personId = this.$route.query.personId;
     var timeRanges = this.$route.query.timeRanges;
     this.queryModel.personId = personId;
-    this.queryModel.timeRanges = timeRanges;
+    let tims = timeRanges.split(",");
+    this.queryModel.timeRanges = [tims[0],tims[1]]
 
     this.changePage();
   },

src/views/business/workScheduleAttendance-list.vue

@@ -16,6 +16,7 @@
     <el-form
       ref="queryForm"
       :model="queryModel"
+      :rules="ruleValidate"
       inline
       class="demo-form-inline"
     >
@@ -126,11 +127,11 @@
         label="迟到次数"
         width="120"
       ></el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="leaveEarlyMinutes"
         label="早退分钟"
         width="120"
-      ></el-table-column>
+      ></el-table-column> -->
       <el-table-column
         prop="leaveEarlyNum"
         label="早退次数"
@@ -397,7 +398,6 @@ export default {
     },
     handleQuery() {
       var self = this;
-
       this.$refs["queryForm"].validate((valid) => {
         if (valid) {
           self.changePage(1);