From 852c9a7af36bcffb0c37cea6224c5391b5eac398 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 23 十月 2025 22:30:37 +0800
Subject: [PATCH] fix: bug
---
src/views/EmploymentManage/CheckReceiveTaskDetail.vue | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/src/views/EmploymentManage/CheckReceiveTaskDetail.vue b/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
index a16ce8b..ad67149 100644
--- a/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
+++ b/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
@@ -1,5 +1,5 @@
<template>
- <LoadingLayout :loading="state.loading">
+ <LoadingLayout v-loading="state.loading">
<AppContainer>
<el-card class="query-filter-bar-wrapper" shadow="never">
<ProForm :model="taskInfo" is-read>
@@ -16,7 +16,11 @@
</ProFormColItem>
<ProFormColItem :span="8">
<ProFormItemV2 label="鏈嶅姟璐归噾棰�:">
- {{ `${taskInfo.serviceFee}${EnumBillingMethodUnitText[taskInfo.billingMethod]}` }}
+ {{
+ taskInfo.billingMethod === EnumBillingMethod.Face
+ ? EnumBillingMethodText[taskInfo.billingMethod]
+ : `${taskInfo.serviceFee}${EnumBillingMethodUnitText[taskInfo.billingMethod]}`
+ }}
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -48,6 +52,7 @@
</ProTableV2>
</AppContainer>
<CheckManageDialog v-bind="dialogProps" />
+ <ManualCheckManageDialog v-bind="dialogManualProps" />
</LoadingLayout>
</template>
@@ -69,9 +74,10 @@
import * as taskServices from '@/services/api/task';
import { useQuery } from '@tanstack/vue-query';
import { CheckReceiveTaskDetailColumns } from './constants';
-import { EnumBillingMethodUnitText } from '@/constants';
+import { EnumBillingMethodUnitText, EnumBillingMethod, EnumBillingMethodText } from '@/constants';
import dayjs from 'dayjs';
import CheckManageDialog from './components/CheckManageDialog.vue';
+import ManualCheckManageDialog from './components/ManualCheckManageDialog.vue';
defineOptions({
name: 'CheckReceiveTaskDetail',
@@ -88,7 +94,8 @@
},
extraProps: {
hide: (row: API.GetCheckReceiveTaskQueryResultItem) =>
- row.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed,
+ row.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed ||
+ state.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn,
},
},
{
@@ -120,6 +127,7 @@
const BaseState = {
loading: true,
+ checkReceiveMethod: '' as any as EnumTaskCheckReceiveMethod,
};
const state = reactive({ ...BaseState });
@@ -155,6 +163,7 @@
let res = await taskCheckReceiveServices.getCheckReceiveTask(params, {
showLoading: !state.loading,
});
+ state.checkReceiveMethod = res.objectData?.checkReceiveMethod;
return res;
} catch (error) {}
},
@@ -171,10 +180,16 @@
);
function openDialog(row: API.GetCheckReceiveTaskQueryResultItem, isDetail = false) {
- handleEdit({
- id: row.id,
- isDetail,
- });
+ if (state.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn) {
+ handleManualEdit({
+ id: row.id,
+ });
+ } else {
+ handleEdit({
+ id: row.id,
+ isDetail,
+ });
+ }
}
const { dialogProps, handleEdit } = useFormDialog({
@@ -183,4 +198,10 @@
isDetail: false,
},
});
+
+const { dialogProps: dialogManualProps, handleEdit: handleManualEdit } = useFormDialog({
+ defaultFormParams: {
+ id: '',
+ },
+});
</script>
--
Gitblit v1.9.1