From 8588e0fd3ad5ba29662c9339a4049c285b21f159 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 10 十一月 2025 10:22:01 +0800
Subject: [PATCH] fix: bug
---
src/views/EmploymentManage/CheckReceiveTaskDetail.vue | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/views/EmploymentManage/CheckReceiveTaskDetail.vue b/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
index a16ce8b..ff3612f 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,7 @@
</ProFormColItem>
<ProFormColItem :span="8">
<ProFormItemV2 label="鏈嶅姟璐归噾棰�:">
- {{ `${taskInfo.serviceFee}${EnumBillingMethodUnitText[taskInfo.billingMethod]}` }}
+ {{ OrderUtils.getServiceFeeText(taskInfo.serviceFee, taskInfo.billingMethod) }}
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -48,6 +48,7 @@
</ProTableV2>
</AppContainer>
<CheckManageDialog v-bind="dialogProps" />
+ <ManualCheckManageDialog v-bind="dialogManualProps" />
</LoadingLayout>
</template>
@@ -68,10 +69,12 @@
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 } 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 +91,10 @@
},
extraProps: {
hide: (row: API.GetCheckReceiveTaskQueryResultItem) =>
- row.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed,
+ !(
+ row.checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive &&
+ row.checkReceiveMethods.includes(EnumTaskCheckReceiveMethod.CheckIn)
+ ),
},
},
{
@@ -120,6 +126,7 @@
const BaseState = {
loading: true,
+ checkReceiveMethods: [] as any as EnumTaskCheckReceiveMethod[],
};
const state = reactive({ ...BaseState });
@@ -155,6 +162,7 @@
let res = await taskCheckReceiveServices.getCheckReceiveTask(params, {
showLoading: !state.loading,
});
+ state.checkReceiveMethods = res.objectData?.checkReceiveMethods;
return res;
} catch (error) {}
},
@@ -171,16 +179,32 @@
);
function openDialog(row: API.GetCheckReceiveTaskQueryResultItem, isDetail = false) {
+ // 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,
},
});
+
+const { dialogProps: dialogManualProps, handleEdit: handleManualEdit } = useFormDialog({
+ defaultFormParams: {
+ id: '',
+ },
+});
</script>
--
Gitblit v1.9.1