From 9fdee61a4d03e55c1e0ed86a610f8f78b6cb1e0a Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Fri, 6 Jun 2025 10:13:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B7=A5=E5=B7=A5=E6=97=B6=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/pay/dayWorkHours/index.vue | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/pay/dayWorkHours/index.vue b/ruoyi-ui/src/views/pay/dayWorkHours/index.vue
index 62fda6f..74d8417 100644
--- a/ruoyi-ui/src/views/pay/dayWorkHours/index.vue
+++ b/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">