diff --git a/src/api/oa/erp/timesheetSummaryDetail/types.ts b/src/api/oa/erp/timesheetSummaryDetail/types.ts
index 87c7739..d754931 100644
--- a/src/api/oa/erp/timesheetSummaryDetail/types.ts
+++ b/src/api/oa/erp/timesheetSummaryDetail/types.ts
@@ -9,6 +9,11 @@ export interface TimesheetSummaryDetailVO {
    */
   summaryId: string | number;
 
+  /**
+   * 关联汇总主表编号
+   */
+  summaryCode: string;
+
   /**
    * 排序号
    */
@@ -83,7 +88,6 @@ export interface TimesheetSummaryDetailVO {
    * 备注
    */
   remark: string;
-
 }
 
 export interface TimesheetSummaryDetailForm extends BaseEntity {
@@ -97,6 +101,11 @@ export interface TimesheetSummaryDetailForm extends BaseEntity {
    */
   summaryId?: string | number;
 
+  /**
+   * 关联汇总主表编号
+   */
+  summaryCode?: string;
+
   /**
    * 排序号
    */
@@ -171,16 +180,19 @@ export interface TimesheetSummaryDetailForm extends BaseEntity {
    * 备注
    */
   remark?: string;
-
 }
 
 export interface TimesheetSummaryDetailQuery extends PageQuery {
-
   /**
    * 关联汇总主表ID
    */
   summaryId?: string | number;
 
+  /**
+   * 关联汇总主表编号
+   */
+  summaryCode?: string;
+
   /**
    * 排序号
    */
@@ -256,6 +268,3 @@ export interface TimesheetSummaryDetailQuery extends PageQuery {
    */
   params?: any;
 }
-
-
-
diff --git a/src/views/oa/erp/timesheetSummaryDetail/index.vue b/src/views/oa/erp/timesheetSummaryDetail/index.vue
index 9763b41..e1ff274 100644
--- a/src/views/oa/erp/timesheetSummaryDetail/index.vue
+++ b/src/views/oa/erp/timesheetSummaryDetail/index.vue
@@ -1,404 +1,430 @@
 <template>
-    <div class="p-2">
-        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-            <div v-show="showSearch" class="mb-[10px]">
-                <el-card shadow="hover">
-                    <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width='100px'>
-                                    <el-form-item label="关联汇总主表ID" prop="summaryId">
-                                        <el-input v-model="queryParams.summaryId" placeholder="请输入关联汇总主表ID" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="排序号" prop="sortOrder">
-                                        <el-input v-model="queryParams.sortOrder" placeholder="请输入排序号" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="员工用户ID" prop="staffUserId">
-                                        <el-input v-model="queryParams.staffUserId" placeholder="请输入员工用户ID" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="员工姓名(冗余字段)" prop="staffName">
-                                        <el-input v-model="queryParams.staffName" placeholder="请输入员工姓名(冗余字段)" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="工时类型" prop="isProject">
-                                        <el-select v-model="queryParams.isProject" placeholder="请选择工时类型" clearable >
-                                            <el-option v-for="dict in is_project" :key="dict.value" :label="dict.label" :value="dict.value"/>
-                                        </el-select>
-                                    </el-form-item>
-                                    <el-form-item label="原项目ID(填报时的项目)" prop="originalProjectId">
-                                        <el-input v-model="queryParams.originalProjectId" placeholder="请输入原项目ID(填报时的项目)" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="原项目编码(冗余)" prop="originalProjectCode">
-                                        <el-input v-model="queryParams.originalProjectCode" placeholder="请输入原项目编码(冗余)" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="原项目名称(冗余)" prop="originalProjectName">
-                                        <el-input v-model="queryParams.originalProjectName" placeholder="请输入原项目名称(冗余)" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="原项目工时(天)" prop="originalHours">
-                                        <el-input v-model="queryParams.originalHours" placeholder="请输入原项目工时(天)" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="修改后项目ID" prop="adjustedProjectId">
-                                        <el-input v-model="queryParams.adjustedProjectId" placeholder="请输入修改后项目ID" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="修改后项目编码(冗余)" prop="adjustedProjectCode">
-                                        <el-input v-model="queryParams.adjustedProjectCode" placeholder="请输入修改后项目编码(冗余)" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="修改后项目名称(冗余)" prop="adjustedProjectName">
-                                        <el-input v-model="queryParams.adjustedProjectName" placeholder="请输入修改后项目名称(冗余)" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="修改后工时(天)" prop="adjustedHours">
-                                        <el-input v-model="queryParams.adjustedHours" placeholder="请输入修改后工时(天)" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="生成行标识" prop="isGenerated">
-                                        <el-select v-model="queryParams.isGenerated" placeholder="请选择生成行标识" clearable >
-                                            <el-option v-for="dict in is_generated" :key="dict.value" :label="dict.label" :value="dict.value"/>
-                                        </el-select>
-                                    </el-form-item>
-                                    <el-form-item label="部门工作描述" prop="workDescription">
-                                        <el-input v-model="queryParams.workDescription" placeholder="请输入部门工作描述" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                        <el-form-item>
-                            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-card>
-            </div>
-        </transition>
-
-        <el-card shadow="never">
-            <template #header>
-                <el-row :gutter="10" class="mb8">
-                    <el-col :span="1.5">
-                        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/erp:timesheetSummaryDetail:add']">新增</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/erp:timesheetSummaryDetail:edit']">修改</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/erp:timesheetSummaryDetail:remove']">删除</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/erp:timesheetSummaryDetail:export']">导出</el-button>
-                    </el-col>
-                    <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
-                </el-row>
-            </template>
-
-            <el-table v-loading="loading" border :data="timesheetSummaryDetailList" @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="55" align="center" />
-                        <el-table-column label="汇总明细ID" align="center" prop="summaryDetailId" v-if="columns[0].visible"/>
-                        <el-table-column label="关联汇总主表ID" align="center" prop="summaryId" v-if="columns[2].visible"/>
-                        <el-table-column label="排序号" align="center" prop="sortOrder" v-if="columns[3].visible"/>
-                        <el-table-column label="员工用户ID" align="center" prop="staffUserId" v-if="columns[4].visible"/>
-                        <el-table-column label="员工姓名(冗余字段)" align="center" prop="staffName" v-if="columns[5].visible"/>
-                        <el-table-column label="工时类型" align="center" prop="isProject" v-if="columns[6].visible">
-                            <template #default="scope">
-                                    <dict-tag :options="is_project" :value="scope.row.isProject"/>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="原项目ID(填报时的项目)" align="center" prop="originalProjectId" v-if="columns[7].visible"/>
-                        <el-table-column label="原项目编码(冗余)" align="center" prop="originalProjectCode" v-if="columns[8].visible"/>
-                        <el-table-column label="原项目名称(冗余)" align="center" prop="originalProjectName" v-if="columns[9].visible"/>
-                        <el-table-column label="原项目工时(天)" align="center" prop="originalHours" v-if="columns[10].visible"/>
-                        <el-table-column label="修改后项目ID" align="center" prop="adjustedProjectId" v-if="columns[11].visible"/>
-                        <el-table-column label="修改后项目编码(冗余)" align="center" prop="adjustedProjectCode" v-if="columns[12].visible"/>
-                        <el-table-column label="修改后项目名称(冗余)" align="center" prop="adjustedProjectName" v-if="columns[13].visible"/>
-                        <el-table-column label="修改后工时(天)" align="center" prop="adjustedHours" v-if="columns[14].visible"/>
-                        <el-table-column label="生成行标识" align="center" prop="isGenerated" v-if="columns[15].visible">
-                            <template #default="scope">
-                                    <dict-tag :options="is_generated" :value="scope.row.isGenerated"/>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="部门工作描述" align="center" prop="workDescription" v-if="columns[16].visible"/>
-                        <el-table-column label="备注" align="center" prop="remark" v-if="columns[17].visible"/>
-                <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
-                    <template #default="scope">
-                        <el-tooltip content="修改" placement="top">
-                            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:timesheetSummaryDetail:edit']"></el-button>
-                        </el-tooltip>
-                        <el-tooltip content="删除" placement="top">
-                            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/erp:timesheetSummaryDetail:remove']"></el-button>
-                        </el-tooltip>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
+            <el-form-item label="月汇总编号" prop="summaryCode">
+              <el-input v-model="queryParams.summaryCode" placeholder="请输入月汇总编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <!--            <el-form-item label="排序号" prop="sortOrder">-->
+            <!--              <el-input v-model="queryParams.sortOrder" placeholder="请输入排序号" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="员工用户ID" prop="staffUserId">-->
+            <!--              <el-input v-model="queryParams.staffUserId" placeholder="请输入员工用户ID" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
+            <el-form-item label="员工姓名" prop="staffUserId">
+              <el-select v-model="queryParams.staffUserId" placeholder="请输入员工姓名" clearable filterable style="width: 200px">
+                <el-option v-for="user in userList" :key="user.userId" :label="user.nickName" :value="user.userId" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="工时类型" prop="isProject">
+              <el-select v-model="queryParams.isProject" placeholder="请选择工时类型" clearable>
+                <el-option v-for="dict in is_project" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <!--            <el-form-item label="原项目ID(填报时的项目)" prop="originalProjectId">-->
+            <!--              <el-input v-model="queryParams.originalProjectId" placeholder="请输入原项目ID(填报时的项目)" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="原项目编码" prop="originalProjectCode">-->
+            <!--              <el-input v-model="queryParams.originalProjectCode" placeholder="请输入原项目编码" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="原项目名称" prop="originalProjectName">-->
+            <!--              <el-input v-model="queryParams.originalProjectName" placeholder="请输入原项目名称" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="原项目工时(天)" prop="originalHours">-->
+            <!--              <el-input v-model="queryParams.originalHours" placeholder="请输入原项目工时(天)" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="修改后项目ID" prop="adjustedProjectId">-->
+            <!--              <el-input v-model="queryParams.adjustedProjectId" placeholder="请输入修改后项目ID" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="修改后项目编码" prop="adjustedProjectCode">-->
+            <!--              <el-input v-model="queryParams.adjustedProjectCode" placeholder="请输入修改后项目编码" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="修改后项目名称" prop="adjustedProjectName">-->
+            <!--              <el-input v-model="queryParams.adjustedProjectName" placeholder="请输入修改后项目名称" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="修改后工时(天)" prop="adjustedHours">-->
+            <!--              <el-input v-model="queryParams.adjustedHours" placeholder="请输入修改后工时(天)" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
+            <el-form-item label="生成行标识" prop="isGenerated">
+              <el-select v-model="queryParams.isGenerated" placeholder="请选择生成行标识" clearable>
+                <el-option v-for="dict in is_generated" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <!--            <el-form-item label="部门工作描述" prop="workDescription">-->
+            <!--              <el-input v-model="queryParams.workDescription" placeholder="请输入部门工作描述" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
         </el-card>
-        <!-- 添加或修改月汇总工时明细对话框 -->
-        <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-            <el-form ref="timesheetSummaryDetailFormRef" :model="form" :rules="rules" label-width="120px">
-                            <el-form-item label="关联汇总主表ID" prop="summaryId">
-                                <el-input v-model="form.summaryId" placeholder="请输入关联汇总主表ID" />
-                            </el-form-item>
-                            <el-form-item label="排序号" prop="sortOrder">
-                                <el-input v-model="form.sortOrder" placeholder="请输入排序号" />
-                            </el-form-item>
-                            <el-form-item label="员工用户ID" prop="staffUserId">
-                                <el-input v-model="form.staffUserId" placeholder="请输入员工用户ID" />
-                            </el-form-item>
-                            <el-form-item label="员工姓名(冗余字段)" prop="staffName">
-                                <el-input v-model="form.staffName" placeholder="请输入员工姓名(冗余字段)" />
-                            </el-form-item>
-                            <el-form-item label="工时类型" prop="isProject">
-                                <el-radio-group v-model="form.isProject">
-                                    <el-radio
-                                        v-for="dict in is_project"
-                                        :key="dict.value"
-                                        :value="dict.value"
-                                    >{{dict.label}}</el-radio>
-                                </el-radio-group>
-                            </el-form-item>
-                            <el-form-item label="原项目ID(填报时的项目)" prop="originalProjectId">
-                                <el-input v-model="form.originalProjectId" placeholder="请输入原项目ID(填报时的项目)" />
-                            </el-form-item>
-                            <el-form-item label="原项目编码(冗余)" prop="originalProjectCode">
-                                <el-input v-model="form.originalProjectCode" placeholder="请输入原项目编码(冗余)" />
-                            </el-form-item>
-                            <el-form-item label="原项目名称(冗余)" prop="originalProjectName">
-                                <el-input v-model="form.originalProjectName" placeholder="请输入原项目名称(冗余)" />
-                            </el-form-item>
-                            <el-form-item label="原项目工时(天)" prop="originalHours">
-                                <el-input v-model="form.originalHours" placeholder="请输入原项目工时(天)" />
-                            </el-form-item>
-                            <el-form-item label="修改后项目ID" prop="adjustedProjectId">
-                                <el-input v-model="form.adjustedProjectId" placeholder="请输入修改后项目ID" />
-                            </el-form-item>
-                            <el-form-item label="修改后项目编码(冗余)" prop="adjustedProjectCode">
-                                <el-input v-model="form.adjustedProjectCode" placeholder="请输入修改后项目编码(冗余)" />
-                            </el-form-item>
-                            <el-form-item label="修改后项目名称(冗余)" prop="adjustedProjectName">
-                                <el-input v-model="form.adjustedProjectName" placeholder="请输入修改后项目名称(冗余)" />
-                            </el-form-item>
-                            <el-form-item label="修改后工时(天)" prop="adjustedHours">
-                                <el-input v-model="form.adjustedHours" placeholder="请输入修改后工时(天)" />
-                            </el-form-item>
-                            <el-form-item label="生成行标识" prop="isGenerated">
-                                <el-radio-group v-model="form.isGenerated">
-                                    <el-radio
-                                        v-for="dict in is_generated"
-                                        :key="dict.value"
-                                        :value="dict.value"
-                                    >{{dict.label}}</el-radio>
-                                </el-radio-group>
-                            </el-form-item>
-                            <el-form-item label="部门工作描述" prop="workDescription">
-                                <el-input v-model="form.workDescription" type="textarea" placeholder="请输入内容" />
-                            </el-form-item>
-                            <el-form-item label="备注" prop="remark">
-                                <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                            </el-form-item>
-            </el-form>
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-                    <el-button @click="cancel">取 消</el-button>
-                </div>
-            </template>
-        </el-dialog>
-    </div>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <!--          <el-col :span="1.5">-->
+          <!--            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/erp:timesheetSummaryDetail:add']">新增</el-button>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="1.5">-->
+          <!--            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/erp:timesheetSummaryDetail:edit']"-->
+          <!--              >修改</el-button-->
+          <!--            >-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="1.5">-->
+          <!--            <el-button-->
+          <!--              type="danger"-->
+          <!--              plain-->
+          <!--              icon="Delete"-->
+          <!--              :disabled="multiple"-->
+          <!--              @click="handleDelete()"-->
+          <!--              v-hasPermi="['oa/erp:timesheetSummaryDetail:remove']"-->
+          <!--              >删除</el-button-->
+          <!--            >-->
+          <!--          </el-col>-->
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/erp:timesheetSummaryDetail:export']"
+              >导出</el-button
+            >
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="timesheetSummaryDetailList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="汇总明细ID" align="center" prop="summaryDetailId" v-if="columns[0].visible" />
+        <el-table-column label="月汇总编号" align="center" prop="summaryCode" v-if="columns[2].visible" />
+        <el-table-column label="排序号" align="center" prop="sortOrder" v-if="columns[3].visible" />
+        <el-table-column label="员工用户ID" align="center" prop="staffUserId" v-if="columns[4].visible" />
+        <el-table-column label="员工姓名" align="center" prop="staffName" v-if="columns[5].visible" />
+        <el-table-column label="工时类型" align="center" prop="isProject" v-if="columns[6].visible">
+          <template #default="scope">
+            <dict-tag :options="is_project" :value="scope.row.isProject" />
+          </template>
+        </el-table-column>
+        <el-table-column label="原项目ID(填报时的项目)" align="center" prop="originalProjectId" v-if="columns[7].visible" />
+        <el-table-column label="原项目编码" width="180" align="center" prop="originalProjectCode" v-if="columns[8].visible" />
+        <el-table-column label="原项目名称" align="center" prop="originalProjectName" v-if="columns[9].visible" />
+        <el-table-column label="原项目工时" align="center" prop="originalHours" v-if="columns[10].visible" />
+        <el-table-column label="修改后项目ID" align="center" prop="adjustedProjectId" v-if="columns[11].visible" />
+        <el-table-column label="修改后项目编码" width="180" align="center" prop="adjustedProjectCode" v-if="columns[12].visible" />
+        <el-table-column label="修改后项目名称" width="180" align="center" prop="adjustedProjectName" v-if="columns[13].visible" />
+        <el-table-column label="修改后工时" align="center" prop="adjustedHours" v-if="columns[14].visible" />
+        <el-table-column label="生成行标识" align="center" prop="isGenerated" v-if="columns[15].visible">
+          <template #default="scope">
+            <dict-tag :options="is_generated" :value="scope.row.isGenerated" />
+          </template>
+        </el-table-column>
+        <el-table-column label="部门工作描述" width="140" align="center" prop="workDescription" v-if="columns[16].visible" />
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[17].visible" />
+        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+          <!--          <template #default="scope">-->
+          <!--            <el-tooltip content="修改" placement="top">-->
+          <!--              <el-button-->
+          <!--                link-->
+          <!--                type="primary"-->
+          <!--                icon="Edit"-->
+          <!--                @click="handleUpdate(scope.row)"-->
+          <!--                v-hasPermi="['oa/erp:timesheetSummaryDetail:edit']"-->
+          <!--              ></el-button>-->
+          <!--            </el-tooltip>-->
+          <!--            <el-tooltip content="删除" placement="top">-->
+          <!--              <el-button-->
+          <!--                link-->
+          <!--                type="primary"-->
+          <!--                icon="Delete"-->
+          <!--                @click="handleDelete(scope.row)"-->
+          <!--                v-hasPermi="['oa/erp:timesheetSummaryDetail:remove']"-->
+          <!--              ></el-button>-->
+          <!--            </el-tooltip>-->
+          <!--          </template>-->
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改月汇总工时明细对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="timesheetSummaryDetailFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="月汇总编号" prop="summaryId">
+          <el-input v-model="form.summaryId" placeholder="请输入关联汇总主表ID" />
+        </el-form-item>
+        <el-form-item label="排序号" prop="sortOrder">
+          <el-input v-model="form.sortOrder" placeholder="请输入排序号" />
+        </el-form-item>
+        <el-form-item label="员工用户ID" prop="staffUserId">
+          <el-input v-model="form.staffUserId" placeholder="请输入员工用户ID" />
+        </el-form-item>
+        <el-form-item label="员工姓名" prop="staffName">
+          <el-input v-model="form.staffName" placeholder="请输入员工姓名" />
+        </el-form-item>
+        <el-form-item label="工时类型" prop="isProject">
+          <el-radio-group v-model="form.isProject">
+            <el-radio v-for="dict in is_project" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="原项目ID(填报时的项目)" prop="originalProjectId">
+          <el-input v-model="form.originalProjectId" placeholder="请输入原项目ID(填报时的项目)" />
+        </el-form-item>
+        <el-form-item label="原项目编码" prop="originalProjectCode">
+          <el-input v-model="form.originalProjectCode" placeholder="请输入原项目编码" />
+        </el-form-item>
+        <el-form-item label="原项目名称" prop="originalProjectName">
+          <el-input v-model="form.originalProjectName" placeholder="请输入原项目名称" />
+        </el-form-item>
+        <el-form-item label="原项目工时(天)" prop="originalHours">
+          <el-input v-model="form.originalHours" placeholder="请输入原项目工时(天)" />
+        </el-form-item>
+        <el-form-item label="修改后项目ID" prop="adjustedProjectId">
+          <el-input v-model="form.adjustedProjectId" placeholder="请输入修改后项目ID" />
+        </el-form-item>
+        <el-form-item label="修改后项目编码" prop="adjustedProjectCode">
+          <el-input v-model="form.adjustedProjectCode" placeholder="请输入修改后项目编码" />
+        </el-form-item>
+        <el-form-item label="修改后项目名称" prop="adjustedProjectName">
+          <el-input v-model="form.adjustedProjectName" placeholder="请输入修改后项目名称" />
+        </el-form-item>
+        <el-form-item label="修改后工时(天)" prop="adjustedHours">
+          <el-input v-model="form.adjustedHours" placeholder="请输入修改后工时(天)" />
+        </el-form-item>
+        <el-form-item label="生成行标识" prop="isGenerated">
+          <el-radio-group v-model="form.isGenerated">
+            <el-radio v-for="dict in is_generated" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="部门工作描述" prop="workDescription">
+          <el-input v-model="form.workDescription" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup name="TimesheetSummaryDetail" lang="ts">
-    import { listTimesheetSummaryDetail, getTimesheetSummaryDetail, delTimesheetSummaryDetail, addTimesheetSummaryDetail, updateTimesheetSummaryDetail } from '@/api/oa/erp/timesheetSummaryDetail';
-    import { TimesheetSummaryDetailVO, TimesheetSummaryDetailQuery, TimesheetSummaryDetailForm } from '@/api/oa/erp/timesheetSummaryDetail/types';
+import {
+  listTimesheetSummaryDetail,
+  getTimesheetSummaryDetail,
+  delTimesheetSummaryDetail,
+  addTimesheetSummaryDetail,
+  updateTimesheetSummaryDetail
+} from '@/api/oa/erp/timesheetSummaryDetail';
+import { TimesheetSummaryDetailVO, TimesheetSummaryDetailQuery, TimesheetSummaryDetailForm } from '@/api/oa/erp/timesheetSummaryDetail/types';
+import { getUserList } from '@/api/system/user';
+import { UserVO } from '@/api/system/user/types';
 
-    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-        const { is_project, is_generated } = toRefs<any>(proxy?.useDict('is_project', 'is_generated'));
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { is_project, is_generated } = toRefs<any>(proxy?.useDict('is_project', 'is_generated'));
 
-    const timesheetSummaryDetailList = ref<TimesheetSummaryDetailVO[]>([]);
-    const buttonLoading = ref(false);
-    const loading = ref(true);
-    const showSearch = ref(true);
-    const ids = ref<Array<string | number>>([]);
-    const single = ref(true);
-    const multiple = ref(true);
-    const total = ref(0);
+const timesheetSummaryDetailList = ref<TimesheetSummaryDetailVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const userList = ref<UserVO[]>([]);
 
-    const queryFormRef = ref<ElFormInstance>();
-    const timesheetSummaryDetailFormRef = ref<ElFormInstance>();
+const queryFormRef = ref<ElFormInstance>();
+const timesheetSummaryDetailFormRef = ref<ElFormInstance>();
 
-    const dialog = reactive<DialogOption>({
-        visible: false,
-        title: ''
-    });
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
 
-    // 列显隐信息
-    const columns = ref<FieldOption[]>([
-            { key: 0, label: `汇总明细ID`, visible: true },
-            { key: 1, label: `租户编号`, visible: true },
-            { key: 2, label: `关联汇总主表ID`, visible: true },
-            { key: 3, label: `排序号`, visible: true },
-            { key: 4, label: `员工用户ID`, visible: true },
-            { key: 5, label: `员工姓名(冗余字段)`, visible: true },
-            { key: 6, label: `工时类型`, visible: true },
-            { key: 7, label: `原项目ID(填报时的项目)`, visible: true },
-            { key: 8, label: `原项目编码(冗余)`, visible: true },
-            { key: 9, label: `原项目名称(冗余)`, visible: true },
-            { key: 10, label: `原项目工时(天)`, visible: true },
-            { key: 11, label: `修改后项目ID`, visible: true },
-            { key: 12, label: `修改后项目编码(冗余)`, visible: true },
-            { key: 13, label: `修改后项目名称(冗余)`, visible: true },
-            { key: 14, label: `修改后工时(天)`, visible: true },
-            { key: 15, label: `生成行标识`, visible: true },
-            { key: 16, label: `部门工作描述`, visible: true },
-            { key: 17, label: `备注`, visible: true },
-            { key: 18, label: `删除标志`, visible: true },
-            { key: 19, label: `创建部门`, visible: true },
-            { key: 20, label: `创建者`, visible: true },
-            { key: 21, label: `创建时间`, visible: true },
-            { key: 22, label: `更新者`, visible: true },
-            { key: 23, label: `更新时间`, visible: true },
-    ]);
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `汇总明细ID`, visible: false },
+  { key: 1, label: `租户编号`, visible: true },
+  { key: 2, label: `月汇总编号`, visible: true },
+  { key: 3, label: `排序号`, visible: false },
+  { key: 4, label: `员工用户ID`, visible: false },
+  { key: 5, label: `员工姓名(冗余字段)`, visible: true },
+  { key: 6, label: `工时类型`, visible: true },
+  { key: 7, label: `原项目ID(填报时的项目)`, visible: false },
+  { key: 8, label: `原项目编码(冗余)`, visible: true },
+  { key: 9, label: `原项目名称(冗余)`, visible: true },
+  { key: 10, label: `原项目工时(天)`, visible: true },
+  { key: 11, label: `修改后项目ID`, visible: false },
+  { key: 12, label: `修改后项目编码(冗余)`, visible: true },
+  { key: 13, label: `修改后项目名称(冗余)`, visible: true },
+  { key: 14, label: `修改后工时(天)`, visible: true },
+  { key: 15, label: `生成行标识`, visible: true },
+  { key: 16, label: `部门工作描述`, visible: true },
+  { key: 17, label: `备注`, visible: true },
+  { key: 18, label: `删除标志`, visible: true },
+  { key: 19, label: `创建部门`, visible: true },
+  { key: 20, label: `创建者`, visible: true },
+  { key: 21, label: `创建时间`, visible: true },
+  { key: 22, label: `更新者`, visible: true },
+  { key: 23, label: `更新时间`, visible: true }
+]);
 
