优化多个项目合并，优化主项目有子项目时计划操作

src/views/projectLib/projectInfo/mergeProject.vue

@@ -56,8 +56,11 @@
   });
   async function handleSubmit() {
     let projectids=[]
-    projectids.push(dataTo.row[0].id)
-    projectids.push(dataTo.row[1].id)
+    for(let i=0;i<dataTo.row.length;i++){
+      projectids.push(dataTo.row[i].id)
+    }
+    // projectids.push(dataTo.row[0].id)
+    // projectids.push(dataTo.row[1].id)
     if (await validate) {
       let fields=await getFieldsValue()
       fields['projectids']=projectids

src/views/projectLib/projectPlan/elstepchild.vue

@@ -107,7 +107,7 @@
   const hasSubProject = ref(false);
   onMounted(async () => {
     let res = await queryHasSubProject({ projectid: dataTo.child[0].projectId });
-    //判断是不是子项目
+    //判断有没有子项目
     if(res){
       hasSubProject.value = true;
     }

src/views/projectLib/projectPlan/viewPlanDetail.vue

@@ -135,6 +135,8 @@
   import planFileApproval from '@/views/ProcessApprovalSubPage/planFileApproval.vue';
   import { isShowByRoles } from '../../projectLib/projectInfo/projectInfo.api';
   import uploadURTfile from '@/views/projectLib/projectPlan/uploadURTfile.vue';
+  import { queryHasSubProject } from '@/views/projectLib/projectInfo/projectInfo.api';
+
   let dataTo = defineProps(['projectId', 'projectStage', 'projectName']);
   let projectId = ref(dataTo.projectId);
   let isfinish = ref();
@@ -146,6 +148,7 @@
   let UnitedTechnicalReviewmode = ref('');
   let messageInfo = ref('');
   let recordData = ref({});
+  const hasSubProject = ref(false);
   const [registeruploadFile, { openModal: openPlanFile, closeModal: closePlanFile }] = useModal(); //文件上传和查看
   const [
     registerplanFileApproval,
@@ -159,13 +162,18 @@
   const [registerMessageInfo, { openModal: openMessageInfo, closeModal: closeMessageInfo }] =
     useModal(); //显示消息
 
-  onMounted(() => {
+  onMounted(async () => {
     queryPlanInfoMainTimeline({
       projectid: dataTo.projectId,
     }).then((res) => {
       activities.value = res;
       console.log('activities', activities);
     });
+    let res = await queryHasSubProject({ projectid: dataTo.projectId });
+    //判断有木有子项目
+    if (res) {
+      hasSubProject.value = true;
+    }
     console.log('projectid1111111111', activities, dataTo.projectId);
   });
 
@@ -199,6 +207,10 @@
         label: '详情',
         ifShow: () => {
           if (record.isfinish >= 1) {
+            //有子项目，就展示一级的任务
+            if (hasSubProject.value && record.taskLevel.charAt(0) != '1') {
+              return false;
+            }
             return true;
           }
           return false;
@@ -215,6 +227,10 @@
             record.taskName != '造价评估报告确认'
           ) {
             if (isShowByRoles('projectContact')) {
+              //有子项目，就展示一级的任务
+              if (hasSubProject.value && record.taskLevel.charAt(0) != '1') {
+                return false;
+              }
               return true;
             }
             return false;