merge

2026-04-08 09:46:02 +08:00
parent cf0ed12241 883a7ed77a
commit 7bdf77a4d8
15 changed files with 90 additions and 45 deletions
--- a/src/components/flow/flowFileUpload.vue
+++ b/src/components/flow/flowFileUpload.vue
@@ -57,10 +57,10 @@
  <div class="upload-page" v-if="setectType === 2">
    <el-select v-model="rowInfo.defaultValue" :disabled="readonly" multiple @change="updateFun">
      <el-option
-        v-for="item in selectFileList"
-        :key="item.id"
-        :label="item.originalName"
-        :value="item.filePath"
+        v-for="item in AllFileList"
+        :key="item?.id"
+        :label="item?.originalName"
+        :value="item?.filePath"
      >
      </el-option>
    </el-select>
@@ -71,7 +71,7 @@
 import { onMounted, ref, watch } from 'vue';
 import selectFlowNodeFile from './selectFlowNodeFile.vue';
 import { cloneDeep } from 'lodash-es';
-import { queryRunDirApi } from '@/api/project/run';
+// import { queryRunDirApi } from '@/api/project/run';

 const props = defineProps({
  dirId: {
@@ -106,6 +106,7 @@ const fileList = ref<any>([]);
 const rowInfo = ref<any>({});
 const uploalLocal = ref('online');
 const uploadRef = ref();
+const AllFileList = ref<any>([]);

 const selectOnlineFileFun = () => {
  visible.value = true;
@@ -184,6 +185,19 @@ watch(
  }
 );

+watch(
+  () => props.selectFileList,
+  (newVal) => {
+    if (newVal) {
+      AllFileList.value = newVal;
+    }
+  },
+  {
+    immediate: true,
+    deep: true,
+  }
+);
+
 defineExpose({
  // queryFileList,
 });
--- a/src/components/flow/flowNodeParamTable.vue
+++ b/src/components/flow/flowNodeParamTable.vue
@@ -1,6 +1,8 @@
 <template>
  <div class="flow-node-param-page">
    <div class="table-box">
+      <!-- :data="tableData" -->
+
      <BaseTable
        ref="baseTableRef"
        hide-pagination
@@ -12,7 +14,6 @@
          rowField: 'vModel',
          childrenField: 'children',
        }"
-        :data="tableData"
        :full-height="true"
        :show-setting="false"
      >
@@ -624,6 +625,10 @@ watch(
      }

      formatDataFun(tableData.value, 0);
+
+      nextTick(() => {
+        baseTableRef.value.setDataFun(tableData.value);
+      });
    }
  },
  {
--- a/src/components/project/phaseInfoDialog.vue
+++ b/src/components/project/phaseInfoDialog.vue
@@ -103,6 +103,7 @@ const props = defineProps<{
  nodeLevel1Uuid?: string;
  projectBeginTime?: string;
  projectEndTime?: string;
+  projectInfo?: any;
 }>();

 const { t } = useI18n();
@@ -136,6 +137,9 @@ const actionList = ref([
    click: (row: any) => {
      disposeDeleteListFun(row);
    },
+    hide: (row: any) => {
+      return row.projectSource === 'EP';
+    },
  },
 ]);

--- a/src/components/taskDetail/resultImage.vue
+++ b/src/components/taskDetail/resultImage.vue
@@ -54,10 +54,10 @@
            <el-button @click="refreshFun">刷新</el-button>
          </template>

-          <template #cardTemplate="{ tableData }">
+          <template #cardTemplate>
            <ImageCard
              ref="imageCardRef"
-              :list="tableData"
+              :list="getTableDatas()"
              :columnCount="columnCount"
              :showDelete="showLeftOptions && canUpdate"
              @download="downloadFileFun"
@@ -142,6 +142,11 @@ const accept = ref<any>('');
 const refreshFun = () => {
  baseTableRef.value.resetFun();
 };
