diff --git a/src/views/projectLib/projectContract/projectContract.vue b/src/views/projectLib/projectContract/projectContract.vue
index 9d27fbf..a006216 100644
--- a/src/views/projectLib/projectContract/projectContract.vue
+++ b/src/views/projectLib/projectContract/projectContract.vue
@@ -73,7 +73,7 @@ const aaa = ({ values }) => {
                 if (fieldnum.length == 0) {
                   console.log("首付的中央资金不能超过总中央资金的30%11", value, Number(values["centralMoney"]), Number(resMoney.value.centralMoney), Number(values["centralMoney"]) / Number(resMoney.value.centralMoney))
                   if (Number(value) / Number(resMoney.value.centralMoney) > 0.3) {
-                    reject("首付的中央资金不能超过总中央资金的30%")
+                    console.log("首付的中央资金不能超过总中央资金的30%")
                   }
                 } else {
                   let total = Number(values["centralMoney"])
@@ -87,14 +87,14 @@ const aaa = ({ values }) => {
                   }
 
                   if (total / Number(resMoney.value.centralMoney) > 0.3) {
-                    reject("首付的中央资金不能超过总中央资金的30%")
+                    console.log("首付的中央资金不能超过总中央资金的30%")
                   }
                 }
               }
               if (values["taskName" + fieldnum] != null && values["taskName" + fieldnum]?.indexOf("初验") != -1) {
                 if (fieldnum.length == 0) {
                   if (Number(value) / Number(resMoney.value.centralMoney) > 0.6) {
-                    reject("初验的中央资金不能超过总中央资金的60%")
+                    console.log("初验的中央资金不能超过总中央资金的60%")
                   }
                 } else {
                   //首付之前有其他阶段，求和
@@ -108,7 +108,7 @@ const aaa = ({ values }) => {
                     total += value
                   }
                   if (total / Number(resMoney.value.centralMoney) > 0.6) {
-                    reject("初验的中央资金不能超过总中央资金的60%")
+                    console.log("初验的中央资金不能超过总中央资金的60%")
                   }
                 }
               }
diff --git a/src/views/projectLib/projectInfo/index.vue b/src/views/projectLib/projectInfo/index.vue
index 3c18f97..c300868 100644
--- a/src/views/projectLib/projectInfo/index.vue
+++ b/src/views/projectLib/projectInfo/index.vue
@@ -376,38 +376,40 @@
       message.error('请选择项目！');
       return;
     }
+    // 调试GJH
+    
     // if (row.length != 2) {
     //   message.error('请2个需要合并的项目！');
     //   return;
     // }
-    // if (row[0].projectId != undefined) {
-    //   fatherid.value = row[0].projectId
-    // }
+    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);
     }
@@ -428,9 +430,9 @@
       message.error('请1个需要拆分的项目！');
       return;
     }
-    // if (row[0].projectId != undefined) {
-    //   fatherid.value = row[0].projectId
-    // }
+    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')) {
diff --git a/src/views/projectLib/projectPlan/elstepchild.vue b/src/views/projectLib/projectPlan/elstepchild.vue
index eb0c9e6..9f042d9 100644
--- a/src/views/projectLib/projectPlan/elstepchild.vue
+++ b/src/views/projectLib/projectPlan/elstepchild.vue
@@ -74,7 +74,7 @@
         <div v-if="item.showchildDetail == true ">
           <div v-for="(process, index) in item.processDetail" class="flex text-black text-xs">
             <div
-              v-if="process.isFinish == 0 "
+              v-if="process.isFinish <= 1 "
               class="text-gray-300"
             >
               {{ process.projectName }}   未完成