update 报告、3d、计算模型 都有才能改为已完成

src/utils/enum/task.ts

@@ -130,7 +130,8 @@ export const TasksStatusColor = {
 export const disposeDisabledExeStatus = (
   status: string,
   option: { value: TASK_PROCESS_STATUS },
-  taskInfo: any
+  taskInfo: any,
+  judgmentTaskFile: boolean = false
 ) => {
   // 审批未通过的 不能改成 已完成 、已关闭 、已闭环
   if (
@@ -146,8 +147,20 @@ export const disposeDisabledExeStatus = (
   if (status === TASK_PROCESS_STATUS.COMPLETED) {
     return true;
   }
+  // if (status === TASK_PROCESS_STATUS.IN_PROGRESS) {
+  //   return [TASK_PROCESS_STATUS.NO_STARTED, TASK_PROCESS_STATUS.CLOSED].includes(option.value);
+  // }
+  // 0313新需求 报告、3d、计算模型都有（judgmentTaskFile 为true）  才能改为已完成
   if (status === TASK_PROCESS_STATUS.IN_PROGRESS) {
-    return [TASK_PROCESS_STATUS.NO_STARTED, TASK_PROCESS_STATUS.CLOSED].includes(option.value);
+    if (!judgmentTaskFile) {
+      return [
+        TASK_PROCESS_STATUS.NO_STARTED,
+        TASK_PROCESS_STATUS.CLOSED,
+        TASK_PROCESS_STATUS.COMPLETED,
+      ].includes(option.value);
+    } else {
+      return [TASK_PROCESS_STATUS.NO_STARTED, TASK_PROCESS_STATUS.CLOSED].includes(option.value);
+    }
   }
   if (status === TASK_PROCESS_STATUS.NO_STARTED) {
     return [

src/views/task/simulationTask/executeTask/index.vue

@@ -80,7 +80,7 @@ import TableForm from '@/components/common/table/tableForm.vue';
 import dayjs from 'dayjs';
 import TaskDetail from '@/views/task/projectDetail/components/taskDetail.vue';
 import { isNumber } from 'lodash-es';
-import { getMemberListIds } from '@/utils/task';
+import { getMemberListIds, judgmentTaskCompletedFun } from '@/utils/task';
 import { jumpPage } from '@/utils/common';
 import { changeTaskStatusCommon, syncDemandList } from '../taskPage';
 import { enableConfigByTenant, TENANT_ENUM } from '@/tenants/tenant';
@@ -131,12 +131,18 @@ const editTaskFun = (row: any) => {
     formLoad();
   });
 };
-const formLoad = () => {
+const formLoad = async () => {
+  const judgmentTaskFile = await judgmentTaskCompletedFun(editRow.value.uuid);
   const exeStatusList = TASK_PROCESS_STATUS_OPTIONS.map((item: any) => {
     return {
       label: item.label,
       value: item.value,
-      disabled: disposeDisabledExeStatus(editRow.value.exeStatus, item, editRow.value),
+      disabled: disposeDisabledExeStatus(
+        editRow.value.exeStatus,
+        item,
+        editRow.value,
+        judgmentTaskFile
+      ),
     };
   });
   const achieveStatusList = TASK_CALCULATE_STATUS_OPTIONS.map((item: any) => {

src/views/task/simulationTask/mySend/index.vue

@@ -89,7 +89,7 @@ import { computed, nextTick, onMounted, ref } from 'vue';
 import Dialog from '@/components/common/dialog/index.vue';
 import TableForm from '@/components/common/table/tableForm.vue';
 import dayjs from 'dayjs';
-import { getMemberListIds } from '@/utils/task';
+import { getMemberListIds, judgmentTaskCompletedFun } from '@/utils/task';
 import { isNumber } from 'lodash-es';
 import taskDetail from '@/views/task/projectDetail/components/taskDetail.vue';
 import { enableConfigByTenant, TENANT_ENUM } from '@/tenants/tenant';
@@ -260,13 +260,19 @@ const changeTaskStatus = async (row: any, status: string) => {
 //     });
 //   }
 // };
-const formLoad = () => {
+const formLoad = async () => {
   // nextTick(() => {
+  const judgmentTaskFile = await judgmentTaskCompletedFun(editRow.value.uuid);
   const exeStatusList = TASK_PROCESS_STATUS_OPTIONS.map((item: any) => {
     return {
       label: item.label,
       value: item.value,
-      disabled: disposeDisabledExeStatus(editRow.value.exeStatus, item, editRow.value),
+      disabled: disposeDisabledExeStatus(
+        editRow.value.exeStatus,
+        item,
+        editRow.value,
+        judgmentTaskFile
+      ),
     };
   });
   const achieveStatusList = TASK_CALCULATE_STATUS_OPTIONS.map((item: any) => {