Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

web/building_saas/pm/js/pm_newMain.js

@@ -2052,10 +2052,12 @@ $(document).ready(function() {
             rename ? projectData['name'] = rename : '';
             projectMap['copy'] = { document: projectData };
             $("#copy-to-dialog").modal('hide');
-            $.bootstrapLoading.progressStart('拷贝项目', true);
-            $("#progress_modal_body").text('正在拷贝项目，请稍候……');
-            await ajaxPost('/pm/api/copyProjects', {projectMap:projectMap,user_id: userID, tenderCount: 1});
-            await importProcessChecking(null, null, (newProjectData) => handleTenderAfterChecking(newProjectData, projectData));
+            const copyRst = await ajaxPost('/pm/api/copyProjects', {projectMap:projectMap,user_id: userID, tenderCount: 1});
+            if (!copyRst.error) {
+                $.bootstrapLoading.progressStart('拷贝项目', true);
+                $("#progress_modal_body").text('正在拷贝项目，请稍候……');
+                await importProcessChecking(null, null, (newProjectData) => handleTenderAfterChecking(newProjectData, projectData));
+            }
         } catch (err) {
             alert(err);
         }
@@ -2093,15 +2095,17 @@ $(document).ready(function() {
             projectData['name'] = name;
             projectMap['copy'] = { document: projectData };
             //$("#save-as-dialog").modal('hide');
-            $.bootstrapLoading.progressStart('拷贝项目', true);
-            $("#progress_modal_body").text('正在拷贝项目，请稍候……');
-            await ajaxPost('/pm/api/copyProjects', {projectMap:projectMap,user_id: userID, tenderCount: 1});
-            await importProcessChecking(null, null, (newProjectData) => {
-                handleTenderAfterChecking(newProjectData, projectData);
-                if (newProjectData) {
-                    $('#save-as-dialog').modal('hide');
-                }
-            });
+            const copyRst = await ajaxPost('/pm/api/copyProjects', {projectMap:projectMap,user_id: userID, tenderCount: 1});
+            if (!copyRst.error) {
+                $.bootstrapLoading.progressStart('拷贝项目', true);
+                $("#progress_modal_body").text('正在拷贝项目，请稍候……');
+                await importProcessChecking(null, null, (newProjectData) => {
+                    handleTenderAfterChecking(newProjectData, projectData);
+                    if (newProjectData) {
+                        $('#save-as-dialog').modal('hide');
+                    }
+                });
+            }
         } catch (err) {
             alert(err);
         }