merge

src/components/project/projectInfoDialog.vue

@@ -195,7 +195,7 @@ const epProjectSelectFun = (row: any) => {
       ...tableFormRef.value.getFormDataFun(),
       nodeCode: row.projectNum,
       nodeName: row.projectName,
-      projectId: row.id,
+      projectId: row.projectNum,
       // EP的项目主体字段 放到拓展字段
       projectUndertaker: row.projectUndertaker,
       // EP的参考项目字段

src/tenants/lyric/views/project/project.ts

@@ -12,7 +12,7 @@ export const disposeAsyncPhase = async (phaseList: any[], currentProjectInfo: an
       return phase.label === currentProjectInfo.currentPhase;
     });
   }
-  await new Promise((resolve) => {
+  return await new Promise((resolve) => {
     if (needAsync) {
       ElMessageBox.confirm('当前阶段未同步，是否从EP系统中同步当前阶段及工位信息？', '提示', {
         type: 'warning',
@@ -28,17 +28,22 @@ export const disposeAsyncPhase = async (phaseList: any[], currentProjectInfo: an
             tagMap,
           });
           if (res.code === 200) {
-            ElMessage.success('同步成功');
+            if (res.data) {
+              ElMessage.success('同步成功');
+            } else {
+              ElMessage.error(res.message);
+              resolve(false);
+            }
           } else {
             ElMessage.error(res.message);
           }
           resolve(true);
         })
         .catch(() => {
-          resolve(true);
+          resolve(false);
         });
     } else {
-      resolve(true);
+      resolve(false);
     }
   });
 };

src/views/task/projectDetail/index.vue

@@ -112,7 +112,11 @@
           </template>
         </div>
       </el-tab-pane>
-      <el-tab-pane v-if="enableConfigByTenant([TENANT_ENUM.LYRIC])" :label="$t('项目详情页.项目参与人员')" name="PDT">
+      <el-tab-pane
+        v-if="enableConfigByTenant([TENANT_ENUM.LYRIC])"
+        :label="$t('项目详情页.项目参与人员')"
+        name="PDT"
+      >
         <PDT
           ref="productionLineRef"
           v-if="displayedTabs.includes('PDT') && projectUuid"
@@ -258,13 +262,17 @@ const openEditNodeDialogFun = () => {
 
 const showTaskDialog = ref(false);
 const openAddTaskDialogFun = async () => {
+  if (enableConfigByTenant([TENANT_ENUM.LYRIC])) {
+    const isSync = await disposeAsyncPhase(phaseList.value, currentProjectInfo);
+    if (isSync) {
+      showTaskDialog.value = true;
+    }
+  }
   if (phaseList.value.length === 0) {
     ElMessage.warning('请先创建阶段');
     return;
   }
-  if (enableConfigByTenant([TENANT_ENUM.LYRIC])) {
-    await disposeAsyncPhase(phaseList.value, currentProjectInfo);
-  }
+
   showTaskDialog.value = true;
 };
 const currentProjectInfo = reactive<any>({

src/views/task/simulationTask/newDemand/index.vue

@@ -514,7 +514,10 @@ const changeFun = async (val: any, type: string) => {
         formData.phaseId = optionList[0].value;
         const workspaceInfo = await getWorkSpaceList(formData.phaseId);
         formData.workspace = workspaceInfo.value;
-        formData.machineId = workspaceInfo.parentId;
+        formData.machineId = '';
+        if (formData.phaseId !== workspaceInfo.parentId) {
+          formData.machineId = workspaceInfo.parentId;
+        }
         formData.workspaceName = workspaceInfo.label;
         formData.extras = setWorkSpaceValue(
           formData.extras,
@@ -543,7 +546,10 @@ const changeFun = async (val: any, type: string) => {
   if (val.key === 'phaseId') {
     if (formData.phaseId) {
       const workspaceInfo = await getWorkSpaceList(formData.phaseId);
-      formData.machineId = workspaceInfo.parentId;
+      formData.machineId = '';
+      if (formData.phaseId !== workspaceInfo.parentId) {
+        formData.machineId = workspaceInfo.parentId;
+      }
       formData.workspace = workspaceInfo.value;
       formData.workspaceName = workspaceInfo.label;
       formData.extras = setWorkSpaceValue(
@@ -564,7 +570,10 @@ const changeFun = async (val: any, type: string) => {
   }
   if (val.key === 'workspace') {
     if (formData.workspace) {
-      formData.machineId = val.val.parentId;
+      formData.machineId = '';
+      if (formData.phaseId !== val.val.parentId) {
+        formData.machineId = val.val.parentId;
+      }
       formData.workspace = val.val.value;
       formData.workspaceName = val.val.label;
       formData.extras = setWorkSpaceValue(