From f393d0372b5ef06099a3591a4c77e61b48935a3b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 19 九月 2025 15:57:18 +0800
Subject: [PATCH] Merge branch 'dev-v1.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-v1.1
---
src/views/ServiceChargeManage/constants/columns.ts | 10 ++--
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 6 +-
src/constants/task.ts | 5 ++
src/views/ServiceChargeManage/components/BalanceDetailDialog.vue | 2
.eslintrc-auto-import.json | 1
src/services/api/typings.d.ts | 3 +
src/views/ServiceChargeManage/ServiceChargeManage.vue | 12 ++++--
src/views/WithdrawManage/WithdrawManageList.vue | 2
src/views/FinanceManage/components/DistributionDetailView.vue | 2
src/views/ServiceChargeManage/components/FinanceDetailDialog.vue | 11 +++++
src/views/ServiceChargeManage/BalanceManage.vue | 2
src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue | 4 +-
src/views/FinanceManage/components/UsageDetailView.vue | 2
auto-imports.d.ts | 2 +
src/services/api/auth.ts | 2
15 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 76c9c1f..f83ceeb 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -65,6 +65,7 @@
"EnumSmsAccess": true,
"EnumTaskCheckReceiveStatus": true,
"EnumTaskCheckReceiveStatusText": true,
+ "EnumTaskCheckReceiveStatusTextForFilter": true,
"EnumTaskRecommendStatus": true,
"EnumTaskRecommendStatusText": true,
"EnumTaskReleaseStatus": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 44f22bb..e553ecc 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -70,6 +70,7 @@
const EnumSmsTemplateType: typeof import('./src/constants/apiEnum')['EnumSmsTemplateType']
const EnumTaskCheckReceiveStatus: typeof import('./src/constants/apiEnum')['EnumTaskCheckReceiveStatus']
const EnumTaskCheckReceiveStatusText: typeof import('./src/constants/task')['EnumTaskCheckReceiveStatusText']
+ const EnumTaskCheckReceiveStatusTextForFilter: typeof import('./src/constants/task')['EnumTaskCheckReceiveStatusTextForFilter']
const EnumTaskRecommendStatus: typeof import('./src/constants/apiEnum')['EnumTaskRecommendStatus']
const EnumTaskRecommendStatusText: typeof import('./src/constants/task')['EnumTaskRecommendStatusText']
const EnumTaskReleaseStatus: typeof import('./src/constants/apiEnum')['EnumTaskReleaseStatus']
@@ -351,6 +352,7 @@
readonly EnumSmsAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumSmsAccess']>
readonly EnumTaskCheckReceiveStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskCheckReceiveStatus']>
readonly EnumTaskCheckReceiveStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskCheckReceiveStatusText']>
+ readonly EnumTaskCheckReceiveStatusTextForFilter: UnwrapRef<typeof import('./src/constants/task')['EnumTaskCheckReceiveStatusTextForFilter']>
readonly EnumTaskRecommendStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskRecommendStatus']>
readonly EnumTaskRecommendStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskRecommendStatusText']>
readonly EnumTaskReleaseStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskReleaseStatus']>
diff --git a/src/constants/task.ts b/src/constants/task.ts
index 460cd3f..58d0118 100644
--- a/src/constants/task.ts
+++ b/src/constants/task.ts
@@ -121,6 +121,11 @@
[EnumTaskCheckReceiveStatus.Completed]: '宸查獙鏀�',
};
+export const EnumTaskCheckReceiveStatusTextForFilter = {
+ [EnumTaskCheckReceiveStatus.WaitCheckReceive]: '寰呴獙鏀�',
+ [EnumTaskCheckReceiveStatus.Completed]: '宸查獙鏀�',
+};
+
export const EnumTaskUserSubmitCheckReceiveStatusText = {
[EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit]: '寰呮彁浜�',
[EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive]: '寰呴獙鏀�',
diff --git a/src/services/api/auth.ts b/src/services/api/auth.ts
index 1a95129..29e4032 100644
--- a/src/services/api/auth.ts
+++ b/src/services/api/auth.ts
@@ -132,7 +132,7 @@
body: API.RegisterPersonalUserCommand,
options?: API.RequestConfig
) {
- return request<boolean>('/api/user/auth/registerPersonalUser', {
+ return request<API.LoginCommandCallback>('/api/user/auth/registerPersonalUser', {
method: 'POST',
headers: {
'Content-Type': 'application/json-patch+json',
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index bde91c4..46326ce 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -4403,6 +4403,7 @@
keywords?: string;
settlementOrderStatus?: EnumTaskSettlementOrderStatus;
settlementStatus?: EnumTaskSettlementStatus;
+ checkReceiveStatus?: EnumTaskCheckReceiveStatus;
/** 缁撶畻鏃堕棿-璧峰 */
settlementTimeBegin?: string;
/** 缁撶畻鏃堕棿-鎴 */
@@ -5128,7 +5129,7 @@
contactPhoneNumber?: string;
/** 鎵�灞為摱琛� */
bank?: string;
- /** 寮�鎴锋敮琛屽悕绉� */
+ /** 鎵�灞炴敮琛� */
bankBranch?: string;
/** 鏀舵璐︽埛 */
receiveAccount?: string;
diff --git a/src/views/FinanceManage/components/DistributionDetailView.vue b/src/views/FinanceManage/components/DistributionDetailView.vue
index be7aa59..dfce1fa 100644
--- a/src/views/FinanceManage/components/DistributionDetailView.vue
+++ b/src/views/FinanceManage/components/DistributionDetailView.vue
@@ -58,7 +58,7 @@
},
{
defaultExtraParams: {
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
columnsRenderProps: {
amount: { type: 'money' },
diff --git a/src/views/FinanceManage/components/UsageDetailView.vue b/src/views/FinanceManage/components/UsageDetailView.vue
index f48a6e0..1f52e58 100644
--- a/src/views/FinanceManage/components/UsageDetailView.vue
+++ b/src/views/FinanceManage/components/UsageDetailView.vue
@@ -44,7 +44,7 @@
},
{
defaultExtraParams: {
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
columnsRenderProps: {},
}
diff --git a/src/views/ServiceChargeManage/BalanceManage.vue b/src/views/ServiceChargeManage/BalanceManage.vue
index c632be7..a741e82 100644
--- a/src/views/ServiceChargeManage/BalanceManage.vue
+++ b/src/views/ServiceChargeManage/BalanceManage.vue
@@ -116,7 +116,7 @@
keywords: '',
balanceMin: null as number,
balanceMax: null as number,
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
columnsRenderProps: {
balance: { type: 'money' },
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index cb63b7d..9fbb7c8 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -288,7 +288,7 @@
actualSettlementAmount: null as number,
receiveAccount: '',
bank: '',
- bankBranch: '',
+ // bankBranch: '',
},
});
@@ -300,7 +300,7 @@
actualSettlementAmount: row?.actualSettlementAmount ?? null,
receiveAccount: row?.receiveAccount ?? '',
bank: row?.bank ?? '',
- bankBranch: row?.bankBranch ?? '',
+ // bankBranch: row?.bankBranch ?? '',
});
}
}
@@ -313,7 +313,7 @@
actualSettlementAmount: editForm.actualSettlementAmount,
receiveAccount: editForm.receiveAccount,
bank: editForm.bank,
- bankBranch: editForm.bankBranch,
+ // bankBranch: editForm.bankBranch,
};
let res = await taskServices.editTaskSettlementOrderRoster(params);
if (res) {
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index be4341d..3b2dee5 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -3,10 +3,10 @@
<AppContainer>
<ProTableQueryFilterBar @on-reset="reset">
<template #query>
- <QueryFilterItem tip-content="缁撶畻鍗曠姸鎬�">
+ <QueryFilterItem tip-content="楠屾敹鐘舵��">
<FieldRadio
- v-model="extraParamState.settlementOrderStatus"
- :value-enum="EnumTaskSettlementOrderStatusText"
+ v-model="extraParamState.checkReceiveStatus"
+ :value-enum="EnumTaskCheckReceiveStatusTextForFilter"
buttonStyle
showAllBtn
@change="getList()"
@@ -115,6 +115,9 @@
EnumTaskSettlementOrderStatusText,
EnumTaskSettlementOrderStatus,
EnumTaskSettlementStatus,
+ EnumTaskCheckReceiveStatusText,
+ EnumTaskCheckReceiveStatusTextForFilter,
+ EnumTaskCheckReceiveStatus,
} from '@/constants';
import { downloadFileByUrl, format, setOssFileName } from '@/utils';
import * as taskServices from '@/services/api/task';
@@ -248,7 +251,7 @@
orderInput: extraParamState.orderInput,
},
keywords: extraParamState.keywords,
- settlementOrderStatus: extraParamState.settlementOrderStatus,
+ checkReceiveStatus: extraParamState.checkReceiveStatus,
settlementStatus: extraParamState.settlementStatus,
settlementTimeBegin: format(extraParamState.time?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
settlementTimeEnd: format(extraParamState.time?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
@@ -266,6 +269,7 @@
defaultExtraParams: {
keywords: '',
settlementOrderStatus: '' as any as EnumTaskSettlementOrderStatus,
+ checkReceiveStatus: '' as any as EnumTaskCheckReceiveStatus,
settlementStatus: '' as any as EnumTaskSettlementStatus,
time: [] as unknown as ModelValueType,
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
diff --git a/src/views/ServiceChargeManage/components/BalanceDetailDialog.vue b/src/views/ServiceChargeManage/components/BalanceDetailDialog.vue
index 0af6300..1effc9b 100644
--- a/src/views/ServiceChargeManage/components/BalanceDetailDialog.vue
+++ b/src/views/ServiceChargeManage/components/BalanceDetailDialog.vue
@@ -168,7 +168,7 @@
defaultExtraParams: {
type: '' as any as EnumUserWalletTransactionType,
creationTime: [] as unknown as ModelValueType,
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
columnsRenderProps: {
transDate: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
diff --git a/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue b/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue
index 525caf1..42b5ef7 100644
--- a/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue
+++ b/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue
@@ -11,13 +11,13 @@
<ProFormItemV2 label="鎵�灞為摱琛岋細" prop="bank" :check-rules="[{ message: '璇疯緭鍏ユ墍灞為摱琛�' }]">
<ProFormText placeholder="璇疯緭鍏ユ墍灞為摱琛�" v-model.trim="form.bank"></ProFormText>
</ProFormItemV2>
- <ProFormItemV2
+ <!-- <ProFormItemV2
label="寮�鎴锋敮琛岋細"
prop="bankBranch"
:check-rules="[{ message: '璇疯緭鍏ュ紑鎴锋敮琛�' }]"
>
<ProFormText placeholder="璇疯緭鍏ュ紑鎴锋敮琛�" v-model.trim="form.bankBranch"></ProFormText>
- </ProFormItemV2>
+ </ProFormItemV2> -->
<ProFormItemV2
label="鏀舵璐︽埛锛�"
prop="receiveAccount"
diff --git a/src/views/ServiceChargeManage/components/FinanceDetailDialog.vue b/src/views/ServiceChargeManage/components/FinanceDetailDialog.vue
index b05ba85..381c8ee 100644
--- a/src/views/ServiceChargeManage/components/FinanceDetailDialog.vue
+++ b/src/views/ServiceChargeManage/components/FinanceDetailDialog.vue
@@ -32,7 +32,7 @@
(e: 'onCancel'): void;
}>();
-const { data: detail } = useQuery({
+const { data: detail, refetch } = useQuery({
queryKey: ['userResumeServices/getUserResume', form.value.id],
queryFn: async () => {
return await userServices.getPersonalUserTransaction({ id: form.value.id });
@@ -41,6 +41,15 @@
enabled: computed(() => !!form.value.id),
});
+watch(
+ () => form.value.id,
+ (val) => {
+ if (val) {
+ refetch();
+ }
+ }
+);
+
const { portraitTableProps } = usePortraitTable({
data: detail,
columns: [
diff --git a/src/views/ServiceChargeManage/constants/columns.ts b/src/views/ServiceChargeManage/constants/columns.ts
index 0c3f24a..a7005c6 100644
--- a/src/views/ServiceChargeManage/constants/columns.ts
+++ b/src/views/ServiceChargeManage/constants/columns.ts
@@ -16,11 +16,11 @@
enCode: 'checkReceiveStatus',
name: '楠屾敹鐘舵��',
},
- {
- id: '4',
- enCode: 'settlementOrderStatus',
- name: '缁撶畻鍗曠姸鎬�',
- },
+ // {
+ // id: '4',
+ // enCode: 'settlementOrderStatus',
+ // name: '缁撶畻鍗曠姸鎬�',
+ // },
{
id: '5',
enCode: 'settlementOrderName',
diff --git a/src/views/WithdrawManage/WithdrawManageList.vue b/src/views/WithdrawManage/WithdrawManageList.vue
index cee29e0..db2e205 100644
--- a/src/views/WithdrawManage/WithdrawManageList.vue
+++ b/src/views/WithdrawManage/WithdrawManageList.vue
@@ -122,7 +122,7 @@
keywords: '',
status: '',
time: [] as unknown as ModelValueType,
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
columnsRenderProps: {
balance: { type: 'money' },
--
Gitblit v1.9.1