+
+const getTableDatas = () => {
+  const { tableData } = baseTableRef.value.tableRef.getTableData();
+  return tableData;
+};
 const queryTaskRunFun = async (id: any) => {
  const res: any = await queryTaskRunApi({ taskId: id });
  if (res && res.code === 200) {
--- a/src/tenants/lyric/views/competenceCenter/standardScene/index.vue
+++ b/src/tenants/lyric/views/competenceCenter/standardScene/index.vue
@@ -770,7 +770,7 @@ const createTaskPoolFun = async (formData: any) => {
  const wrappedNodes = wrapWithVirtualNodeFun(nodes);
  const pickedNodes = transformTreeToPoolNodes(wrappedNodes);

-  const poolBrief = {
+  const poolBrief:any = {
    poolName: currentPoolBrief.value.poolName,
    tenantId: currentPoolBrief.value.tenantId,
  };
--- a/src/views/competenceCenter/condition/components/taskPool.vue
+++ b/src/views/competenceCenter/condition/components/taskPool.vue
@@ -544,7 +544,7 @@ const createTaskPoolFun = async (formData: any) => {
  const nodes = cloneDeep(fullData);
  const pickedNodes = transformTreeToPoolNodes(nodes);

-  const poolBrief = {
+  const poolBrief: any = {
    poolName: currentPoolBrief.value.poolName,
    tenantId: currentPoolBrief.value.tenantId,
  };
--- a/src/views/task/execution/components/runDetailPage/index.vue
+++ b/src/views/task/execution/components/runDetailPage/index.vue
@@ -143,7 +143,7 @@
                  <div class="tabs-info-content">
                    <flowNodeParamTable
                      ref="flowNodeParamTableRef"
-                      v-show="nodeActiveName === 'info'"
+                      v-if="nodeActiveName === 'info'"
                      :node-params="nodeParamDataList"
                      :current-node="flowNode"
                      :page-info="flowNodeData"
@@ -437,9 +437,11 @@ const toggleRightFullScreenFun = () => {

 const handleLeftClickFun = async () => {
  if (nodeActiveName.value === 'info') {
-    if (flowNodeParamTableRef.value) {
-      await flowNodeParamTableRef.value.queryFileList(flowNodeData.value.inputDirId);
-    }
+    setTimeout(() => {
+      if (flowNodeParamTableRef.value) {
+        flowNodeParamTableRef.value.queryFileList(flowNodeData.value.inputDirId);
+      }
+    }, 200);
  }
 };

@@ -472,7 +474,7 @@ const changeCurrentFlowNodeFun = (info: any) => {
  flowNodeParamData.value = flowNode.value?.store?.data?.data || {};
  runFlowPocesInfo.value = process;
  onlineFileParam.value = {
-    processDefinitionId: process.processDefinitionId,
+    processDefinitionId: process?.processDefinitionId,
    runId: data.runId,
    nodeId: data.nodeId,
    beforeNodeId: flowNodeParamData.value?.beforeNodeId,
@@ -510,15 +512,17 @@ const updateFlowPageParamListFun = (data: any) => {
 };

 const resetTableDataFun = (obj: any, list: any) => {
-  for (let i = 0; i < list.length; i++) {
-    if (!list[i]?.englishLabel) {
-      if (obj[list[i].vModel] && list[i]?.children?.length) {
-        resetTableDataFun(obj[list[i].vModel], list[i].children);
-      }
-    } else {
-      for (const key in obj) {
-        if (list[i]?.englishLabel === key) {
-          list[i].defaultValue = obj[key];
+  if (obj) {
+    for (let i = 0; i < list.length; i++) {
+      if (!list[i]?.englishLabel) {
+        if (obj[list[i].vModel] && list[i]?.children?.length) {
+          resetTableDataFun(obj[list[i].vModel], list[i].children);
+        }
+      } else {
+        for (const key in obj) {
+          if (list[i]?.englishLabel === key) {
+            list[i].defaultValue = obj[key];
+          }
        }
      }
    }
--- a/src/views/task/execution/components/runDetailPage/runPagecomponent/asyncRunFile.vue
+++ b/src/views/task/execution/components/runDetailPage/runPagecomponent/asyncRunFile.vue
@@ -49,7 +49,7 @@ const props = defineProps({
 const emits = defineEmits(['close', 'finished']);

 const { ALL_FILE_TYPE }: any = useDict('ALL_FILE_TYPE');
-const fileTypeList = ref<any>(ALL_FILE_TYPE.value['A']);
+const fileTypeList = ref<any>(ALL_FILE_TYPE?.value['A']);
 const showSyncFileTypeSelectFlag = ref(true);
 const formData = reactive<any>({
  fileType: '',
--- a/src/views/task/execution/components/runDetailPage/runPagecomponent/resultData.vue
+++ b/src/views/task/execution/components/runDetailPage/runPagecomponent/resultData.vue
@@ -622,8 +622,8 @@ const formData = reactive<any>({
  fileType: [],
  discipline: '',
 });
-const fileTypeList = ref<any>(ALL_FILE_TYPE.value['A']);
-const disciplineList = ref<any>(DISCIPLINE_TYPE.value['A']);
+const fileTypeList = ref<any>(ALL_FILE_TYPE?.value['A']);
+const disciplineList = ref<any>(DISCIPLINE_TYPE?.value['A']);
 const viewType = ref('card');

 const getRunInfoDirsFun = async () => {
@@ -1052,7 +1052,6 @@ const getparamListFUn = () => {
 const viewFiles = ref<any>([]);

 const viewFun = () => {
-
  if (viewType.value === 'list') {
    viewFiles.value = baseTableRef.value.tableRef.getCheckboxRecords();
  } else {
@@ -1106,6 +1105,13 @@ const canvasCloseFun = () => {
  showChart.value = false;
 };

+const getTableDatas = () => {
+  if (baseTableRef.value) {
+    const { tableData } = baseTableRef.value.tableRef.getTableData();
+    return tableData;
+  }
+};
+
 const showChart = ref(false);
 const changeImageNumberFun = () => {
  setChartFun();
--- a/src/views/task/execution/components/taskDetailPage/components/taskResultCsv.vue
+++ b/src/views/task/execution/components/taskDetailPage/components/taskResultCsv.vue
@@ -210,8 +210,8 @@ const formData = reactive<any>({
  fileType: [`${FILE_TYPE.CANVAS_FILE}`],
  discipline: '',
 });
-const fileTypeList = ref<any>(ALL_FILE_TYPE.value['A']);
-const disciplineList = ref<any>(DISCIPLINE_TYPE.value['A']);
+const fileTypeList = ref<any>(ALL_FILE_TYPE?.value['A']);
+const disciplineList = ref<any>(DISCIPLINE_TYPE?.value['A']);

 const actionList = ref([
  {
@@ -444,7 +444,7 @@ const submitFun = async () => {

    uploadFileData.value[i].dictTags = uploadFileData.value[i].dictTags.join(',');
    for (const key in uploadFileData.value[i]) {
-      if (key != '_X_ROW_KEY' && key != 'unitsList') {
+      if (!['_X_ROW_KEY', 'unitsList', 'yunitsList', 'xunitsList', 'id'].includes(key)) {
        paramData[key] = uploadFileData.value[i][key];
      }
    }
--- a/src/views/task/execution/components/taskDetailPage/components/taskResultImage.vue
+++ b/src/views/task/execution/components/taskDetailPage/components/taskResultImage.vue
@@ -197,8 +197,8 @@ const formData = reactive<any>({
  fileType: [`${FILE_TYPE.PNG_FILE}`],
  discipline: '',
 });
-const fileTypeList = ref<any>(ALL_FILE_TYPE.value['A']);
-const disciplineList = ref<any>(DISCIPLINE_TYPE.value['A']);
+const fileTypeList = ref<any>(ALL_FILE_TYPE?.value['A']);
+const disciplineList = ref<any>(DISCIPLINE_TYPE?.value['A']);

 const actionList = ref([
  {
--- a/src/views/task/projectDetail/components/taskDetail.vue
+++ b/src/views/task/projectDetail/components/taskDetail.vue
@@ -538,7 +538,7 @@ const getTaskImportLevelFun = () => {
 };

 const getTaskInfoPlNames = () => {
-  const { pMemberList } = props.taskInfo;
+  const { pMemberList } = props.currentTaskInfo;
  const names =
    pMemberList.map((item: any) => {
      return item.nickname;
--- a/src/views/task/projectDetail/index.vue
+++ b/src/views/task/projectDetail/index.vue
@@ -182,6 +182,7 @@
    :nodeLevel1Uuid="projectUuid"
    :projectBeginTime="currentProjectInfo.beginTime"
    :projectEndTime="currentProjectInfo.endTime"
+    :projectInfo="currentProjectInfo"
    v-model:showNodeInfoDialog="showNodeInfoDialog"
    dialogType="edit"
    @completeFun="completeFun"
--- a/src/views/task/simulationTask/executeTask/index.vue
+++ b/src/views/task/simulationTask/executeTask/index.vue
@@ -299,16 +299,22 @@ const actionList = ref<any>([
      );
    },
  },
-  {
-    title: '完成',
-    type: 'success',
-    click: (row: any) => {
-      changeTaskStatus(row, TASK_PROCESS_STATUS.COMPLETED);
-    },
-    hide: (row: any) => {
-      return !(row.exeStatus === TASK_PROCESS_STATUS.IN_PROGRESS);
-    },
-  },
+  // {
+  //   title: '完成',
+  //   type: 'success',
+  //   click: (row: any) => {
+  //     changeTaskStatus(row, TASK_PROCESS_STATUS.COMPLETED);
+  //   },
+  //   hide: (row: any) => {
+  //     // 进行中的才能改成已完成
+  //     // 审批未通过的 不能改成 已完成 、已关闭 、已闭环
+  //     // 因为要审批通过会自动切为已完成，所有禁用掉完成按钮
+  //     return (
+  //       !(row.exeStatus === TASK_PROCESS_STATUS.IN_PROGRESS) ||
+  //       Number(row.approvalStatus) !== TASK_APPROVE_STATUS_ENUM.APPROVED
+  //     );
+  //   },
+  // },
  {
    title: '详情',
    type: 'primary',
--- a/src/views/task/simulationTask/newDemand/index.vue
+++ b/src/views/task/simulationTask/newDemand/index.vue
@@ -910,7 +910,7 @@ const disposeDeptMember = async () => {
    if (editFormInfo.value?.selectPhaseName.indexOf('设计') !== -1) {
      return (
        item.deptName.startsWith(currentProjectUndertaker.value) &&
-        item.deptName.endsWith('技术中心')
+        !item.deptName.endsWith('技术中心')
      );
    } else {
      return (