From 8550c7090368487be0a9f13ff5ff955b1ae9d028 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 11 十一月 2025 16:45:11 +0800
Subject: [PATCH] Merge branch 'dev-1.3.0.2' of http://120.26.58.240:8888/r/flexJobUndertake into dev-1.3.0.2
---
src/views/EmploymentManage/CheckReceiveTaskDetail.vue | 61 +++++++++++++++---------------
1 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/src/views/EmploymentManage/CheckReceiveTaskDetail.vue b/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
index ad67149..195a931 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>
@@ -74,6 +70,7 @@
import * as taskServices from '@/services/api/task';
import { useQuery } from '@tanstack/vue-query';
import { CheckReceiveTaskDetailColumns } from './constants';
+import { OrderUtils } from '@/utils';
import { EnumBillingMethodUnitText, EnumBillingMethod, EnumBillingMethodText } from '@/constants';
import dayjs from 'dayjs';
import CheckManageDialog from './components/CheckManageDialog.vue';
@@ -84,20 +81,20 @@
});
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: 'exportBtn',
+ // name: '楠屾敹',
+ // },
+ // emits: {
+ // onClick: (role) => openDialog(role),
+ // },
+ // extraProps: {
+ // hide: (row: API.GetCheckReceiveTaskQueryResultItem) =>
+ // row.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed ||
+ // state.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn,
+ // },
+ // },
{
data: {
enCode: 'detailBtn',
@@ -127,7 +124,7 @@
const BaseState = {
loading: true,
- checkReceiveMethod: '' as any as EnumTaskCheckReceiveMethod,
+ checkReceiveMethods: [] as any as EnumTaskCheckReceiveMethod[],
};
const state = reactive({ ...BaseState });
@@ -163,7 +160,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 +177,23 @@
);
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,
+ checkReceiveMethods: state.checkReceiveMethods,
+ isDetail,
+ });
}
const { dialogProps, handleEdit } = useFormDialog({
defaultFormParams: {
id: '',
+ checkReceiveMethods: [] as any as EnumTaskCheckReceiveMethod[],
isDetail: false,
},
});
--
Gitblit v1.9.1