修复策划时,时间选择前后顺序问题

This commit is contained in:
weibl
2026-02-24 11:13:41 +08:00
parent 7f779e021d
commit cd84650998
3 changed files with 44 additions and 13 deletions

View File

@@ -208,8 +208,9 @@
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
clearable
:disabled-date="(time: Date) => disabledDate(time, row, 'beginTime')"
@change="changeTimeFun(row, 'beginTime')"
/>
<!-- :disabled-date="(time: Date) => disabledDate(time, row, 'beginTime')" -->
</template>
<!-- 计划结束时间 -->
<template #endTime="{ row, icon }">
@@ -228,8 +229,9 @@
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
clearable
:disabled-date="(time: Date) => disabledDate(time, row, 'endTime')"
@change="changeTimeFun(row, 'endTime')"
/>
<!-- :disabled-date="(time: Date) => disabledDate(time, row, 'endTime')" -->
</template>
<!-- 军令状时间 -->
<template #commitmentDeadline="{ row }">
@@ -681,6 +683,22 @@ const disabledDate = (time: Date, row: any, flag: string) => {
}
};
const changeTimeFun = (row: any, flag: string) => {
console.log('123');
console.log(row[flag], flag);
if (row.endTime && row.beginTime) {
if (new Date(row.endTime).getTime() < new Date(row.beginTime).getTime()) {
if (flag === 'beginTime') {
row.beginTime = row.endTime;
}
if (flag === 'endTime') {
row.endTime = row.beginTime;
}
ElMessage.warning('开始时间不能大于结束时间');
}
}
};
const approveDetailVisible = ref(false);
const approveId = ref('');

View File

@@ -2,6 +2,7 @@ import { cloneDeep } from 'lodash-es';
import { useDict } from './useDict';
import { getTagKeyMap } from './enum/node';
import { TASK_CALCULATE_STATUS, TASK_PROCESS_STATUS } from './enum/task';
import { enableConfigByTenant, TENANT_ENUM } from '@/tenants/tenant';
export const disposeSimType = (demandType: string, simType: string) => {
if (demandType && simType) {
@@ -95,16 +96,29 @@ export const disposeTaskMembers = (disposeKey: string, row: any) => {
return obj;
}
if (disposeKey === 'getListAndIds') {
return {
pMemberList: row.pMemberListArr,
pMemberIds: getMemberListIds(row.pMemberListArr),
eMemberList: row.eMemberListArr,
eMemberIds: getMemberListIds(row.eMemberListArr),
// EP的关注人
payAttentionMemberList: row.payAttentionMemberListArr,
// EP的关注人
payAttentionMemberIds: getMemberListIds(row.payAttentionMemberListArr),
};
if (enableConfigByTenant([TENANT_ENUM.LYRIC])) {
return {
pMemberList: row.pMemberListArr,
pMemberIds: getMemberListIds(row.pMemberListArr),
// eMemberList: row.eMemberListArr,
// eMemberIds: getMemberListIds(row.eMemberListArr),
// EP的关注人
payAttentionMemberList: row.payAttentionMemberListArr,
// EP的关注人
payAttentionMemberIds: getMemberListIds(row.payAttentionMemberListArr),
};
} else {
return {
pMemberList: row.pMemberListArr,
pMemberIds: getMemberListIds(row.pMemberListArr),
eMemberList: row.eMemberListArr,
eMemberIds: getMemberListIds(row.eMemberListArr),
// // EP的关注人
// payAttentionMemberList: row.payAttentionMemberListArr,
// // EP的关注人
// payAttentionMemberIds: getMemberListIds(row.payAttentionMemberListArr),
};
}
}
if (disposeKey === 'getIds') {
return {

View File

@@ -1204,7 +1204,6 @@ const tableFormRef = ref();
const batchUpdateTaskConfirmFun = async () => {
const updateData = tableFormRef.value.getFormDataFun();
const selectTasks = getRightVxeRef().getCheckboxRecords();
debugger;
for (let index = 0; index < selectTasks.length; index++) {
const newObj = {
...selectTasks[index],