-    const initFormData: TimesheetSummaryDetailForm = {
-                        summaryDetailId: undefined,
-                        summaryId: undefined,
-                        sortOrder: undefined,
-                        staffUserId: undefined,
-                        staffName: undefined,
-                        isProject: undefined,
-                        originalProjectId: undefined,
-                        originalProjectCode: undefined,
-                        originalProjectName: undefined,
-                        originalHours: undefined,
-                        adjustedProjectId: undefined,
-                        adjustedProjectCode: undefined,
-                        adjustedProjectName: undefined,
-                        adjustedHours: undefined,
-                        isGenerated: undefined,
-                        workDescription: undefined,
-                        remark: undefined,
+const initFormData: TimesheetSummaryDetailForm = {
+  summaryDetailId: undefined,
+  summaryId: undefined,
+  sortOrder: undefined,
+  staffUserId: undefined,
+  staffName: undefined,
+  isProject: undefined,
+  originalProjectId: undefined,
+  originalProjectCode: undefined,
+  originalProjectName: undefined,
+  originalHours: undefined,
+  adjustedProjectId: undefined,
+  adjustedProjectCode: undefined,
+  adjustedProjectName: undefined,
+  adjustedHours: undefined,
+  isGenerated: undefined,
+  workDescription: undefined,
+  remark: undefined
+};
+const data = reactive<PageData<TimesheetSummaryDetailForm, TimesheetSummaryDetailQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    summaryCode: undefined,
+    sortOrder: undefined,
+    staffUserId: undefined,
+    staffName: undefined,
+    isProject: undefined,
+    originalProjectId: undefined,
+    originalProjectCode: undefined,
+    originalProjectName: undefined,
+    originalHours: undefined,
+    adjustedProjectId: undefined,
+    adjustedProjectCode: undefined,
+    adjustedProjectName: undefined,
+    adjustedHours: undefined,
+    isGenerated: undefined,
+    workDescription: undefined,
+    params: {}
+  },
+  rules: {
+    summaryDetailId: [{ required: true, message: '汇总明细ID不能为空', trigger: 'blur' }],
+    summaryId: [{ required: true, message: '关联汇总主表ID不能为空', trigger: 'blur' }],
+    staffUserId: [{ required: true, message: '员工用户ID不能为空', trigger: 'blur' }],
+    isProject: [{ required: true, message: '工时类型不能为空', trigger: 'change' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询月汇总工时明细列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listTimesheetSummaryDetail(queryParams.value);
+  timesheetSummaryDetailList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  timesheetSummaryDetailFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: TimesheetSummaryDetailVO[]) => {
+  ids.value = selection.map((item) => item.summaryDetailId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加月汇总工时明细';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: TimesheetSummaryDetailVO) => {
+  reset();
+  const _summaryDetailId = row?.summaryDetailId || ids.value[0];
+  const res = await getTimesheetSummaryDetail(_summaryDetailId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改月汇总工时明细';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  timesheetSummaryDetailFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.summaryDetailId) {
+        await updateTimesheetSummaryDetail(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addTimesheetSummaryDetail(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
     }
-    const data = reactive<PageData<TimesheetSummaryDetailForm, TimesheetSummaryDetailQuery>>({
-        form: {...initFormData},
-        queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-                            summaryId: undefined,
-                            sortOrder: undefined,
-                            staffUserId: undefined,
-                            staffName: undefined,
-                            isProject: undefined,
-                            originalProjectId: undefined,
-                            originalProjectCode: undefined,
-                            originalProjectName: undefined,
-                            originalHours: undefined,
-                            adjustedProjectId: undefined,
-                            adjustedProjectCode: undefined,
-                            adjustedProjectName: undefined,
-                            adjustedHours: undefined,
-                            isGenerated: undefined,
-                            workDescription: undefined,
-            params: {
-            }
-        },
-        rules: {
-                            summaryDetailId: [
-                            { required: true, message: "汇总明细ID不能为空", trigger: "blur" }
-                        ],
-                            summaryId: [
-                            { required: true, message: "关联汇总主表ID不能为空", trigger: "blur" }
-                        ],
-                            staffUserId: [
-                            { required: true, message: "员工用户ID不能为空", trigger: "blur" }
-                        ],
-                            isProject: [
-                            { required: true, message: "工时类型不能为空", trigger: "change" }
-                        ],
-        }
-    });
+  });
+};
 
-    const { queryParams, form, rules } = toRefs(data);
+/** 删除按钮操作 */
+const handleDelete = async (row?: TimesheetSummaryDetailVO) => {
+  const _summaryDetailIds = row?.summaryDetailId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除月汇总工时明细编号为"' + _summaryDetailIds + '"的数据项？').finally(() => (loading.value = false));
+  await delTimesheetSummaryDetail(_summaryDetailIds);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
 
-    /** 查询月汇总工时明细列表 */
-    const getList = async () => {
-        loading.value = true;
-        const res = await listTimesheetSummaryDetail(queryParams.value);
-            timesheetSummaryDetailList.value = res.rows;
-        total.value = res.total;
-        loading.value = false;
-    }
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'oa/erp/timesheetSummaryDetail/export',
+    {
+      ...queryParams.value,
+      // 如果选中了数据，则只导出选中的数据
+      summaryDetailIds: ids.value.length > 0 ? ids.value.join(',') : undefined
+    },
+    `timesheetSummaryDetail_${new Date().getTime()}.xlsx`
+  );
+};
 
-    /** 取消按钮 */
-    const cancel = () => {
-        reset();
-        dialog.visible = false;
-    }
-
-    /** 表单重置 */
-    const reset = () => {
-        form.value = {...initFormData};
-            timesheetSummaryDetailFormRef.value?.resetFields();
-    }
-
-    /** 搜索按钮操作 */
-    const handleQuery = () => {
-        queryParams.value.pageNum = 1;
-        getList();
-    }
-
-    /** 重置按钮操作 */
-    const resetQuery = () => {
-        queryFormRef.value?.resetFields();
-        handleQuery();
-    }
-
-    /** 多选框选中数据 */
-    const handleSelectionChange = (selection: TimesheetSummaryDetailVO[]) => {
-        ids.value = selection.map(item => item.summaryDetailId);
-        single.value = selection.length != 1;
-        multiple.value = !selection.length;
-    }
-
-    /** 新增按钮操作 */
-    const handleAdd = () => {
-        reset();
-        dialog.visible = true;
-        dialog.title = "添加月汇总工时明细";
-    }
-
-    /** 修改按钮操作 */
-    const handleUpdate = async (row?: TimesheetSummaryDetailVO) => {
-        reset();
-        const _summaryDetailId = row?.summaryDetailId || ids.value[0]
-        const res = await getTimesheetSummaryDetail(_summaryDetailId);
-        Object.assign(form.value, res.data);
-        dialog.visible = true;
-        dialog.title = "修改月汇总工时明细";
-    }
-
-    /** 提交按钮 */
-    const submitForm = () => {
-            timesheetSummaryDetailFormRef.value?.validate(async (valid: boolean) => {
-            if (valid) {
-                buttonLoading.value = true;
-                if (form.value.summaryDetailId) {
-                    await updateTimesheetSummaryDetail(form.value).finally(() =>  buttonLoading.value = false);
-                } else {
-                    await addTimesheetSummaryDetail(form.value).finally(() =>  buttonLoading.value = false);
-                }
-                proxy?.$modal.msgSuccess("操作成功");
-                dialog.visible = false;
-                await getList();
-            }
-        });
-    }
-
-    /** 删除按钮操作 */
-    const handleDelete = async (row?: TimesheetSummaryDetailVO) => {
-        const _summaryDetailIds = row?.summaryDetailId || ids.value;
-        await proxy?.$modal.confirm('是否确认删除月汇总工时明细编号为"' + _summaryDetailIds + '"的数据项？').finally(() => loading.value = false);
-        await delTimesheetSummaryDetail(_summaryDetailIds);
-        proxy?.$modal.msgSuccess("删除成功");
-        await getList();
-    }
-
-    /** 导出按钮操作 */
-    const handleExport = () => {
-        proxy?.download('oa/erp/timesheetSummaryDetail/export', {
-            ...queryParams.value
-        }, `timesheetSummaryDetail_${new Date().getTime()}.xlsx`)
-    }
-
-    onMounted(() => {
-        getList();
-    });
+onMounted(async () => {
+  const userRes = await getUserList({} as any);
+  userList.value = userRes.data;
+  getList();
+});
 </script>