BUG修改

src/views/base/workPersonScheduling-list.vue

@@ -104,8 +104,18 @@
         show-overflow-tooltip
         fixed="left"
       ></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>
+      <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 + ''"
@@ -182,11 +192,12 @@
             filterable
             multiple
             placeholder="请选择"
+            style="width:80%"
           >
             <el-option
               v-for="shift in shiftData"
               :key="shift.id"
-              :label="shift.name"
+              :label="showShiftLaber(shift)"
               :value="shift.id"
             ></el-option>
           </el-select>
@@ -460,6 +471,17 @@ export default {
         }
       });
     },
+    showShiftLaber(shift) {
+      var laber =
+        shift.number +
+        "-" +
+        shift.name +
+        "  " +
+        shift.workTime +
+        "-" +
+        shift.closingTime;
+      return laber;
+    },
   },
   mounted: function () {
     //this.changePage(1);

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

@@ -70,7 +70,13 @@
       ></el-table-column>
       <el-table-column prop="shiftNumbers" label="班次" width="180">
         <template slot-scope="{ row }">
-          <span v-if="row.onWorkStatus != 1 && row.onWorkStatus != 1&& row.onWorkStatus != null">
+          <span
+            v-if="
+              row.onWorkStatus != 1 &&
+              row.onWorkStatus != 1 &&
+              row.onWorkStatus != null
+            "
+          >
             {{ row.onWorkStatusN }}
           </span>
           <span v-else>
@@ -78,40 +84,51 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column prop="onWorkResult" label="上班" width="180">
+      <el-table-column prop="onWorkRecordTime" label="上班打卡时间" width="180"
+        ><template slot-scope="{ row }">
+          <span v-if="row.onWorkStatus == 1 && row.onWorkResult != 0">
+            {{ row.onWorkRecordTime }}
+          </span>
+          <span v-else></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="fill"
-            ></el-image>
+          <span v-if="row.onWorkStatus == 1 && row.onWorkResult == 0">
+            {{ row.onWorkResultN }}
           </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="fill"
-            ></el-image>
+          <span
+            v-else-if="
+              row.onWorkStatus == 1 &&
+              row.onWorkResult != 1 &&
+              row.onWorkResult != 0
+            "
+          >
+            {{ row.onWorkResultN }} {{ row.onLateLeaveMinuteN }}
           </span>
           <span v-else></span>
         </template>
       </el-table-column>
+      <el-table-column prop="offWorkRecordTime" label="下班打卡时间" width="180"
+        ><template slot-scope="{ row }">
+          <span v-if="row.offWorkStatus == 1 && row.offWorkResult != 0">
+            {{ row.offWorkRecordTime }}</span
+          >
+          <span v-else> </span> </template
+      ></el-table-column>
       <el-table-column prop="offWorkResult" label="下班" width="180">
         <template slot-scope="{ row }">
-          <span v-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_yes.png"
-              fit="fill"
-            ></el-image>
+          <span v-if="row.offWorkStatus == 1 && row.offWorkResult == 0">
+            {{ row.offWorkResultN }}
           </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="fill"
-            ></el-image>
+          <span
+            v-if="
+              row.offWorkStatus == 1 &&
+              row.offWorkResult != 1 &&
+              row.offWorkResult != 0
+            "
+          >
+            {{ row.offWorkResultN }} {{ row.OffLateLeaveMinuteN }}
           </span>
           <span v-else></span>
         </template>