1.导入清单示例后，单价分析应打勾

2.另存为和复制到图标应做区分
3.另存为标段名称存在时，报错同时保留弹窗不消失

web/building_saas/main/js/views/importBills.js

@@ -75,7 +75,15 @@ const importBills = (function(){
                 let name = rootRow[0].value;
                 let existsRoot = findLast(rst, x => x.name === name && x.depth === 0);
                 if (!existsRoot) {
-                    let root = {ID: uuid.v1(), NextSiblingID: -1, ParentID: -1, name: name, depth: 0, parent: null};
+                    let root = {
+                        ID: uuid.v1(), 
+                        NextSiblingID: -1, 
+                        ParentID: -1, 
+                        name: name, 
+                        depth: 0, 
+                        parent: null,
+                        unitPriceAnalysis: 1
+                    };
                     let preData = findLast(rst, x => x.depth === root.depth);
                     if (preData) {
                         preData.NextSiblingID = root.ID;
@@ -167,7 +175,15 @@ const importBills = (function(){
                 quantity = dataTable[row][colMapping.quantity] ? dataTable[row][colMapping.quantity].value : null;
             if (!code) {    //没有编号的数据，名称必须为:清单 第xx章，认为新的表根节点
                 if (name && /清单 第\d+章/.test(name)) {
-                    curRoot = {code: null, name: name, ID: uuid.v1(), ParentID: -1, NextSiblingID: -1, parent: null};
+                    curRoot = {
+                        code: null, 
+                        name: name, 
+                        ID: uuid.v1(), 
+                        ParentID: -1, 
+                        NextSiblingID: -1, 
+                        parent: null,
+                        unitPriceAnalysis: 1
+                    };
                     rst.push(curRoot);
                 } else {
                     curRoot = null;
@@ -184,6 +200,7 @@ const importBills = (function(){
                     quantity: quantity,
                     ID: uuid.v1(),
                     NextSiblingID: -1,
+                    unitPriceAnalysis: 1
                 };
                 let lastData = rst[rst.length - 1];
                 let parents = getParents(lastData);

web/building_saas/pm/js/pm_newMain.js

@@ -304,7 +304,7 @@ const projTreeObj = {
         },
         saveAs: {
             name: "另存为",
-            icon: 'fa-copy',
+            icon: 'fa-paste',
             disabled: function () {
                 const node = projTreeObj.tree.selected;
                 return !(node && node.data.projType === projectType.tender);
@@ -2069,7 +2069,7 @@ $(document).ready(function() {
         $('#save-as-name').val(name);
         setTimeout(() => $('#save-as-name')[0].focus(), 300);
     });
-    $('#save-as-confirm').click(async function () {
+    $('#save-as-confirm').click(_.throttle(async function () {
         try {
             const name = $('#save-as-name').val().trim();
             if (!name) {
@@ -2092,15 +2092,20 @@ $(document).ready(function() {
             projectData['shareInfo'] = [];
             projectData['name'] = name;
             projectMap['copy'] = { document: projectData };
-            $("#save-as-dialog").modal('hide');
+            //$("#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));
+            await importProcessChecking(null, null, (newProjectData) => {
+                handleTenderAfterChecking(newProjectData, projectData);
+                if (newProjectData) {
+                    $('#save-as-dialog').modal('hide');
+                }
+            });
         } catch (err) {
             alert(err);
         }
-    });
+    }, 2000));
 
     $('#selectSameTypeProject').click(function(){
         let value = $(this).prop('checked') == true?1:0;