From da109a468d7065fb1a0201cc2a81fb189e3f62cd Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 08 八月 2025 10:46:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin

---
 src/views/TaskManage/TaskManageList.vue |   53 ++++++++++++++++++++++-------------------------------
 1 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/src/views/TaskManage/TaskManageList.vue b/src/views/TaskManage/TaskManageList.vue
index 3be9206..b6433ff 100644
--- a/src/views/TaskManage/TaskManageList.vue
+++ b/src/views/TaskManage/TaskManageList.vue
@@ -3,19 +3,10 @@
     <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"
+              v-model="extraParamState.releaseStatus"
+              :value-enum="EnumTaskReleaseStatusText"
               buttonStyle
               showAllBtn
               @change="getList()"
@@ -23,8 +14,8 @@
           </QueryFilterItem>
           <QueryFilterItem tip-content="鎺ㄨ崘鐘舵��">
             <FieldRadio
-              v-model="extraParamState.status"
-              :value-enum="FlexWorkerEleSignEnumText"
+              v-model="extraParamState.recommendStatus"
+              :value-enum="EnumTaskRecommendStatusText"
               buttonStyle
               showAllBtn
               @change="getList()"
@@ -32,7 +23,7 @@
           </QueryFilterItem>
           <QueryFilterItem tip-content="鍙戝竷鏃堕棿">
             <FieldDatePicker
-              v-model="extraParamState.beginDate"
+              v-model="extraParamState.time"
               type="daterange"
               range-separator="~"
               start-placeholder="寮�濮嬫棩鏈�"
@@ -43,7 +34,7 @@
           </QueryFilterItem>
           <QueryFilterItem>
             <SearchInput
-              v-model="extraParamState.keyword"
+              v-model="extraParamState.keywords"
               style="width: 260px"
               placeholder="浠诲姟鍚嶇О"
               @on-click-search="getList"
@@ -69,13 +60,12 @@
   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 taskServices from '@/services/api/task';
+import { EnumTaskReleaseStatusText, EnumTaskRecommendStatusText } from '@/constants';
 
 defineOptions({
   name: 'OperationManageList',
@@ -83,13 +73,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 +113,18 @@
 } = useTable(
   async ({ pageIndex, pageSize }, extraParamState) => {
     try {
-      let params: API.GetUserClientForBackInput = {
+      let params: API.GetTaskInfosQuery = {
         pageModel: {
           rows: pageSize,
           page: pageIndex,
           orderInput: extraParamState.orderInput,
         },
-        searchKeys: extraParamState.keyword,
+        keywords: extraParamState.keywords,
+        releaseStatus: extraParamState.releaseStatus,
+        recommendStatus: extraParamState.recommendStatus,
+        // time: extraParamState.time,
       };
-      let res = await flexEnterpriseWokerServices.getUserClientList(params, {
+      let res = await taskServices.getTaskInfos(params, {
         showLoading: !state.loading,
       });
       return res;
@@ -139,15 +132,13 @@
   },
   {
     defaultExtraParams: {
-      keyword: '',
-      pageType: '' as any as number,
-      status: '' as any as boolean,
-      beginDate: [] as unknown as ModelValueType,
-      endDate: [] as unknown as ModelValueType,
-      orderInput: [{ property: 'sort', order: OrderInputType.Asc }],
+      keywords: '',
+      releaseStatus: '' as any as EnumTaskReleaseStatus,
+      recommendStatus: '' as any as EnumTaskRecommendStatus,
+      time: [] as unknown as ModelValueType,
+      orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
     },
     columnsRenderProps: {},
-    columnPropsMap: ['advertiseBeginDate', 'advertiseEndDate'],
   }
 );
 
@@ -157,6 +148,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