From 33c45ab67c74c387596a3a2fae26b314bebe1a4f Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 07 八月 2025 18:05:59 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/views/TaskManage/TaskManageList.vue | 38 ++++++++++++++++----------------------
1 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/src/views/TaskManage/TaskManageList.vue b/src/views/TaskManage/TaskManageList.vue
index 3be9206..1409251 100644
--- a/src/views/TaskManage/TaskManageList.vue
+++ b/src/views/TaskManage/TaskManageList.vue
@@ -3,19 +3,13 @@
<AppContainer>
<ProTableQueryFilterBar @on-reset="reset">
<template #query>
- <QueryFilterItem>
- <FieldSelect
- v-model="extraParamState.pageType"
- placeholder="骞垮憡椤甸潰"
- :value-enum="FlexWorkerEleSignEnumText"
- clearable
- @change="getList()"
- />
- </QueryFilterItem>
<QueryFilterItem tip-content="鍙戝竷鐘舵��">
<FieldRadio
v-model="extraParamState.status"
- :value-enum="FlexWorkerEleSignEnumText"
+ :value-enum="[
+ { value: true, label: '鍙戝竷涓�' },
+ { value: false, label: '宸插仠姝�' },
+ ]"
buttonStyle
showAllBtn
@change="getList()"
@@ -24,7 +18,10 @@
<QueryFilterItem tip-content="鎺ㄨ崘鐘舵��">
<FieldRadio
v-model="extraParamState.status"
- :value-enum="FlexWorkerEleSignEnumText"
+ :value-enum="[
+ { value: true, label: '宸叉帹鑽�' },
+ { value: false, label: '鏈帹鑽�' },
+ ]"
buttonStyle
showAllBtn
@change="getList()"
@@ -69,13 +66,11 @@
QueryFilterItem,
useTable,
FieldDatePicker,
- FieldSelect,
FieldRadio,
} from '@bole-core/components';
import { useAccess } from '@/hooks';
-import { FlexWorkerEleSignEnumText } from '@/constants';
import { ModelValueType } from 'element-plus';
-import { OrderInputType } from '@bole-core/core';
+import * as enterpriseServices from '@/services/api/enterprise';
defineOptions({
name: 'OperationManageList',
@@ -83,13 +78,13 @@
const operationBtnMap: Record<string, OperationBtnType> = {
detailBtn: { emits: { onClick: (role) => goDetail(role) } },
- takeOnBtn: {
+ recommendBtn: {
emits: { onClick: (role) => setAdvertiseOnShowStatus(role) },
extraProps: {
hide: (row) => row.status,
},
},
- takeDownBtn: {
+ cancelRecommendBtn: {
emits: { onClick: (role) => setAdvertiseOnShowStatus(role) },
props: { type: 'danger' },
extraProps: {
@@ -123,15 +118,15 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetUserClientForBackInput = {
+ let params: API.GetEnterprisesQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- searchKeys: extraParamState.keyword,
+ // searchKeys: extraParamState.keyword,
};
- let res = await flexEnterpriseWokerServices.getUserClientList(params, {
+ let res = await enterpriseServices.getEnterprises(params, {
showLoading: !state.loading,
});
return res;
@@ -144,10 +139,9 @@
status: '' as any as boolean,
beginDate: [] as unknown as ModelValueType,
endDate: [] as unknown as ModelValueType,
- orderInput: [{ property: 'sort', order: OrderInputType.Asc }],
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
},
columnsRenderProps: {},
- columnPropsMap: ['advertiseBeginDate', 'advertiseEndDate'],
}
);
@@ -157,6 +151,6 @@
}
function goDetail(row) {
- router.push({ name: 'TaskDetail', params: { id: row?.id ?? '' } });
+ router.push({ name: 'TaskManageDetail', params: { id: row?.id ?? '' } });
}
</script>
--
Gitblit v1.9.1