Merge branch 'hotfix' of http://carsafe.uicp.cn/Front_Team/SPDM into hotfix

src/api/project/run.ts

@@ -54,6 +54,7 @@ export const queryRunDirApi = (params: any) => {
  * @returns
  */
 export const uploadRunFilesApi = (params: any) => {
+  params.isConverSameNameFile = true;
   return post(`${PREFIX}run/uploadRunFiles`, params);
 };
 

src/components/common/treeCaseTable/treeTable.vue

@@ -79,6 +79,7 @@
           :title="
             TASK_APPROVE_STATUS.O[row.approvalStatus || TASK_APPROVE_STATUS_ENUM.NOT_APPROVED]
           "
+          :class="row.nodeType === NODE_TYPE.TASK && row.approvalStatus !== '0' ? 'can-click' : ''"
           @click="seeApproveDetailFun(row)"
         >
         </StatusDot>
@@ -916,8 +917,11 @@ const approveDetailVisible = ref(false);
 const approveId = ref('');
 
 const seeApproveDetailFun = async (row: any) => {
+  // 工位节点只展示审批状态，但不可点击; 未审批的也不点击
+  if (row.nodeType === NODE_TYPE.WORKSPACE || row.approvalStatus == '0') {
+    return;
+  }
   // 走获取任务详情接口拿到审批id
-
   const res: any = await getTaskDetailApi({
     relatedResourceUuid: row.uuid,
   });
@@ -964,4 +968,7 @@ defineExpose({
     }
   }
 }
+.can-click {
+  cursor: pointer;
+}
 </style>

src/components/flow/flowNodeParamTable.vue

@@ -420,6 +420,7 @@ const runUploadRunFilesFun = async (list: any, flag: any) => {
     sourceFiles,
     uploadTaskId: new Date().getTime(),
     dirId: props.pageInfo?.inputDirId,
+    isConverSameNameFile: true,
   };
 
   const res: any = await uploadRunFilesApi(param);

src/views/task/execution/components/runDetailPage/index.vue

@@ -608,6 +608,7 @@ const runUploadRunFilesFun = async (list: any, inputDirId: any) => {
     sourceFiles,
     uploadTaskId: new Date().getTime(),
     dirId: inputDirId,
+    isConverSameNameFile: true,
   };
 
   const res: any = await uploadRunFilesApi(param);

src/views/task/execution/components/runDetailPage/runPagecomponent/runDataPage.vue

@@ -168,6 +168,7 @@ const beforeUploadFun = async (file: any) => {
     sourceFiles,
     uploadTaskId: new Date().getTime(),
     dirId: props.fileId,
+    isConverSameNameFile: true,
   };
 
   const res: any = await uploadRunFilesApi(param);