From a61a6310e93bf792d3cc41944006d8663636b552 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 14 八月 2025 10:41:57 +0800
Subject: [PATCH] fix: 验收管理
---
src/views/EmploymentManage/EmploymentManageArrange.vue | 171 +++++++++++++--------------------------------------------
1 files changed, 39 insertions(+), 132 deletions(-)
diff --git a/src/views/EmploymentManage/EmploymentManageArrange.vue b/src/views/EmploymentManage/EmploymentManageArrange.vue
index 69b9636..c88f40b 100644
--- a/src/views/EmploymentManage/EmploymentManageArrange.vue
+++ b/src/views/EmploymentManage/EmploymentManageArrange.vue
@@ -3,55 +3,25 @@
<AppContainer>
<ProTableQueryFilterBar @on-reset="reset">
<template #query>
- <QueryFilterItem tip-content="褰曠敤鐘舵��">
- <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 },
- ]"
- buttonStyle
- showAllBtn
- @change="getList()"
- />
- </QueryFilterItem>
<QueryFilterItem>
- <FieldDatePicker
- v-model="extraParamState.flexEnterpriseSettingStatus"
- type="daterange"
- range-separator="~"
- start-placeholder="璧峰鏃ユ湡"
- end-placeholder="鎴鏃ユ湡"
- clearable
+ <FieldRadio
+ v-model="extraParamState.arrangeStatus"
+ :value-enum="EnumTaskUserArrangeStatusText"
+ buttonStyle
+ showAllBtn
@change="getList()"
- tooltipContent="鍙戝竷鏃堕棿"
- ></FieldDatePicker>
+ />
</QueryFilterItem>
<QueryFilterItem>
<SearchInput
v-model="extraParamState.searchWord"
style="width: 250px"
- placeholder="浠诲姟鍚嶇О"
+ placeholder="濮撳悕/韬唤璇�/鐢佃瘽"
@on-click-search="getList"
@keyup.enter="getList()"
>
</SearchInput>
</QueryFilterItem>
- </template>
- <template #btn>
- <el-button @click="goAddOrEdit()" type="primary">鍙戝竷</el-button>
</template>
</ProTableQueryFilterBar>
<ProTableV2
@@ -77,11 +47,10 @@
FieldRadio,
defineOperationBtns,
} from '@bole-core/components';
-import * as flexEnterpriseServices from '@/services/api/FlexEnterprise';
import { EmploymentArrangeColumns } from './constants';
-import { OrderInputType, Message } from '@bole-core/core';
-import { useGlobalEventContext } from '@/hooks';
-import { FlexEnterpriseSettingStatus } from '@/constants';
+import { Message } from '@bole-core/core';
+import * as taskUserServices from '@/services/api/taskUser';
+import { EnumTaskUserArrangeStatusText } from '@/constants';
defineOptions({
name: 'EmploymentManageArrange',
@@ -90,75 +59,28 @@
const operationBtns = defineOperationBtns([
{
data: {
- enCode: 'editBtn',
- name: '缂栬緫',
- },
- emits: {
- onClick: (role) => goAddOrEdit(role),
- },
- },
- {
- data: {
- enCode: 'detailBtn',
- name: '璇︽儏',
- },
- emits: {
- onClick: (role) => goDetail(role),
- },
- },
- {
- data: {
- enCode: 'publishBtn',
- name: '鍙戝竷',
- },
- emits: {
- onClick: (role) => handlePublish(role),
- },
- extraProps: {
- hide: (row) => false,
- },
- },
- {
- data: {
- enCode: 'unPublishBtn',
- name: '鍋滄鍙戝竷',
- },
- emits: {
- onClick: (role) => handleUnPublish(role),
- },
- extraProps: {
- hide: (row) => false,
- },
- },
- {
- data: {
enCode: 'arrangeBtn',
name: '瀹夋帓',
},
- props: { type: 'danger' },
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,
};
const state = reactive({ ...BaseState });
-
-const eventContext = useGlobalEventContext();
-
-eventContext.addEvent('employment:add', () => {
- getList();
-});
-
-eventContext.addEvent('employment:edit', () => {
- getList(paginationState.pageIndex);
-});
onMounted(async () => {
await getList();
@@ -174,17 +96,18 @@
} = 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,
};
- let res = await flexEnterpriseServices.getFlexEnterpriseList(params, {
+ let res = await taskUserServices.getArrangeTaskUsers(params, {
showLoading: !state.loading,
});
return res;
@@ -195,43 +118,27 @@
{
defaultExtraParams: {
searchWord: '',
- orderInput: [{ property: 'id', order: OrderInputType.Desc }],
- flexEnterpriseSettingStatus: '' as any as FlexEnterpriseSettingStatus,
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
+ arrangeStatus: '' as any as EnumTaskUserArrangeStatus,
},
- queryKey: ['flexEnterpriseServices/getFlexEnterpriseList'],
- columnsRenderProps: {},
+ queryKey: ['taskUserServices/getArrangeTaskUsers'],
+ columnsRenderProps: {
+ gender: { type: 'enum', valueEnum: EnumUserGenderTextForPerson },
+ arrangeStatus: { type: 'enum', valueEnum: EnumTaskUserArrangeStatusText },
+ },
}
);
-function handlePublish(row) {
- console.log(row);
-}
-function handleUnPublish(row) {
- console.log(row);
-}
-
-function handleArrange(row) {
- router.push({
- name: 'EmploymentManageArrange',
- params: {
- id: row?.id ?? '',
- },
- });
-}
-function goAddOrEdit(row?) {
- router.push({
- name: 'AddOrEditEmployment',
- params: {
- id: row?.id ?? '',
- },
- });
-}
-function goDetail(row) {
- router.push({
- name: 'EmploymentManageDetail',
- params: {
- id: row?.id ?? '',
- },
- });
+async function handleArrange(row: API.GetArrangeTaskUsersQueryResultItem) {
+ try {
+ let res = await taskUserServices.setTaskUserArrange({
+ id: row.id,
+ arrangeStatus: EnumTaskUserArrangeStatus.Complete,
+ });
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ getList(paginationState.pageIndex);
+ }
+ } catch (error) {}
}
</script>
--
Gitblit v1.9.1