From cbcc6a8eecfc19e93da08500dcc898efdabf7836 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 18:38:45 +0800
Subject: [PATCH] fix: s
---
src/views/EmploymentManage/EmploymentManageArrange.vue | 82 ++++++++++++++++++++++------------------
1 files changed, 45 insertions(+), 37 deletions(-)
diff --git a/src/views/EmploymentManage/EmploymentManageArrange.vue b/src/views/EmploymentManage/EmploymentManageArrange.vue
index e587122..017f5c4 100644
--- a/src/views/EmploymentManage/EmploymentManageArrange.vue
+++ b/src/views/EmploymentManage/EmploymentManageArrange.vue
@@ -3,41 +3,23 @@
<AppContainer>
<ProTableQueryFilterBar @on-reset="reset">
<template #query>
- <QueryFilterItem tip-content="褰曠敤鐘舵��">
+ <QueryFilterItem>
<FieldRadio
- v-model="extraParamState.flexEnterpriseSettingStatus"
- :value-enum="[
- { label: '宸插畨鎺�', value: 1 },
- { label: '寰呭畨鎺�', value: 0 },
- ]"
- buttonStyle
- showAllBtn
- @change="getList()"
- />
- </QueryFilterItem>
- <QueryFilterItem tip-content="瀹炲悕鐘舵��">
- <FieldRadio
- v-model="extraParamState.flexEnterpriseSettingStatus"
- :value-enum="[
- { label: '鍙戝竷涓�', value: 1 },
- { label: '宸插仠姝�', value: 0 },
- ]"
+ v-model="extraParamState.arrangeStatus"
+ :value-enum="EnumTaskUserArrangeStatusText"
buttonStyle
showAllBtn
@change="getList()"
/>
</QueryFilterItem>
<QueryFilterItem>
- <FieldDatePicker
- v-model="extraParamState.flexEnterpriseSettingStatus"
- type="daterange"
- range-separator="~"
- start-placeholder="璧峰鏃ユ湡"
- end-placeholder="鎴鏃ユ湡"
- clearable
+ <FieldRadio
+ v-model="extraParamState.applyStatus"
+ :value-enum="EnumGetArrangeTaskUsersQueryApplyStatusText"
+ buttonStyle
+ showAllBtn
@change="getList()"
- tooltipContent="鍙戝竷鏃堕棿"
- ></FieldDatePicker>
+ />
</QueryFilterItem>
<QueryFilterItem>
<SearchInput
@@ -76,7 +58,11 @@
} from '@bole-core/components';
import { EmploymentArrangeColumns } from './constants';
import { Message } from '@bole-core/core';
-import { FlexEnterpriseSettingStatus } from '@/constants';
+import * as taskUserServices from '@/services/api/taskUser';
+import {
+ EnumTaskUserArrangeStatusText,
+ EnumGetArrangeTaskUsersQueryApplyStatusText,
+} from '@/constants';
defineOptions({
name: 'EmploymentManageArrange',
@@ -91,10 +77,16 @@
emits: {
onClick: (role) => handleArrange(role),
},
+ extraProps: {
+ hide: (row: API.GetArrangeTaskUsersQueryResultItem) =>
+ row.arrangeStatus === EnumTaskUserArrangeStatus.Complete,
+ },
},
]);
const router = useRouter();
+const route = useRoute();
+const id = route.params.id as string;
const BaseState = {
loading: true,
@@ -116,17 +108,19 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetFlexEnterpriseInput = {
+ let params: API.GetArrangeTaskUsersQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- flexEnterpriseSettingStatus: extraParamState.flexEnterpriseSettingStatus,
- searchWord: extraParamState.searchWord,
+ id: id,
+ keywords: extraParamState.searchWord,
+ arrangeStatus: extraParamState.arrangeStatus,
+ applyStatus: extraParamState.applyStatus,
};
- let res = await flexEnterpriseServices.getFlexEnterpriseList(params, {
+ let res = await taskUserServices.getArrangeTaskUsers(params, {
showLoading: !state.loading,
});
return res;
@@ -138,14 +132,28 @@
defaultExtraParams: {
searchWord: '',
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
- flexEnterpriseSettingStatus: '' as any as FlexEnterpriseSettingStatus,
+ arrangeStatus: '' as any as EnumTaskUserArrangeStatus,
+ applyStatus: '' as any as EnumGetArrangeTaskUsersQueryApplyStatus,
},
- queryKey: ['flexEnterpriseServices/getFlexEnterpriseList'],
- columnsRenderProps: {},
+ queryKey: ['taskUserServices/getArrangeTaskUsers'],
+ columnsRenderProps: {
+ gender: { type: 'enum', valueEnum: EnumUserGenderTextForPerson },
+ arrangeStatus: { type: 'enum', valueEnum: EnumTaskUserArrangeStatusText },
+ },
}
);
-function handleArrange(row) {
- console.log('row: ', row);
+async function handleArrange(row: API.GetArrangeTaskUsersQueryResultItem) {
+ try {
+ let res = await taskUserServices.setTaskUserArrange({
+ enterpriseEmployeeId: row.id,
+ taskInfoId: id,
+ arrangeStatus: EnumTaskUserArrangeStatus.Complete,
+ });
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ getList(paginationState.pageIndex);
+ }
+ } catch (error) {}
}
</script>
--
Gitblit v1.9.1