From 201ca4f20ce2dd1b2e4c5ec0a7f09f377e923195 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 15 八月 2025 16:32:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue | 113 ++++++++++++++++++++++++++++----------------------------
1 files changed, 57 insertions(+), 56 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue
index 84ccdba..dd7e95c 100644
--- a/apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue
@@ -2,30 +2,32 @@
<LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch">
<ContentScrollView style="background-color: #fff">
<div class="personal-info-wrapper">
- <TaskCheckPersonalView />
+ <TaskCheckPersonalView
+ :avatarUrl="setOSSLink(detail?.enterpriseEmployeeUser?.avatar)"
+ :name="detail?.enterpriseEmployeeUser?.name"
+ :isReal="detail?.enterpriseEmployeeUser?.isReal"
+ :contactPhoneNumber="detail?.enterpriseEmployeeUser?.contactPhoneNumber"
+ />
</div>
- <div class="taskCheckDetail-status-wrapper">
- <div class="taskCheckDetail-status-title">楠屾敹鐓х墖</div>
- </div>
- <div class="taskCheckDetail-time">2024.11.14 9:28:39</div>
- <nut-grid
- square
- :column-num="3"
- :border="false"
- :gutter="20"
- v-if="list.length > 0"
- class="pro-img-grid"
- >
- <nut-grid-item v-for="(item, index) in list" :key="item" class="pro-img-grid-item">
- <div class="pro-img-grid-img-item">
- <PreviewImage :src="item" class="pro-img-grid-img" :urls="list" />
- </div>
- </nut-grid-item>
- </nut-grid>
+ <div class="taskCheckFileCard-status-title">楠屾敹鐓х墖</div>
+ <TaskCheckFileCard
+ :created-time="detail?.createdTime"
+ :files="detail?.files?.map((x) => setOSSLink(x))"
+ ></TaskCheckFileCard>
</ContentScrollView>
<PageFooter>
- <PageFooterBtn type="primary" :color="Colors.Info" class="dark-btn">楠屾敹鏈�氳繃</PageFooterBtn>
- <PageFooterBtn type="primary">楠屾敹閫氳繃</PageFooterBtn>
+ <PageFooterBtn
+ type="primary"
+ :color="Colors.Info"
+ class="dark-btn"
+ @click="checkReceiveTask(EnumTaskUserSubmitCheckReceiveStatus.Fail)"
+ >楠屾敹鏈�氳繃</PageFooterBtn
+ >
+ <PageFooterBtn
+ type="primary"
+ @click="checkReceiveTask(EnumTaskUserSubmitCheckReceiveStatus.Success)"
+ >楠屾敹閫氳繃</PageFooterBtn
+ >
</PageFooter>
</LoadingLayout>
</template>
@@ -33,17 +35,21 @@
<script setup lang="ts">
import Taro from '@tarojs/taro';
import { useQuery } from '@tanstack/vue-query';
-import * as flexWorkerServices from '@12333/services/api/FlexWorker';
+import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive';
import TaskCheckPersonalView from '../components/TaskCheckPersonalView.vue';
-import { PreviewImage } from '@12333/components';
-import { Colors } from '@12333/constants';
+import { TaskCheckFileCard } from '@12333/components';
+import { Colors, EnumTaskUserSubmitCheckReceiveStatus } from '@12333/constants';
+import { Message, setOSSLink } from '@12333/utils';
+import dayjs from 'dayjs';
+import { goBack } from '@/utils';
defineOptions({
name: 'InnerPage',
});
const router = Taro.useRouter();
-const taskId = router.params?.id ?? '';
+const id = router.params?.id ?? '';
+const date = router.params?.date ?? '';
const {
isLoading,
@@ -51,57 +57,52 @@
data: detail,
refetch,
} = useQuery({
- queryKey: ['flexWorkerServices/getOrdeForDetail', taskId],
+ queryKey: ['flexWorkerServices/getOrdeForDetail', id, date],
queryFn: async () => {
- return await flexWorkerServices.getOrdeForDetail(
- { id: taskId },
+ return await taskCheckReceiveServices.getCheckReceiveTaskUserSubmit(
+ { taskInfoUserId: id, date: dayjs(date).format('YYYY-MM-DD') },
{
showLoading: false,
}
);
},
- placeholderData: () => ({} as API.OrderInfoDto),
+ placeholderData: () => ({} as API.GetCheckReceiveTaskUserSubmitQueryResult),
});
-const list = ref([
- 'https://storage.360buyimg.com/jdc-article/NutUItaro34.jpg',
- 'https://storage.360buyimg.com/jdc-article/NutUItaro2.jpg',
- 'https://storage.360buyimg.com/jdc-article/welcomenutui.jpg',
- 'https://storage.360buyimg.com/jdc-article/fristfabu.jpg',
-]);
+async function checkReceiveTask(checkReceiveStatus: EnumTaskUserSubmitCheckReceiveStatus) {
+ try {
+ let params: API.CheckReceiveTaskCommand = {
+ id: detail.value?.id,
+ checkReceiveStatus: checkReceiveStatus,
+ };
+ let res = await taskCheckReceiveServices.checkReceiveTask(params);
+ if (res) {
+ Message.success('鎻愪氦鎴愬姛', {
+ onClosed() {
+ goBack();
+ },
+ });
+ }
+ } catch (error) {}
+}
</script>
<style lang="scss">
@import '@/styles/common.scss';
.taskHandleCheckDetail-page-wrapper {
- .personal-info-wrapper {
- padding-top: 52px;
- padding-bottom: 36px;
- border-bottom: 1px solid #d9d9d9;
- margin-bottom: 22px;
- }
-
- .taskCheckDetail-status-wrapper {
- display: flex;
- align-items: center;
+ .taskCheckFileCard-status-title {
font-weight: 600;
font-size: 28px;
line-height: 32px;
margin-bottom: 16px;
-
- .taskCheckDetail-status-title {
- color: boleGetCssVar('text-color', 'primary');
- flex: 1;
- min-width: 0;
- }
+ color: boleGetCssVar('text-color', 'primary');
}
- .taskCheckDetail-time {
- font-weight: 400;
- font-size: 24px;
- color: boleGetCssVar('text-color', 'regular');
- line-height: 36px;
+ .personal-info-wrapper {
+ padding-top: 52px;
+ padding-bottom: 36px;
+ border-bottom: 1px solid #d9d9d9;
margin-bottom: 22px;
}
}
--
Gitblit v1.9.1