From 9f9830d466ed12e2a987283cbdc50ce8198b36e5 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 10 十一月 2025 09:41:54 +0800
Subject: [PATCH] fix: bug
---
src/views/EmploymentManage/CheckReceiveTaskDetail.vue | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/src/views/EmploymentManage/CheckReceiveTaskDetail.vue b/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
index ad67149..ff3612f 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>
@@ -73,6 +69,7 @@
import * as taskCheckReceiveServices from '@/services/api/taskCheckReceive';
import * as taskServices from '@/services/api/task';
import { useQuery } from '@tanstack/vue-query';
+import { OrderUtils } from '@/utils';
import { CheckReceiveTaskDetailColumns } from './constants';
import { EnumBillingMethodUnitText, EnumBillingMethod, EnumBillingMethodText } from '@/constants';
import dayjs from 'dayjs';
@@ -94,8 +91,10 @@
},
extraProps: {
hide: (row: API.GetCheckReceiveTaskQueryResultItem) =>
- row.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed ||
- state.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn,
+ !(
+ row.checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive &&
+ row.checkReceiveMethods.includes(EnumTaskCheckReceiveMethod.CheckIn)
+ ),
},
},
{
@@ -127,7 +126,7 @@
const BaseState = {
loading: true,
- checkReceiveMethod: '' as any as EnumTaskCheckReceiveMethod,
+ checkReceiveMethods: [] as any as EnumTaskCheckReceiveMethod[],
};
const state = reactive({ ...BaseState });
@@ -163,7 +162,7 @@
let res = await taskCheckReceiveServices.getCheckReceiveTask(params, {
showLoading: !state.loading,
});
- state.checkReceiveMethod = res.objectData?.checkReceiveMethod;
+ state.checkReceiveMethods = res.objectData?.checkReceiveMethods;
return res;
} catch (error) {}
},
@@ -180,21 +179,25 @@
);
function openDialog(row: API.GetCheckReceiveTaskQueryResultItem, isDetail = false) {
- if (state.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn) {
- handleManualEdit({
- id: row.id,
- });
- } else {
- handleEdit({
- id: row.id,
- isDetail,
- });
- }
+ // if (state.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn) {
+ // handleManualEdit({
+ // id: row.id,
+ // });
+ // } else {
+ handleEdit({
+ id: row.id,
+ tabType: 'signRecord',
+ checkReceiveMethods: state.checkReceiveMethods,
+ isDetail,
+ });
+ // }
}
const { dialogProps, handleEdit } = useFormDialog({
defaultFormParams: {
id: '',
+ tabType: '',
+ checkReceiveMethods: [] as any as EnumTaskCheckReceiveMethod[],
isDetail: false,
},
});
--
Gitblit v1.9.1