From 40ed21141404ea96af41bac752b22c0f9a838168 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 10 十一月 2025 14:55:20 +0800
Subject: [PATCH] fix: bug
---
apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue | 51 +------
apps/underTakeMiniApp/src/subpackages/task/taskCheck/InnerPage.vue | 37 +++--
apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue | 37 +++--
apps/underTakeMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 238 ----------------------------------
packages/constants/task.ts | 6
5 files changed, 55 insertions(+), 314 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
index 355261a..3525f58 100644
--- a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
@@ -49,22 +49,27 @@
const { queryState, infiniteLoadingProps } = useCheckReceiveTasks();
function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
- if (
- item.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn &&
- dayjs(queryState.date).isBefore(dayjs(), 'day')
- ) {
- Taro.navigateTo({
- url: `${RouterPath.taskUserSubmitCheckHistories}?id=${item.id}&date=${dayjs(
- queryState.date
- ).format('YYYY-MM-DD')}`,
- });
- } else {
- Taro.navigateTo({
- url: `${RouterPath.taskCheckDetail}?id=${item.id}&date=${dayjs(queryState.date).format(
- 'YYYY-MM-DD'
- )}&checkReceiveStatus=${queryState.checkReceiveStatus}`,
- });
- }
+ // if (
+ // item.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn &&
+ // dayjs(queryState.date).isBefore(dayjs(), 'day')
+ // ) {
+ // Taro.navigateTo({
+ // url: `${RouterPath.taskUserSubmitCheckHistories}?id=${item.id}&date=${dayjs(
+ // queryState.date
+ // ).format('YYYY-MM-DD')}`,
+ // });
+ // } else {
+ // Taro.navigateTo({
+ // url: `${RouterPath.taskCheckDetail}?id=${item.id}&date=${dayjs(queryState.date).format(
+ // 'YYYY-MM-DD'
+ // )}&checkReceiveStatus=${queryState.checkReceiveStatus}`,
+ // });
+ // }
+ Taro.navigateTo({
+ url: `${RouterPath.taskCheckDetail}?id=${item.id}&date=${dayjs(queryState.date).format(
+ 'YYYY-MM-DD'
+ )}&checkReceiveStatus=${queryState.checkReceiveStatus}`,
+ });
}
</script>
diff --git a/apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue b/apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue
index a04fedf..eb1e5e3 100644
--- a/apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue
+++ b/apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue
@@ -9,50 +9,12 @@
:contactPhoneNumber="contactPhoneNumber"
>
<template #actions>
- <template v-if="OrderUtils.isContainCheckIn(checkReceiveMethods)">
- <!-- <nut-button
- v-if="!checkInTime"
- type="primary"
- class="task-check-card-phone-btn"
- @click.stop="emit('checkInOrOut', CheckInOrOutEventEnum.CheckIn)"
- >绛惧埌</nut-button
- >
- <nut-button
- v-else-if="!checkOutTime"
- type="primary"
- class="task-check-card-phone-btn"
- @click.stop="emit('checkInOrOut', CheckInOrOutEventEnum.CheckOut)"
- >绛惧嚭</nut-button
- >
- <div v-else class="task-check-card-phone-status" :style="{ color: Colors.Success }">
- {{ EnumTaskCheckReceiveStatusText[checkReceiveStatus] }}
- </div> -->
- <template
- v-if="props.submitCheckReceiveStatus !== EnumTaskUserSubmitCheckReceiveStatus.Fail"
- >
- <nut-button
- v-if="!checkInTime || !checkOutTime"
- type="primary"
- class="task-check-card-phone-btn"
- @click.stop="handleMore"
- >鎿嶄綔</nut-button
- >
- <div v-else class="task-check-card-phone-status" :style="{ color: Colors.Success }">
- {{ EnumTaskCheckReceiveStatusText[checkReceiveStatus] }}
- </div>
- </template>
- </template>
- <template v-else>
- <nut-button
- v-if="checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive"
- type="primary"
- class="task-check-card-phone-btn"
- >楠屾敹</nut-button
- >
- <div v-else class="task-check-card-phone-status" :style="{ color: Colors.Success }">
- {{ EnumTaskCheckReceiveStatusText[checkReceiveStatus] }}
- </div>
- </template>
+ <div
+ class="task-check-card-phone-status"
+ :style="{ color: EnumTaskCheckReceiveStatusColor[checkReceiveStatus] }"
+ >
+ {{ EnumTaskCheckReceiveStatusText[checkReceiveStatus] }}
+ </div>
</template>
</TaskCheckPersonalView>
</div>
@@ -67,6 +29,7 @@
EnumTaskCheckReceiveMethod,
EnumGetCheckReceiveTasksQueryResultItemCheckStatus,
EnumTaskUserSubmitCheckReceiveStatus,
+ EnumTaskCheckReceiveStatusColor,
} from '@12333/constants';
import { TaskCheckPersonalView } from '@12333/components';
import { CheckInOrOutEventEnum } from '../constants';
diff --git a/apps/underTakeMiniApp/src/subpackages/task/taskCheck/InnerPage.vue b/apps/underTakeMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
index 355261a..3525f58 100644
--- a/apps/underTakeMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
+++ b/apps/underTakeMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
@@ -49,22 +49,27 @@
const { queryState, infiniteLoadingProps } = useCheckReceiveTasks();
function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
- if (
- item.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn &&
- dayjs(queryState.date).isBefore(dayjs(), 'day')
- ) {
- Taro.navigateTo({
- url: `${RouterPath.taskUserSubmitCheckHistories}?id=${item.id}&date=${dayjs(
- queryState.date
- ).format('YYYY-MM-DD')}`,
- });
- } else {
- Taro.navigateTo({
- url: `${RouterPath.taskCheckDetail}?id=${item.id}&date=${dayjs(queryState.date).format(
- 'YYYY-MM-DD'
- )}&checkReceiveStatus=${queryState.checkReceiveStatus}`,
- });
- }
+ // if (
+ // item.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn &&
+ // dayjs(queryState.date).isBefore(dayjs(), 'day')
+ // ) {
+ // Taro.navigateTo({
+ // url: `${RouterPath.taskUserSubmitCheckHistories}?id=${item.id}&date=${dayjs(
+ // queryState.date
+ // ).format('YYYY-MM-DD')}`,
+ // });
+ // } else {
+ // Taro.navigateTo({
+ // url: `${RouterPath.taskCheckDetail}?id=${item.id}&date=${dayjs(queryState.date).format(
+ // 'YYYY-MM-DD'
+ // )}&checkReceiveStatus=${queryState.checkReceiveStatus}`,
+ // });
+ // }
+ Taro.navigateTo({
+ url: `${RouterPath.taskCheckDetail}?id=${item.id}&date=${dayjs(queryState.date).format(
+ 'YYYY-MM-DD'
+ )}&checkReceiveStatus=${queryState.checkReceiveStatus}`,
+ });
}
</script>
diff --git a/apps/underTakeMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/underTakeMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
index f344fdd..a78887e 100644
--- a/apps/underTakeMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
+++ b/apps/underTakeMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
@@ -25,114 +25,9 @@
:checkReceiveStatus="item.checkReceiveStatus"
:checkReceiveMethods="detail?.checkReceiveMethods"
:submitCheckReceiveStatus="item.submitCheckReceiveStatus"
- @checkReceive="goTaskDetail(item)"
- @checkInOrOut="(ev) => checkReceiveTask(ev, item)"
/>
</template>
</InfiniteLoading>
- <nut-popup v-model:visible="dialogVisible">
- <div class="payroll-form-wrapper">
- <nut-form :model-value="form" ref="formRef">
- <nut-form-item
- label="鏈嶅姟璐�:"
- class="bole-form-item"
- prop="serviceFee"
- label-width="90px"
- >
- <div class="bole-form-input-wrapper">
- <NumberInput
- v-model.trim="form.serviceFee"
- class="nut-input-text bole-input-text"
- placeholder="璇疯緭鍏ユ湇鍔¤垂"
- :min="0"
- :max="999999999999"
- :precision="2"
- type="text"
- disabled
- />
- <div class="form-input-unit">鍏�</div>
- </div>
- </nut-form-item>
- <nut-form-item
- label="瓒呮椂:"
- class="bole-form-item"
- prop="timeoutHours"
- label-width="90px"
- >
- <div class="bole-form-input-wrapper">
- <NumberInput
- v-model.trim="form.timeoutHours"
- class="nut-input-text bole-input-text"
- placeholder="璇疯緭鍏ヨ秴鏃舵椂闀�"
- :min="0"
- :max="999999999999"
- :precision="2"
- type="text"
- @change="onTimeoutHoursChange"
- />
- <div class="form-input-unit">灏忔椂</div>
- </div>
- </nut-form-item>
- <nut-form-item
- label="瓒呮椂璐圭敤:"
- class="bole-form-item"
- prop="timeoutFee"
- label-width="90px"
- >
- <div class="bole-form-input-wrapper">
- <NumberInput
- v-model.trim="form.timeoutFee"
- class="nut-input-text bole-input-text"
- placeholder="璇疯緭鍏ヨ秴鏃惰垂鐢�"
- :min="0"
- :max="999999999999"
- :precision="2"
- type="text"
- />
- <div class="form-input-unit">鍏�</div>
- </div>
- </nut-form-item>
- <nut-form-item
- label="鍏朵粬璐圭敤:"
- class="bole-form-item"
- prop="otherFee"
- label-width="90px"
- >
- <div class="bole-form-input-wrapper">
- <NumberInput
- v-model.trim="form.otherFee"
- class="nut-input-text bole-input-text"
- placeholder="璇疯緭鍏ュ叾浠栬垂鐢�"
- :max="999999999999"
- :precision="2"
- type="text"
- />
- <div class="form-input-unit">鍏�</div>
- </div>
- </nut-form-item>
- <nut-form-item
- label="缁撶畻閲戦:"
- class="bole-form-item"
- prop="settlementAmount"
- label-width="90px"
- >
- {{ `${settlementAmount}鍏僠 }}
- </nut-form-item>
- <nut-form-item
- label="澶囨敞:"
- class="bole-form-item alignTop"
- prop="remark"
- label-width="90px"
- >
- <nut-textarea v-model="form.remark" rows="4" placeholder="璇疯緭鍏ュ娉�"> </nut-textarea>
- </nut-form-item>
- </nut-form>
- <div class="payroll-form-footer">
- <nut-button @click="handleCancel">鍙栨秷</nut-button>
- <nut-button type="primary" @click="handleConfirm">纭</nut-button>
- </div>
- </div>
- </nut-popup>
</LoadingLayout>
</template>
@@ -159,21 +54,6 @@
const date = router.params?.date ?? '';
const checkReceiveStatus = Number(router.params?.checkReceiveStatus);
-const dialogVisible = ref(false);
-
-const form = reactive({
- serviceFee: 0,
- timeoutHours: 0,
- timeoutFee: 0,
- otherFee: 0,
- remark: '',
- timeoutServiceFee: 0,
-
- taskInfoId: '',
- checkInTime: '',
- checkoutTime: '',
-});
-
const detail = ref<API.GetCheckReceiveTasksQueryResultItem>();
const { infiniteLoadingProps } = useInfiniteLoading(
@@ -198,124 +78,6 @@
queryKey: ['taskCheckReceiveServices/getCheckReceiveTask'],
}
);
-
-const settlementAmount = computed(() => sumSettlementAmount());
-
-function onTimeoutHoursChange(event: any) {
- form.timeoutFee = Number(form.timeoutServiceFee)
- ? form.timeoutServiceFee * event.detail.value
- : 0;
-}
-
-function sumSettlementAmount() {
- return toRound(
- getFeeValue(Number(form.timeoutFee ?? 0)) +
- getFeeValue(Number(form.serviceFee ?? 0)) +
- getFeeValue(Number(form.otherFee ?? 0))
- );
-}
-
-function getFeeValue(val: number) {
- return val || 0;
-}
-
-async function openDialog(item: API.GetCheckReceiveTaskQueryResultItem) {
- let res = await calcTaskCheckReceive(item);
- if (res) {
- dialogVisible.value = true;
- form.taskInfoId = item.id;
- form.serviceFee = res.serviceFee ?? 0;
- form.timeoutHours = res.timeoutHours ?? 0;
- form.timeoutServiceFee = detail.value?.timeoutServiceFee ?? 0;
- form.otherFee = 0;
- form.timeoutFee = 0;
- form.remark = '';
- }
-}
-
-function handleCancel() {
- dialogVisible.value = false;
-}
-
-async function handleConfirm() {
- try {
- let params: API.CheckReceiveTaskCommand = {
- taskInfoUserId: form.taskInfoId,
- date: dayjs(date).format('YYYY-MM-DD'),
- // checkOutTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
- checkReceiveStatus: EnumTaskUserSubmitCheckReceiveStatus.Success,
- serviceFee: form.serviceFee,
- timeoutHours: form.timeoutHours,
- timeoutFee: form.timeoutFee,
- otherFee: form.otherFee,
- remark: form.remark,
- settlementAmount: settlementAmount.value,
- };
- let res = await taskCheckReceiveServices.checkReceiveTask(params);
- if (res) {
- Message.success('鎻愪氦鎴愬姛');
- dialogVisible.value = false;
- infiniteLoadingProps.value?.refetch?.();
- }
- } catch (error) {}
-}
-
-async function calcTaskCheckReceive(item: API.GetCheckReceiveTaskQueryResultItem) {
- try {
- let params: API.CalcTaskCheckReceiveCommand = {
- taskInfoId: id,
- checkInTime: dayjs(item.checkInTime).format('YYYY-MM-DD HH:mm:ss'),
- checkOutTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
- };
- return await taskCheckReceiveServices.calcTaskCheckReceive(params);
- } catch (error) {}
-}
-
-function goTaskDetail(item: API.GetCheckReceiveTaskQueryResultItem) {
- if (detail.value.checkReceiveMethod !== EnumTaskCheckReceiveMethod.CheckIn) {
- if (item.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed) {
- Taro.navigateTo({
- url: `${RouterPath.taskCheckedDetail}?id=${item.id}`,
- });
- }
- if (
- item.checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive ||
- item.checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitSubmit
- ) {
- Taro.navigateTo({
- url: `${RouterPath.taskHandleCheckDetail}?id=${item.id}&date=${date}`,
- });
- }
- }
-}
-
-async function checkReceiveTask(
- ev: EnumTaskUserSubmitCheckReceiveStatus,
- item: API.GetCheckReceiveTaskQueryResultItem
-) {
- try {
- let params: API.CheckReceiveTaskCommand = {
- taskInfoUserId: item.id,
- date: dayjs(date).format('YYYY-MM-DD'),
- };
- if (ev === EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive) {
- params.checkInTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
- params.checkReceiveStatus = ev;
- } else if (ev === EnumTaskUserSubmitCheckReceiveStatus.Success) {
- openDialog(item);
- return;
- // params.checkOutTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
- // params.checkReceiveStatus = ev;
- } else if (ev === EnumTaskUserSubmitCheckReceiveStatus.Fail) {
- params.checkReceiveStatus = ev;
- }
- let res = await taskCheckReceiveServices.checkReceiveTask(params);
- if (res) {
- Message.success('鎻愪氦鎴愬姛');
- infiniteLoadingProps.value?.refetch?.();
- }
- } catch (error) {}
-}
</script>
<style lang="scss">
@import '@/styles/common.scss';
diff --git a/packages/constants/task.ts b/packages/constants/task.ts
index 267fe8c..3c4372f 100644
--- a/packages/constants/task.ts
+++ b/packages/constants/task.ts
@@ -106,6 +106,12 @@
[EnumTaskCheckReceiveStatus.Completed]: '宸查獙鏀�',
};
+export const EnumTaskCheckReceiveStatusColor = {
+ [EnumTaskCheckReceiveStatus.WaitSubmit]: Colors.Warning,
+ [EnumTaskCheckReceiveStatus.WaitCheckReceive]: Colors.Warning,
+ [EnumTaskCheckReceiveStatus.Completed]: Colors.Success,
+};
+
export const EnumTaskUserSubmitCheckReceiveStatusText = {
[EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit]: '寰呮彁浜�',
[EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive]: '寰呴獙鏀�',
--
Gitblit v1.9.1