wupengfei
2025-11-10 90d2baa0f9ce23436659123d84bbb5fd00a276a1
fix: bug
4个文件已修改
43 ■■■■■ 已修改文件
.eslintrc-auto-import.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
auto-imports.d.ts 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/constants/task.ts 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/EmploymentManage/components/CheckManageDialog.vue 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.eslintrc-auto-import.json
@@ -110,6 +110,7 @@
    "EnumTaskUserSignContractStatusText": true,
    "EnumTaskUserSignContractStatusTextForFilter": true,
    "EnumTaskUserSubmitCheckHistoryType": true,
    "EnumTaskUserSubmitCheckHistoryTypeText": true,
    "EnumTaskUserSubmitCheckReceiveStatus": true,
    "EnumTaskUserSubmitCheckReceiveStatusText": true,
    "EnumUserBankCardAccess": true,
auto-imports.d.ts
@@ -115,6 +115,7 @@
  const EnumTaskUserSignContractStatusText: typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusText']
  const EnumTaskUserSignContractStatusTextForFilter: typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusTextForFilter']
  const EnumTaskUserSubmitCheckHistoryType: typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckHistoryType']
  const EnumTaskUserSubmitCheckHistoryTypeText: typeof import('./src/constants/task')['EnumTaskUserSubmitCheckHistoryTypeText']
  const EnumTaskUserSubmitCheckReceiveStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckReceiveStatus']
  const EnumTaskUserSubmitCheckReceiveStatusText: typeof import('./src/constants/task')['EnumTaskUserSubmitCheckReceiveStatusText']
  const EnumUserBankCardAccess: typeof import('./src/constants/apiEnum')['EnumUserBankCardAccess']
@@ -441,6 +442,7 @@
    readonly EnumTaskUserSignContractStatusText: UnwrapRef<typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusText']>
    readonly EnumTaskUserSignContractStatusTextForFilter: UnwrapRef<typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusTextForFilter']>
    readonly EnumTaskUserSubmitCheckHistoryType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckHistoryType']>
    readonly EnumTaskUserSubmitCheckHistoryTypeText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskUserSubmitCheckHistoryTypeText']>
    readonly EnumTaskUserSubmitCheckReceiveStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckReceiveStatus']>
    readonly EnumTaskUserSubmitCheckReceiveStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskUserSubmitCheckReceiveStatusText']>
    readonly EnumUserBankCardAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserBankCardAccess']>
src/constants/task.ts
@@ -182,3 +182,9 @@
  [EnumTaskSettlementAuditStatus.Pass]: '审核通过',
  [EnumTaskSettlementAuditStatus.Fail]: '驳回',
};
export const EnumTaskUserSubmitCheckHistoryTypeText = {
  [EnumTaskUserSubmitCheckHistoryType.CheckIn]: '签到',
  [EnumTaskUserSubmitCheckHistoryType.CheckOut]: '签出',
  [EnumTaskUserSubmitCheckHistoryType.UnCheckIn]: '未到岗',
};
src/views/EmploymentManage/components/CheckManageDialog.vue
@@ -79,6 +79,11 @@
    enCode: 'checkReceiveTime',
    name: '验收时间',
  },
  {
    id: '6',
    enCode: 'userOperator',
    name: '验收人',
  },
]);
const checkInColumns = defineColumns([
@@ -89,21 +94,36 @@
  },
  {
    id: '2',
    enCode: 'userCheckInTime',
    name: '用户签到时间',
  },
  {
    id: '3',
    enCode: 'userCheckOutTime',
    name: '用户签出时间',
  },
  {
    id: '4',
    enCode: 'userCheckHistoryType',
    name: '用户验收状态',
  },
  {
    id: '5',
    enCode: 'checkInTime',
    name: '签到时间',
  },
  {
    id: '3',
    id: '6',
    enCode: 'checkOutTime',
    name: '签出时间',
  },
  {
    id: '4',
    enCode: 'checkOutStatus',
    id: '7',
    enCode: 'checkHistoryType',
    name: '验收状态',
  },
  {
    id: '5',
    id: '8',
    enCode: 'operator',
    name: '操作人',
  },
@@ -215,8 +235,14 @@
    columnsRenderProps: {
      createdTime: { type: 'date' },
      checkReceiveTime: { type: 'date' },
      userCheckInTime: { type: 'date' },
      userCheckOutTime: { type: 'date' },
      checkInTime: { type: 'date' },
      checkOutTime: { type: 'date' },
      date: { type: 'date', format: 'YYYY-MM-DD' },
      checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskUserSubmitCheckReceiveStatusText },
      userCheckHistoryType: { type: 'enum', valueEnum: EnumTaskUserSubmitCheckHistoryTypeText },
      checkHistoryType: { type: 'enum', valueEnum: EnumTaskUserSubmitCheckHistoryTypeText },
      files: {
        type: 'url',
        //@ts-ignore