From 5eb6e6bab29554390851bbed86615110e62efa48 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 11 八月 2025 13:43:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
index 65077aa..29401b3 100644
--- a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
@@ -8,18 +8,19 @@
title-gutter="12"
title-scroll
>
- <ProTabPane :title="`宸茬绾" :pane-key="TaskStatus.All"></ProTabPane>
- <ProTabPane :title="`寰呯绾" :pane-key="TaskStatus.WaitSign"></ProTabPane>
- <ProTabPane :title="`宸茶В绾" :pane-key="TaskStatus.Effect"></ProTabPane>
+ <ProTabPane :title="`宸茬绾" :pane-key="FlexWorkerEleSignEnum.HasSign"></ProTabPane>
+ <ProTabPane :title="`寰呯绾" :pane-key="FlexWorkerEleSignEnum.WaitSign"></ProTabPane>
+ <ProTabPane :title="`宸茶В绾" :pane-key="FlexWorkerEleSignEnum.CancelSign"></ProTabPane>
</ProTabs>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list home-list"
v-bind="infiniteLoadingProps"
+ :key="queryState.mineHireType"
>
<template #renderItem="{ item }">
<FlexJobCard :show-done-detail="false" :show-footer-left="false" @click="goDetail(item)">
<template #footerRight>
- <template v-if="Number(queryState.mineHireType) === TaskStatus.All">
+ <template v-if="queryState.mineHireType === FlexWorkerEleSignEnum.HasSign">
<nut-button
class="flexJobManage-card-plain-button"
type="default"
@@ -42,7 +43,7 @@
import { useInfiniteLoading } from '@12333/hooks';
import { OrderInputType } from '@12333/constants';
import * as flexWorkerServices from '@12333/services/api/FlexWorker';
-import { TaskStatus } from '@/constants/task';
+import { FlexWorkerEleSignEnum } from '@12333/constants/task';
import Taro from '@tarojs/taro';
defineOptions({
@@ -50,12 +51,13 @@
});
const queryState = reactive({
- mineHireType: TaskStatus.All,
+ mineHireType: FlexWorkerEleSignEnum.HasSign,
});
const { infiniteLoadingProps } = useInfiniteLoading(
({ pageParam }) => {
- let params: API.GetFlexTaskListInput = {
+ let params: API.GetFlexSignWorkerListInput = {
+ signStatus: queryState.mineHireType,
pageModel: {
rows: 20,
page: pageParam,
@@ -63,24 +65,24 @@
},
};
- return flexWorkerServices.getFlexTaskByArrange(params, {
+ return flexWorkerServices.getFlexSignWorkerList(params, {
showLoading: false,
});
},
{
- queryKey: ['flexWorkerServices/getFlexTaskByArrange'],
+ queryKey: ['flexWorkerServices/getFlexSignWorkerList', queryState],
}
);
-function goDetail(item: API.GetFlexTaskListOutput) {
+function goDetail(item: API.GetNewestWorkerListOutput) {
Taro.navigateTo({
- url: `${RouterPath.flexJobDetailFromManage}?id=${item.taskId}`,
+ url: `${RouterPath.flexJobDetailFromManage}?userId=${item.userId}`,
});
}
function checkContract() {}
function handleUnContract() {}
-function goSignContract(item: API.GetFlexTaskListOutput) {
+function goSignContract(item: API.GetNewestWorkerListOutput) {
Taro.navigateTo({
url: `${RouterPath.flexJobSign}`,
});
--
Gitblit v1.9.1