日工工时页面修改

ruoyi-ui/src/views/pay/dayWorkHours/index.vue

@@ -118,7 +118,50 @@
             <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="日工年月" align="center" prop="dwYearMonth" />
+        <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+          <template slot-scope="scope">
+            <div class="annotations">
+              <tr class="annotation-rs cluster-rs" v-for="(item, index) in scope.row.dwHoursContrasts" :key="index">
+                <td>{{ parseTime(item.startTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</td>
+              </tr>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+          <template slot-scope="scope">
+            <div class="annotations">
+              <tr class="annotation-rs cluster-rs" v-for="(item, index) in scope.row.dwHoursContrasts" :key="index">
+                <td>{{ parseTime(item.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</td>
+              </tr>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="小时数" align="center" prop="hours" >
+          <template slot-scope="scope">
+            <div class="annotations">
+              <tr class="annotation-rs cluster-rs" v-for="(item, index) in scope.row.dwHoursContrasts" :key="index">
+                <td>{{item.hours}}</td>
+              </tr>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="业务员" align="center" prop="salesman" min-width="200">
+          <template slot-scope="scope">
+            <div class="annotations">
+              <tr class="annotation-rs cluster-rs" v-for="(item, index) in scope.row.dwHoursContrasts" :key="index" style="height: 26px;">
+                <td>{{item.salesman}}</td>
+              </tr>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否帮工" align="center" prop="isHelper">
+          <template slot-scope="scope">
+            <div v-for="(item, index) in scope.row.dwHoursContrasts" :key="index">
+              <span v-if="0 === item.isHelper">否</span>
+              <span v-if="1 === item.isHelper">是</span>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center" prop="note" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">