From 56eeb2671661ac45fc8d3129951dad96a5bd1f9b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 15:24:16 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-1.2.0.1
---
src/views/ServiceChargeManage/constants/columns.ts | 4
src/views/EmploymentManage/constants/columns.ts | 2
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 5 +
src/constants/task.ts | 6 +
.eslintrc-auto-import.json | 1
src/views/ServiceChargeManage/ServiceChargeManage.vue | 24 +---
src/views/EmploymentManage/components/ManualCheckManageDialog.vue | 70 +------------
/dev/null | 97 -------------------
src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue | 41 ++++++-
auto-imports.d.ts | 2
src/views/EmploymentManage/CheckReceiveTaskDetail.vue | 8 +
src/views/EmploymentManage/CheckManage.vue | 1
src/views/FinanceManage/EnterpriseBalanceManageDetail.vue | 10 +
13 files changed, 76 insertions(+), 195 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index be2d534..1561888 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -81,6 +81,7 @@
"EnumTaskReleaseStatusText": true,
"EnumTaskReleaseStatusTextForTip": true,
"EnumTaskSettlementAuditStatus": true,
+ "EnumTaskSettlementAuditStatusText": true,
"EnumTaskSettlementOrderStatus": true,
"EnumTaskSettlementOrderStatusText": true,
"EnumTaskSettlementStatus": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 8c27408..94cab53 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -86,6 +86,7 @@
const EnumTaskReleaseStatusText: typeof import('./src/constants/task')['EnumTaskReleaseStatusText']
const EnumTaskReleaseStatusTextForTip: typeof import('./src/constants/task')['EnumTaskReleaseStatusTextForTip']
const EnumTaskSettlementAuditStatus: typeof import('./src/constants/apiEnum')['EnumTaskSettlementAuditStatus']
+ const EnumTaskSettlementAuditStatusText: typeof import('./src/constants/task')['EnumTaskSettlementAuditStatusText']
const EnumTaskSettlementOrderStatus: typeof import('./src/constants/apiEnum')['EnumTaskSettlementOrderStatus']
const EnumTaskSettlementOrderStatusText: typeof import('./src/constants/task')['EnumTaskSettlementOrderStatusText']
const EnumTaskSettlementStatus: typeof import('./src/constants/apiEnum')['EnumTaskSettlementStatus']
@@ -396,6 +397,7 @@
readonly EnumTaskReleaseStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskReleaseStatusText']>
readonly EnumTaskReleaseStatusTextForTip: UnwrapRef<typeof import('./src/constants/task')['EnumTaskReleaseStatusTextForTip']>
readonly EnumTaskSettlementAuditStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskSettlementAuditStatus']>
+ readonly EnumTaskSettlementAuditStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskSettlementAuditStatusText']>
readonly EnumTaskSettlementOrderStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskSettlementOrderStatus']>
readonly EnumTaskSettlementOrderStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskSettlementOrderStatusText']>
readonly EnumTaskSettlementStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskSettlementStatus']>
diff --git a/src/constants/task.ts b/src/constants/task.ts
index 02d025e..446a9b5 100644
--- a/src/constants/task.ts
+++ b/src/constants/task.ts
@@ -175,3 +175,9 @@
[EnumTaskCheckReceiveMethod.CheckIn]: '浜哄伐绛惧埌',
[EnumTaskCheckReceiveMethod.Submit]: '鑷富鎻愪氦',
};
+
+export const EnumTaskSettlementAuditStatusText = {
+ [EnumTaskSettlementAuditStatus.Wait]: '寰呭鏍�',
+ [EnumTaskSettlementAuditStatus.Pass]: '瀹℃牳閫氳繃',
+ [EnumTaskSettlementAuditStatus.Fail]: '椹冲洖',
+};
diff --git a/src/views/EmploymentManage/CheckManage.vue b/src/views/EmploymentManage/CheckManage.vue
index dd1d12b..438e1b8 100644
--- a/src/views/EmploymentManage/CheckManage.vue
+++ b/src/views/EmploymentManage/CheckManage.vue
@@ -160,6 +160,7 @@
columnsRenderProps: {
checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskCheckReceiveStatusText },
billingMethod: { type: 'enum', valueEnum: EnumBillingMethodText },
+ checkReceiveMethod: { type: 'enum', valueEnum: EnumTaskCheckReceiveMethodText },
serviceFee: {
type: 'money',
formatter: (row) => {
diff --git a/src/views/EmploymentManage/CheckReceiveTaskDetail.vue b/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
index 303d615..0b10cdd 100644
--- a/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
+++ b/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
@@ -122,6 +122,7 @@
const BaseState = {
loading: true,
+ checkReceiveMethod: '' as any as EnumTaskCheckReceiveMethod,
};
const state = reactive({ ...BaseState });
@@ -157,6 +158,7 @@
let res = await taskCheckReceiveServices.getCheckReceiveTask(params, {
showLoading: !state.loading,
});
+ state.checkReceiveMethod = res.objectData?.checkReceiveMethod;
return res;
} catch (error) {}
},
@@ -173,6 +175,11 @@
);
function openDialog(row: API.GetCheckReceiveTaskQueryResultItem, isDetail = false) {
+ if (state.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn) {
+ handleManualEdit({
+ id: row.id,
+ });
+ }
handleEdit({
id: row.id,
isDetail,
@@ -189,7 +196,6 @@
const { dialogProps: dialogManualProps, handleEdit: handleManualEdit } = useFormDialog({
defaultFormParams: {
id: '',
- isDetail: false,
},
});
</script>
diff --git a/src/views/EmploymentManage/components/ManualCheckManageDialog.vue b/src/views/EmploymentManage/components/ManualCheckManageDialog.vue
index dfc1918..ecf8d60 100644
--- a/src/views/EmploymentManage/components/ManualCheckManageDialog.vue
+++ b/src/views/EmploymentManage/components/ManualCheckManageDialog.vue
@@ -1,7 +1,7 @@
<template>
- <ProDialog :title="title" v-model="visible" destroy-on-close draggable>
+ <ProDialog title="楠屾敹" v-model="visible" destroy-on-close draggable>
<ProDialogTableWrapper :height="400">
- <ProTableV2 v-bind="proTableProps" :columns="columns" :operationBtns="operationBtns">
+ <ProTableV2 v-bind="proTableProps" :columns="columns" :showOperationColumn="false">
</ProTableV2>
</ProDialogTableWrapper>
<template #footer>
@@ -32,12 +32,10 @@
type Form = {
id: string;
- isDetail: boolean;
};
const visible = defineModel({ type: Boolean });
const form = defineModel<Form>('form');
-const title = computed(() => (form.value.isDetail ? '璇︽儏' : '楠屾敹'));
const emit = defineEmits<{
(e: 'onCancel'): void;
}>();
@@ -52,12 +50,12 @@
},
{
id: '2',
- enCode: 'createdTime',
+ enCode: 'checkInTime',
name: '绛惧埌鏃堕棿',
},
{
id: '3',
- enCode: 'files',
+ enCode: 'checkOutTime',
name: '绛惧嚭鏃堕棿',
},
{
@@ -67,55 +65,8 @@
},
{
id: '5',
- enCode: 'checkReceiveTime',
+ enCode: 'operator',
name: '鎿嶄綔浜�',
- },
-]);
-
-const operationBtns = defineOperationBtns([
- {
- data: {
- enCode: 'checkReceiveBtn',
- name: '楠屾敹閫氳繃',
- },
- emits: {
- onClick: (role) => checkReceiveTask(role, EnumTaskUserSubmitCheckReceiveStatus.Success),
- },
- extraProps: {
- hide: (row: API.GetCheckReceiveTaskUserSubmitsQueryResultItem) =>
- !(
- row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit ||
- row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
- ) || form.value.isDetail,
- },
- },
- {
- data: {
- enCode: 'checkReceiveBtn',
- name: '楠屾敹鏈�氳繃',
- },
- emits: {
- onClick: (role) => checkReceiveTask(role, EnumTaskUserSubmitCheckReceiveStatus.Fail),
- },
- extraProps: {
- hide: (row: API.GetCheckReceiveTaskUserSubmitsQueryResultItem) =>
- !(
- row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit ||
- row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
- ) || form.value.isDetail,
- },
- },
- {
- data: {
- enCode: 'downloadBtn',
- name: '涓嬭浇',
- },
- emits: {
- onClick: (role) => handleDownload(role),
- },
- extraProps: {
- hide: (row: API.GetCheckReceiveTaskUserSubmitsQueryResultItem) => row.files?.length === 0,
- },
},
]);
@@ -162,17 +113,10 @@
},
queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskUserSubmits'],
columnsRenderProps: {
- createdTime: { type: 'date' },
- checkReceiveTime: { type: 'date' },
+ checkInTime: { type: 'date' },
+ checkOutTime: { type: 'date' },
date: { type: 'date', format: 'YYYY-MM-DD' },
checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskUserSubmitCheckReceiveStatusText },
- files: {
- type: 'url',
- //@ts-ignore
- formatter: (row: API.GetCheckReceiveTaskUserSubmitsQueryResultItem) =>
- row.files?.length > 0 && (row.files ?? []).map((x) => setOSSLink(x)),
- showDownloadBtn: false,
- },
},
}
);
diff --git a/src/views/EmploymentManage/constants/columns.ts b/src/views/EmploymentManage/constants/columns.ts
index b220bae..371213b 100644
--- a/src/views/EmploymentManage/constants/columns.ts
+++ b/src/views/EmploymentManage/constants/columns.ts
@@ -197,7 +197,7 @@
},
{
id: '8',
- enCode: 'checkReceiveStatus',
+ enCode: 'checkReceiveMethod',
name: '楠屾敹鏂瑰紡',
},
{
diff --git a/src/views/FinanceManage/EnterpriseBalanceManageDetail.vue b/src/views/FinanceManage/EnterpriseBalanceManageDetail.vue
index 5028937..26008ea 100644
--- a/src/views/FinanceManage/EnterpriseBalanceManageDetail.vue
+++ b/src/views/FinanceManage/EnterpriseBalanceManageDetail.vue
@@ -78,7 +78,7 @@
} from '@bole-core/components';
import { BalanceManageDetailColumns } from './constants';
import { EnumWalletTransactionStatusText, EnumEnterpriseWalletAccessText } from '@/constants';
-import * as taskServices from '@/services/api/task';
+import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
import * as userServices from '@/services/api/user';
import { Message } from '@bole-core/core';
import { downloadFileByUrl, format, setOSSLink } from '@/utils';
@@ -158,10 +158,12 @@
return;
}
try {
- let params: API.ExportTaskSettlementOrderRostersCommand = {
- id: id,
+ let params: API.ExportEnterpriseBalanceDetailsCommand = {
+ enterpriseWalletId: id,
+ createdTimeStart: format(extraParamState.creationTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
+ createdTimeEnd: format(extraParamState.creationTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
};
- let res = await taskServices.exportTaskSettlementOrderRosters(params);
+ let res = await enterpriseWalletServices.exportEnterpriseBalanceDetails(params);
if (res) {
downloadFileByUrl(setOSSLink(res));
}
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 16b7790..1a8e273 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -294,6 +294,8 @@
actualSettlementAmount: null as number,
receiveAccount: '',
bank: '',
+ totalWorkHours: null as number,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
// bankBranch: '',
},
});
@@ -306,6 +308,8 @@
actualSettlementAmount: row?.actualSettlementAmount ?? null,
receiveAccount: row?.receiveAccount ?? '',
bank: row?.bank ?? '',
+ totalWorkHours: null as number,
+ settlementAccess: Number(form.settlementAccess),
// bankBranch: row?.bankBranch ?? '',
});
}
@@ -319,6 +323,7 @@
actualSettlementAmount: editForm.actualSettlementAmount,
receiveAccount: editForm.receiveAccount,
bank: editForm.bank,
+ totalWorkHours: editForm.totalWorkHours,
// bankBranch: editForm.bankBranch,
};
let res = await taskServices.editTaskSettlementOrderRoster(params);
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index b0f30e4..ceb3bee 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -91,7 +91,6 @@
<!-- <SettleDetailDialog v-bind="dialogSettleProps" /> -->
<RechargeEnterpriseWalletDialog v-bind="dialogRechargeProps" />
<SettlMethodDialog v-bind="dialogSettlMethodProps" />
- <EditSettleInfoDialog v-bind="dialogSettleInfoProps" />
</LoadingLayout>
</template>
@@ -198,10 +197,10 @@
emits: {
onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role.id),
},
- // extraProps: {
- // hide: (role: API.GetSettlementTasksQueryResultItem) =>
- // role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Wait,
- // },
+ extraProps: {
+ hide: (role: API.GetSettlementTasksQueryResultItem) =>
+ role.auditStatus !== EnumTaskSettlementAuditStatus.Wait,
+ },
},
{
data: {
@@ -295,6 +294,7 @@
settlementOrderStatus: { type: 'enum', valueEnum: EnumTaskSettlementOrderStatusText },
settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskCheckReceiveStatusText },
+ auditStatus: { type: 'enum', valueEnum: EnumTaskSettlementAuditStatusText },
actualSettlementAmount: { type: 'money' },
settlementAmount: { type: 'money' },
settlementTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
@@ -466,18 +466,4 @@
'缁撶畻鍗曟ā鏉�'
);
}
-
-const {
- dialogProps: dialogSettleInfoProps,
- handleEdit: handleSettleInfoEdit,
- editForm: settleInfoEditForm,
-} = useFormDialog({
- onConfirm: handleSettleInfo,
- defaultFormParams: {
- id: '',
- actualSettlementAmount: 0,
- },
-});
-
-async function handleSettleInfo() {}
</script>
diff --git a/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue b/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue
index 42b5ef7..ff4d2bc 100644
--- a/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue
+++ b/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue
@@ -8,22 +8,44 @@
:width="700"
>
<ProForm :model="form" ref="dialogForm" label-width="120px">
- <ProFormItemV2 label="鎵�灞為摱琛岋細" prop="bank" :check-rules="[{ message: '璇疯緭鍏ユ墍灞為摱琛�' }]">
- <ProFormText placeholder="璇疯緭鍏ユ墍灞為摱琛�" v-model.trim="form.bank"></ProFormText>
- </ProFormItemV2>
- <!-- <ProFormItemV2
+ <template v-if="form.settlementAccess !== EnumEnterpriseWalletAccess.WeChatPay">
+ <ProFormItemV2
+ label="鎵�灞為摱琛岋細"
+ prop="bank"
+ :check-rules="[{ message: '璇疯緭鍏ユ墍灞為摱琛�' }]"
+ >
+ <ProFormText placeholder="璇疯緭鍏ユ墍灞為摱琛�" v-model.trim="form.bank"></ProFormText>
+ </ProFormItemV2>
+ <!-- <ProFormItemV2
label="寮�鎴锋敮琛岋細"
prop="bankBranch"
:check-rules="[{ message: '璇疯緭鍏ュ紑鎴锋敮琛�' }]"
>
<ProFormText placeholder="璇疯緭鍏ュ紑鎴锋敮琛�" v-model.trim="form.bankBranch"></ProFormText>
</ProFormItemV2> -->
+ <ProFormItemV2
+ label="鏀舵璐︽埛锛�"
+ prop="receiveAccount"
+ :check-rules="[{ message: '璇疯緭鍏ユ敹娆捐处鎴�' }]"
+ >
+ <ProFormText
+ placeholder="璇疯緭鍏ユ敹娆捐处鎴�"
+ v-model.trim="form.receiveAccount"
+ ></ProFormText>
+ </ProFormItemV2>
+ </template>
+
<ProFormItemV2
- label="鏀舵璐︽埛锛�"
- prop="receiveAccount"
- :check-rules="[{ message: '璇疯緭鍏ユ敹娆捐处鎴�' }]"
+ label="璋冩暣宸ユ椂锛�"
+ prop="totalWorkHours"
+ :check-rules="[{ message: '璇疯緭鍏ヨ皟鏁村伐鏃�' }]"
>
- <ProFormText placeholder="璇疯緭鍏ユ敹娆捐处鎴�" v-model.trim="form.receiveAccount"></ProFormText>
+ <ProFormInputNumber
+ placeholder="璇疯緭鍏ヨ皟鏁村伐鏃�"
+ v-model.trim="form.totalWorkHours"
+ :controls="false"
+ :min="0"
+ ></ProFormInputNumber>
</ProFormItemV2>
<ProFormItemV2
label="缁撶畻閲戦锛�"
@@ -69,6 +91,7 @@
ProFormText,
UploadUserFile,
} from '@bole-core/components';
+import { EnumEnterpriseWalletAccess } from '@/constants';
defineOptions({
name: 'EditAccountInfoDialog',
@@ -78,10 +101,12 @@
title?: string;
id?: string;
settlementAmount: number;
+ totalWorkHours: number;
actualSettlementAmount: number;
receiveAccount: string;
bank: string;
bankBranch?: string;
+ settlementAccess: EnumEnterpriseWalletAccess;
};
const visible = defineModel({ type: Boolean });
diff --git a/src/views/ServiceChargeManage/components/EditSettleInfoDialog.vue b/src/views/ServiceChargeManage/components/EditSettleInfoDialog.vue
deleted file mode 100644
index 0d87fed..0000000
--- a/src/views/ServiceChargeManage/components/EditSettleInfoDialog.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<template>
- <ProDialog
- title="缂栬緫"
- v-model="visible"
- @close="onDialogClose"
- destroy-on-close
- draggable
- :width="700"
- >
- <ProForm :model="form" ref="dialogForm" label-width="120px">
- <ProFormItemV2
- label="璋冩暣宸ユ椂锛�"
- prop="actualSettlementAmount"
- :check-rules="[{ message: '璇疯緭鍏ヨ皟鏁村伐鏃�' }]"
- >
- <ProFormInputNumber
- placeholder="璇疯緭鍏ヨ皟鏁村伐鏃�"
- v-model.trim="form.actualSettlementAmount"
- :controls="false"
- :min="0"
- ></ProFormInputNumber>
- </ProFormItemV2>
- <ProFormItemV2
- label="缁撶畻閲戦锛�"
- prop="actualSettlementAmount"
- :check-rules="[{ message: '璇疯緭鍏ョ粨绠楅噾棰�' }]"
- >
- <ProFormInputNumber
- placeholder="璇疯緭鍏ョ粨绠楅噾棰�"
- v-model.trim="form.actualSettlementAmount"
- :controls="false"
- :min="0"
- ></ProFormInputNumber>
- </ProFormItemV2>
- <ProFormItemV2
- label="瀹炲彂閲戦锛�"
- prop="actualSettlementAmount"
- :check-rules="[{ message: '璇疯緭鍏ュ疄鍙戦噾棰�' }]"
- >
- <ProFormInputNumber
- placeholder="璇疯緭鍏ュ疄鍙戦噾棰�"
- v-model.trim="form.actualSettlementAmount"
- :controls="false"
- :min="0"
- ></ProFormInputNumber>
- </ProFormItemV2>
- </ProForm>
- <template #footer>
- <span class="dialog-footer">
- <el-button @click="emit('onCancel')">鍙栨秷</el-button>
- <el-button type="primary" @click="handleConfirm">纭</el-button>
- </span>
- </template>
- </ProDialog>
-</template>
-
-<script setup lang="ts">
-import { FormInstance } from 'element-plus';
-import { ProDialog, ProForm, ProFormInputNumber, ProFormItemV2 } from '@bole-core/components';
-
-defineOptions({
- name: 'EditAccountInfoDialog',
-});
-
-type Form = {
- title?: string;
- id?: string;
- actualSettlementAmount: number;
-};
-
-const visible = defineModel({ type: Boolean });
-
-const form = defineModel<Form>('form');
-
-const emit = defineEmits<{
- (e: 'onConfirm'): void;
- (e: 'onCancel'): void;
-}>();
-
-const dialogForm = ref<FormInstance>();
-
-function onDialogClose() {
- if (!dialogForm.value) return;
- dialogForm.value.resetFields();
-}
-
-function handleConfirm() {
- if (!dialogForm.value) return;
- dialogForm.value.validate((valid) => {
- if (valid) {
- emit('onConfirm');
- } else {
- return;
- }
- });
-}
-</script>
diff --git a/src/views/ServiceChargeManage/constants/columns.ts b/src/views/ServiceChargeManage/constants/columns.ts
index bda1da9..7137e90 100644
--- a/src/views/ServiceChargeManage/constants/columns.ts
+++ b/src/views/ServiceChargeManage/constants/columns.ts
@@ -43,7 +43,7 @@
},
{
id: '9',
- enCode: 'settlementAmount',
+ enCode: 'auditStatus',
name: '瀹℃牳鐘舵��',
},
{
@@ -102,7 +102,7 @@
{
id: '7',
enCode: 'receiveAccount',
- name: '绱宸ワ紙灏忔椂锛�',
+ name: '绱宸ユ椂锛堝皬鏃讹級',
},
{
id: '8',
--
Gitblit v1.9.1