zhangweicheng 5 years ago
parent
commit
300a1f2715

+ 1 - 0
modules/pm/facade/pm_facade.js

@@ -1602,6 +1602,7 @@ async function importProject(data,req,updateData) {
             if (tenderOverrun) {
                 result.error = 1;
                 result.msg = `您创建的项目个数超限,请联系我们的客服人员,或者导出建设项目保存到本地备份,删除云上数据。`;
+                return result;
             }
             let [constructionProjectID,projectIDMap,labourCoeFileIDMap,calcProgramFileIDMap] = await handleMainProjectDatas(mainData,updateData,req.session.sessionUser.id);
             result.constructionProjectID = constructionProjectID;

+ 1 - 1
web/building_saas/main/js/views/project_view.js

@@ -1315,7 +1315,7 @@ var projectObj = {
                     }*/
                 },
                 "insertGLJ": {
-                  name: "插入人材机",
+                  name: "插入工料机",
                   icon: 'fa-sign-in',
                   disabled: function () {
                       if (projectReadOnly) {

+ 1 - 1
web/building_saas/main/js/views/quantity_edit_view.js

@@ -189,7 +189,7 @@ let quantityEditObj = {
     },
     updateQuantityEXP:function (value,quantityEXP,node) {
         let quantity_detail = projectObj.project.quantity_detail;
-        quantity_detail.cleanQuantityDetail(node,true);
+        if(node.data.hasOwnProperty('isFromDetail')&&node.data.isFromDetail==1) quantity_detail.cleanQuantityDetail(node,true);
         if(node.sourceType === ModuleNames.bills){
             if(quantityEXP!=""&& node.data.unit == "公路公里"){
                 hintBox.infoBox('操作确认', '是否将所有单位等于"公路公里"的项目的工程量都设为该值?', 2, function () {