From 3ae270ee2e6518522dce3153f483b8c5b3d3428d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 28 十一月 2025 16:42:05 +0800
Subject: [PATCH] fix: bug
---
src/views/EmploymentManage/CheckReceiveTaskDetail.vue | 67 +++++++++++++++------------------
1 files changed, 31 insertions(+), 36 deletions(-)
diff --git a/src/views/EmploymentManage/CheckReceiveTaskDetail.vue b/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
index 33f4f1e..dba13ae 100644
--- a/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
+++ b/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
@@ -16,11 +16,7 @@
</ProFormColItem>
<ProFormColItem :span="8">
<ProFormItemV2 label="鏈嶅姟璐归噾棰�:">
- {{
- taskInfo.billingMethod === EnumBillingMethod.Face
- ? EnumBillingMethodText[taskInfo.billingMethod]
- : `${taskInfo.serviceFee}${EnumBillingMethodUnitText[taskInfo.billingMethod]}`
- }}
+ {{ OrderUtils.getServiceFeeText(taskInfo.serviceFee, taskInfo.billingMethod) }}
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -44,11 +40,7 @@
</ProForm>
</el-card>
- <ProTableV2
- v-bind="proTableProps"
- :columns="CheckReceiveTaskDetailColumns"
- :operationBtns="operationBtns"
- >
+ <ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
</ProTableV2>
</AppContainer>
<CheckManageDialog v-bind="dialogProps" />
@@ -63,18 +55,15 @@
AppContainer,
useTable,
useFormDialog,
- defineOperationBtns,
ProForm,
ProFormCol,
ProFormColItem,
ProFormItemV2,
- ProTableQueryFilterBar,
} from '@bole-core/components';
import * as taskCheckReceiveServices from '@/services/api/taskCheckReceive';
import * as taskServices from '@/services/api/task';
import { useQuery } from '@tanstack/vue-query';
-import { CheckReceiveTaskDetailColumns } from './constants';
-import { EnumBillingMethodUnitText, EnumBillingMethod, EnumBillingMethodText } from '@/constants';
+import { hiddenIDNumberForEnd4, OrderUtils } from '@/utils';
import dayjs from 'dayjs';
import CheckManageDialog from './components/CheckManageDialog.vue';
import ManualCheckManageDialog from './components/ManualCheckManageDialog.vue';
@@ -83,31 +72,30 @@
name: 'CheckReceiveTaskDetail',
});
-const operationBtns = defineOperationBtns([
- {
- data: {
- enCode: 'exportBtn',
- name: '楠屾敹',
- },
- emits: {
- onClick: (role) => openDialog(role),
- },
- // extraProps: {
- // hide: (row: API.GetCheckReceiveTaskQueryResultItem) =>
- // row.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed ||
- // state.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn,
- // },
- },
- {
- data: {
- enCode: 'detailBtn',
- name: '璇︽儏',
- },
+const operationBtnMap: Record<string, OperationBtnType> = {
+ detailBtn: {
emits: {
onClick: (role) => openDialog(role, true),
},
},
-]);
+ acceptanceBtn: {
+ emits: {
+ onClick: (role) => openDialog(role),
+ },
+ extraProps: {
+ hide: (row: API.GetCheckReceiveTaskQueryResultItem) =>
+ !(
+ (row.checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive ||
+ row.checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitSubmit) &&
+ row.checkReceiveMethods.includes(EnumTaskCheckReceiveMethod.Submit)
+ ),
+ },
+ },
+};
+
+const { column, operationBtns } = useAccess({
+ operationBtnMap,
+});
const route = useRoute();
const id = (route.params.id as string) ?? '';
@@ -175,6 +163,11 @@
gender: { type: 'enum', valueEnum: EnumUserGenderTextForPerson },
lastSubmitTime: { type: 'date' },
checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskCheckReceiveStatusText },
+ identity: {
+ formatter: (row: API.GetCheckReceiveTaskQueryResultItem) => {
+ return hiddenIDNumberForEnd4(row.identity);
+ },
+ },
},
}
);
@@ -187,7 +180,9 @@
// } else {
handleEdit({
id: row.id,
- tabType: 'signRecord',
+ tabType: state.checkReceiveMethods.includes(EnumTaskCheckReceiveMethod.CheckIn)
+ ? 'signRecord'
+ : '',
checkReceiveMethods: state.checkReceiveMethods,
isDetail,
});
--
Gitblit v1.9.1