From f1582014efff0eb7997d3fa79226319d1fe4ba52 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 21 十月 2025 21:36:08 +0800
Subject: [PATCH] fix: bug
---
src/views/EmploymentManage/CheckReceiveTaskDetail.vue | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/views/EmploymentManage/CheckReceiveTaskDetail.vue b/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
index d52653d..b56f43e 100644
--- a/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
+++ b/src/views/EmploymentManage/CheckReceiveTaskDetail.vue
@@ -32,7 +32,7 @@
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="8">
- <ProFormItemV2 label="鍙戝竷鏃ユ湡:">
+ <ProFormItemV2 label="缁撴潫鏃ユ湡:">
{{ dayjs(taskInfo.endTime ?? '').format('YYYY-MM-DD') }}
</ProFormItemV2>
</ProFormColItem>
@@ -48,6 +48,7 @@
</ProTableV2>
</AppContainer>
<CheckManageDialog v-bind="dialogProps" />
+ <ManualCheckManageDialog v-bind="dialogManualProps" />
</LoadingLayout>
</template>
@@ -72,6 +73,7 @@
import { EnumBillingMethodUnitText } from '@/constants';
import dayjs from 'dayjs';
import CheckManageDialog from './components/CheckManageDialog.vue';
+import ManualCheckManageDialog from './components/ManualCheckManageDialog.vue';
defineOptions({
name: 'CheckReceiveTaskDetail',
@@ -88,7 +90,8 @@
},
extraProps: {
hide: (row: API.GetCheckReceiveTaskQueryResultItem) =>
- row.checkReceiveStatus !== EnumTaskCheckReceiveStatus.WaitCheckReceive,
+ row.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed ||
+ state.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn,
},
},
{
@@ -120,6 +123,7 @@
const BaseState = {
loading: true,
+ checkReceiveMethod: '' as any as EnumTaskCheckReceiveMethod,
};
const state = reactive({ ...BaseState });
@@ -155,6 +159,7 @@
let res = await taskCheckReceiveServices.getCheckReceiveTask(params, {
showLoading: !state.loading,
});
+ state.checkReceiveMethod = res.objectData?.checkReceiveMethod;
return res;
} catch (error) {}
},
@@ -171,10 +176,16 @@
);
function openDialog(row: API.GetCheckReceiveTaskQueryResultItem, isDetail = false) {
- handleEdit({
- id: row.id,
- isDetail,
- });
+ if (state.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn) {
+ handleManualEdit({
+ id: row.id,
+ });
+ } else {
+ handleEdit({
+ id: row.id,
+ isDetail,
+ });
+ }
}
const { dialogProps, handleEdit } = useFormDialog({
@@ -183,4 +194,10 @@
isDetail: false,
},
});
+
+const { dialogProps: dialogManualProps, handleEdit: handleManualEdit } = useFormDialog({
+ defaultFormParams: {
+ id: '',
+ },
+});
</script>
--
Gitblit v1.9.1