From 3ae270ee2e6518522dce3153f483b8c5b3d3428d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 28 十一月 2025 16:42:05 +0800
Subject: [PATCH] fix: bug
---
src/views/EmploymentManage/EmploymentManageArrange.vue | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/src/views/EmploymentManage/EmploymentManageArrange.vue b/src/views/EmploymentManage/EmploymentManageArrange.vue
index c88f40b..a89ff48 100644
--- a/src/views/EmploymentManage/EmploymentManageArrange.vue
+++ b/src/views/EmploymentManage/EmploymentManageArrange.vue
@@ -13,6 +13,15 @@
/>
</QueryFilterItem>
<QueryFilterItem>
+ <FieldRadio
+ v-model="extraParamState.applyStatus"
+ :value-enum="EnumGetArrangeTaskUsersQueryApplyStatusText"
+ buttonStyle
+ showAllBtn
+ @change="getList()"
+ />
+ </QueryFilterItem>
+ <QueryFilterItem>
<SearchInput
v-model="extraParamState.searchWord"
style="width: 250px"
@@ -24,11 +33,7 @@
</QueryFilterItem>
</template>
</ProTableQueryFilterBar>
- <ProTableV2
- v-bind="proTableProps"
- :columns="EmploymentArrangeColumns"
- :operationBtns="operationBtns"
- >
+ <ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
</ProTableV2>
</AppContainer>
</LoadingLayout>
@@ -50,18 +55,18 @@
import { EmploymentArrangeColumns } from './constants';
import { Message } from '@bole-core/core';
import * as taskUserServices from '@/services/api/taskUser';
-import { EnumTaskUserArrangeStatusText } from '@/constants';
+import {
+ EnumTaskUserArrangeStatusText,
+ EnumGetArrangeTaskUsersQueryApplyStatusText,
+} from '@/constants';
+import { hiddenIDNumberForEnd4 } from '@/utils';
defineOptions({
name: 'EmploymentManageArrange',
});
-const operationBtns = defineOperationBtns([
- {
- data: {
- enCode: 'arrangeBtn',
- name: '瀹夋帓',
- },
+const operationBtnMap: Record<string, OperationBtnType> = {
+ arrangeBtn: {
emits: {
onClick: (role) => handleArrange(role),
},
@@ -70,7 +75,11 @@
row.arrangeStatus === EnumTaskUserArrangeStatus.Complete,
},
},
-]);
+};
+
+const { column, operationBtns } = useAccess({
+ operationBtnMap,
+});
const router = useRouter();
const route = useRoute();
@@ -105,6 +114,7 @@
id: id,
keywords: extraParamState.searchWord,
arrangeStatus: extraParamState.arrangeStatus,
+ applyStatus: extraParamState.applyStatus,
};
let res = await taskUserServices.getArrangeTaskUsers(params, {
@@ -120,11 +130,17 @@
searchWord: '',
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
arrangeStatus: '' as any as EnumTaskUserArrangeStatus,
+ applyStatus: '' as any as EnumGetArrangeTaskUsersQueryApplyStatus,
},
queryKey: ['taskUserServices/getArrangeTaskUsers'],
columnsRenderProps: {
gender: { type: 'enum', valueEnum: EnumUserGenderTextForPerson },
arrangeStatus: { type: 'enum', valueEnum: EnumTaskUserArrangeStatusText },
+ identity: {
+ formatter: (row: API.GetArrangeTaskUsersQueryResultItem) => {
+ return hiddenIDNumberForEnd4(row.identity);
+ },
+ },
},
}
);
@@ -132,7 +148,8 @@
async function handleArrange(row: API.GetArrangeTaskUsersQueryResultItem) {
try {
let res = await taskUserServices.setTaskUserArrange({
- id: row.id,
+ enterpriseEmployeeId: row.id,
+ taskInfoId: id,
arrangeStatus: EnumTaskUserArrangeStatus.Complete,
});
if (res) {
--
Gitblit v1.9.1