新增需求1224

src/views/projectLib/projectInfo/index.vue

@@ -176,6 +176,7 @@
     batchdownloadProject,
     isShowByRoles,
     uploacFilePageList,
+    queryIsSubProject,
   } from './projectInfo.api';
   import { useUserStore } from '@/store/modules/user';
   import { message } from 'ant-design-vue';
@@ -294,6 +295,10 @@
     if (record.stage == 1) {
       showApprovalDetails.value = true;
     }
+    let flag = await queryIsSubProject({projectid:record.id})
+    if(flag == true){
+      showApprovalDetails.value = false;
+    }
     // if(record.projectId != undefined||record.projectId!=null){
     //   showApprovalDetails.value = false
     // }
@@ -371,38 +376,38 @@
       message.error('请选择项目！');
       return;
     }
-    if (row.length != 2) {
-      message.error('请2个需要合并的项目！');
-      return;
-    }
+    // if (row.length != 2) {
+    //   message.error('请2个需要合并的项目！');
+    //   return;
+    // }
     // if (row[0].projectId != undefined) {
     //   fatherid.value = row[0].projectId
     // }
     for (let i = 0; i < row.length; i++) {
       let record = row[i];
-      if (record.projectContacts != userStore.getUserInfo.id && !isShowByRoles('projectContact')) {
-        message.error('不是当前' + record.projectName + '的联系人无法修改此项目！');
-        return;
-      }
-      if (record.stage <= 1 && !isShowByRoles('sys:admin')) {
-        message.error(record.projectName + '申报流程未完成，无法进行变更！');
-        return;
-      }
+      // if (record.projectContacts != userStore.getUserInfo.id && !isShowByRoles('projectContact')) {
+      //   message.error('不是当前' + record.projectName + '的联系人无法修改此项目！');
+      //   return;
+      // }
+      // if (record.stage <= 1 && !isShowByRoles('sys:admin')) {
+      //   message.error(record.projectName + '申报流程未完成，无法进行变更！');
+      //   return;
+      // }
       if (record.stage == 0.1) {
         message.error(record.projectName + '已停止，无法进行变更！');
         return;
       }
       let plan = await queryPlanInfoMainTimeline({ projectid: record.id });
       if (plan.length > 0) {
-        for (let i = 0; i < plan[0].children.length; i++) {
-          if (
-            plan[0].children[i].taskName == '联合技术审查' &&
-            plan[0].children[i].isfinish != '0'
-          ) {
-            message.error(record.projectName + '联合技术审查阶段审批中或已完成，无法进行变更！');
-            return;
-          }
-        }
+        // for (let i = 0; i < plan[0].children.length; i++) {
+        //   if (
+        //     plan[0].children[i].taskName == '联合技术审查' &&
+        //     plan[0].children[i].isfinish != '0'
+        //   ) {
+        //     message.error(record.projectName + '联合技术审查阶段审批中或已完成，无法进行变更！');
+        //     return;
+        //   }
+        // }
       }
       console.log('plan', plan);
     }

src/views/projectLib/projectInfo/projectInfo.api.ts

@@ -36,13 +36,16 @@ export enum Api {
   getFromDataFromMerge='/huzhouMergesplitinfo/getFromDataFromMerge',
   getFromDataFromSplit='/huzhouMergesplitinfo/getFromDataFromSplit',
   projectContactShouYe='/huzhouProject/projectContactShouYe',
-  queryIsSubProject='/huzhouProject/queryIsSubProject'
+  queryIsSubProject='/huzhouProject/queryIsSubProject',
+  queryHasSubProject='/huzhouProject/queryHasSubProject'
 }
 /**
  * 获取部门树列表
  */
 export const queryIsSubProject = (params?) =>
   defHttp.get({ url: Api.queryIsSubProject, params });
+export const queryHasSubProject = (params?) =>
+  defHttp.get({ url: Api.queryHasSubProject, params });
 export const queryProjectInfoById = (params?) =>
   defHttp.get({ url: Api.queryProjectInfoById, params });
 export const addSubProjectinfo = (params?) => defHttp.post({ url: Api.addSubProjectinfo, params });

src/views/projectLib/projectPlan/childElstepchild.vue

@@ -17,13 +17,6 @@
               </template>
             </a-button>
           </div>
-          <div v-if="item.isfinish == 0">
-            <a-button type="text" size="small" @click="handleShowprocess(item)">
-              <template #icon>
-                <DownOutlined style="color: #0ac00d" />
-              </template>
-            </a-button>
-          </div>
         </div>
 
         <div>

src/views/projectLib/projectPlan/elstepchild.vue

@@ -17,7 +17,7 @@
               </template>
             </a-button>
           </div>
-          <div v-if="item.isfinish == 0 && isSubProject">
+          <div v-if="item.isfinish == 0 && hasSubProject">
             <a-button type="text" size="small" @click="handleShowchild(item)">
               <template #icon>
                 <DownOutlined style="color: #CECECE" />
@@ -99,18 +99,17 @@
   import { getProcessDetailByPlaninfoid,queryTaskLevelDetail } from './projectPlan.api';
   import { useModal } from '@/components/Modal';
   import planinfoFileDetail from './planinfoFileDetail.vue';
-  import { queryIsSubProject } from '@/views/projectLib/projectInfo/projectInfo.api';
+  import { queryHasSubProject } from '@/views/projectLib/projectInfo/projectInfo.api';
 
   const [registerFileInfo, { openModal: openFileInfo }] = useModal(); //文件上传和查看
   let dataTo = defineProps(['child']);
   console.log('dataTo', dataTo);
-  const isSubProject = ref(false);
+  const hasSubProject = ref(false);
   onMounted(async () => {
-    let res = await queryIsSubProject({ projectid: dataTo.child[0].projectId });
-    console.log("queryIsSubProject",res)
+    let res = await queryHasSubProject({ projectid: dataTo.child[0].projectId });
     //判断是不是子项目
     if(res){
-      isSubProject.value = true;
+      hasSubProject.value = true;
     }
   })
   async function handleShowprocess(item) {