2022.4.29

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -917,6 +917,22 @@
                 >
                   0
                 </div>
+                <div
+                  v-if="
+                    scope.row.worktimeList.filter(
+                      (w) =>w.createDate==item.date
+                    ).length > 0 &&
+                    typeof scope.row.worktimeList.filter(
+                      (w) =>w.createDate==item.date
+                    )[0].workingTime == 'string'
+                  "
+                >
+                  {{
+                    scope.row.worktimeList.filter(
+                      (w) =>w.createDate==item.date
+                    )[0].workingTime
+                  }}
+                </div>
               </template>
             </el-table-column>
           </el-table>
@@ -1925,6 +1941,7 @@
           if (res.code == "ok") {
             this.tbload = false;
             this.pickDateArray = res.data.days;
+            console.log('dataarray',res.data.days);
             this.monthworkDate = res.data.list;
             // this.monthworkDateS = this.monthworkDate
             this.monthworkDateS1 = res.data.list