From 56eeb2671661ac45fc8d3129951dad96a5bd1f9b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 15:24:16 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-1.2.0.1
---
src/views/EmploymentManage/components/ManualCheckManageDialog.vue | 70 +++-------------------------------
1 files changed, 7 insertions(+), 63 deletions(-)
diff --git a/src/views/EmploymentManage/components/ManualCheckManageDialog.vue b/src/views/EmploymentManage/components/ManualCheckManageDialog.vue
index dfc1918..ecf8d60 100644
--- a/src/views/EmploymentManage/components/ManualCheckManageDialog.vue
+++ b/src/views/EmploymentManage/components/ManualCheckManageDialog.vue
@@ -1,7 +1,7 @@
<template>
- <ProDialog :title="title" v-model="visible" destroy-on-close draggable>
+ <ProDialog title="楠屾敹" v-model="visible" destroy-on-close draggable>
<ProDialogTableWrapper :height="400">
- <ProTableV2 v-bind="proTableProps" :columns="columns" :operationBtns="operationBtns">
+ <ProTableV2 v-bind="proTableProps" :columns="columns" :showOperationColumn="false">
</ProTableV2>
</ProDialogTableWrapper>
<template #footer>
@@ -32,12 +32,10 @@
type Form = {
id: string;
- isDetail: boolean;
};
const visible = defineModel({ type: Boolean });
const form = defineModel<Form>('form');
-const title = computed(() => (form.value.isDetail ? '璇︽儏' : '楠屾敹'));
const emit = defineEmits<{
(e: 'onCancel'): void;
}>();
@@ -52,12 +50,12 @@
},
{
id: '2',
- enCode: 'createdTime',
+ enCode: 'checkInTime',
name: '绛惧埌鏃堕棿',
},
{
id: '3',
- enCode: 'files',
+ enCode: 'checkOutTime',
name: '绛惧嚭鏃堕棿',
},
{
@@ -67,55 +65,8 @@
},
{
id: '5',
- enCode: 'checkReceiveTime',
+ enCode: 'operator',
name: '鎿嶄綔浜�',
- },
-]);
-
-const operationBtns = defineOperationBtns([
- {
- data: {
- enCode: 'checkReceiveBtn',
- name: '楠屾敹閫氳繃',
- },
- emits: {
- onClick: (role) => checkReceiveTask(role, EnumTaskUserSubmitCheckReceiveStatus.Success),
- },
- extraProps: {
- hide: (row: API.GetCheckReceiveTaskUserSubmitsQueryResultItem) =>
- !(
- row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit ||
- row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
- ) || form.value.isDetail,
- },
- },
- {
- data: {
- enCode: 'checkReceiveBtn',
- name: '楠屾敹鏈�氳繃',
- },
- emits: {
- onClick: (role) => checkReceiveTask(role, EnumTaskUserSubmitCheckReceiveStatus.Fail),
- },
- extraProps: {
- hide: (row: API.GetCheckReceiveTaskUserSubmitsQueryResultItem) =>
- !(
- row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit ||
- row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
- ) || form.value.isDetail,
- },
- },
- {
- data: {
- enCode: 'downloadBtn',
- name: '涓嬭浇',
- },
- emits: {
- onClick: (role) => handleDownload(role),
- },
- extraProps: {
- hide: (row: API.GetCheckReceiveTaskUserSubmitsQueryResultItem) => row.files?.length === 0,
- },
},
]);
@@ -162,17 +113,10 @@
},
queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskUserSubmits'],
columnsRenderProps: {
- createdTime: { type: 'date' },
- checkReceiveTime: { type: 'date' },
+ checkInTime: { type: 'date' },
+ checkOutTime: { type: 'date' },
date: { type: 'date', format: 'YYYY-MM-DD' },
checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskUserSubmitCheckReceiveStatusText },
- files: {
- type: 'url',
- //@ts-ignore
- formatter: (row: API.GetCheckReceiveTaskUserSubmitsQueryResultItem) =>
- row.files?.length > 0 && (row.files ?? []).map((x) => setOSSLink(x)),
- showDownloadBtn: false,
- },
},
}
);
--
Gitblit v1.9.1