From 0cb324779727155effffcbca13c5b11409c8211c Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 07 十一月 2025 11:06:40 +0800
Subject: [PATCH] feat: 1.3.0.1
---
src/views/EmploymentManage/components/CheckManageDialog.vue | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/src/views/EmploymentManage/components/CheckManageDialog.vue b/src/views/EmploymentManage/components/CheckManageDialog.vue
index a2328e6..9c64d3d 100644
--- a/src/views/EmploymentManage/components/CheckManageDialog.vue
+++ b/src/views/EmploymentManage/components/CheckManageDialog.vue
@@ -1,5 +1,9 @@
<template>
<ProDialog :title="title" v-model="visible" destroy-on-close draggable>
+ <ProTabs v-model="form.tabType" hasBorder v-if="form.checkReceiveMethods?.length > 1">
+ <ProTabPane lazy label="绛惧埌璁板綍" name="signRecord"></ProTabPane>
+ <ProTabPane lazy label="鎻愪氦璁板綍" name="submitRecord"></ProTabPane>
+ </ProTabs>
<ProDialogTableWrapper :height="400">
<ProTableV2 v-bind="proTableProps" :columns="columns" :operationBtns="operationBtns">
</ProTableV2>
@@ -20,6 +24,8 @@
defineColumns,
defineOperationBtns,
useTable,
+ ProTabs,
+ ProTabPane,
} from '@bole-core/components';
import * as taskCheckReceiveServices from '@/services/api/taskCheckReceive';
import { setOSSLink } from '@/utils';
@@ -27,12 +33,14 @@
import { useGlobalEventContext } from '@/hooks';
defineOptions({
- name: 'EnterpriseConsumptionDetailDialog',
+ name: 'CheckManageDialog',
});
type Form = {
id: string;
isDetail: boolean;
+ tabType: string;
+ checkReceiveMethods: EnumTaskCheckReceiveMethod[];
};
const visible = defineModel({ type: Boolean });
@@ -44,7 +52,7 @@
const eventContext = useGlobalEventContext();
-const columns = defineColumns([
+const submitColumns = defineColumns([
{
id: '1',
enCode: 'date',
@@ -72,6 +80,48 @@
},
]);
+const checkInColumns = defineColumns([
+ {
+ id: '1',
+ enCode: 'date',
+ name: '浠诲姟鏃ユ湡',
+ },
+ {
+ id: '2',
+ enCode: 'checkInTime',
+ name: '绛惧埌鏃堕棿',
+ },
+ {
+ id: '3',
+ enCode: 'checkOutTime',
+ name: '绛惧嚭鏃堕棿',
+ },
+ {
+ id: '4',
+ enCode: 'checkOutStatus',
+ name: '楠屾敹鐘舵��',
+ },
+ {
+ id: '5',
+ enCode: 'operator',
+ name: '鎿嶄綔浜�',
+ },
+]);
+
+const columns = computed(() => {
+ if (form.value.checkReceiveMethods.every((x) => x == EnumTaskCheckReceiveMethod.CheckIn)) {
+ return checkInColumns;
+ } else if (form.value.checkReceiveMethods.every((x) => x == EnumTaskCheckReceiveMethod.Submit)) {
+ return submitColumns;
+ } else {
+ if (form.value.tabType === 'signRecord') {
+ return checkInColumns;
+ } else {
+ return submitColumns;
+ }
+ }
+});
+
const operationBtns = defineOperationBtns([
{
data: {
@@ -83,10 +133,12 @@
},
extraProps: {
hide: (row: API.GetCheckReceiveTaskUserSubmitsQueryResultItem) =>
+ form.value.isDetail ||
+ form.value.tabType === 'signRecord' ||
!(
row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit ||
row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
- ) || form.value.isDetail,
+ ),
},
},
{
@@ -99,10 +151,12 @@
},
extraProps: {
hide: (row: API.GetCheckReceiveTaskUserSubmitsQueryResultItem) =>
+ form.value.isDetail ||
+ form.value.tabType === 'signRecord' ||
!(
row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit ||
row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
- ) || form.value.isDetail,
+ ),
},
},
{
@@ -181,7 +235,7 @@
if (row.files?.length > 0) {
downloadWithZip(
row.files.map((x) => ({
- data: `${setOSSLink(x)}?${new Date().getTime()}`,
+ data: `${setOSSLink(x)}`,
})),
'楠屾敹鐓х墖'
);
--
Gitblit v1.9.1