导入建设项目bug

web/building_saas/pm/js/pm_newMain.js

@@ -3646,7 +3646,11 @@ $("#confirm-import").click(function() {
 
             },
             error: function(){
-
+                setTimeout(function () {
+                    self.text('确定导入');
+                    $.bootstrapLoading.progressEnd();
+                    alert("导入失败，请检查文件！");
+                },1000)
             }
         });
     } catch(error) {

web/over_write/js/chongqing_2018.js

@@ -315,7 +315,7 @@ if(typeof module !== 'undefined'){
 }
 
 function getCusCoeContent() {
-    return '人工×1，材料×1，施工机具×1，主材×1'
+    return '人工×1，材料×1，施工机具×1，主材×1，设备×1'//2019-07-08 bug 添加自定义系数添加设备
 }
 
 function getCustomerCoeData() {
@@ -324,6 +324,7 @@ function getCustomerCoeData() {
         { amount:1, operator:'*', gljCode:null, coeType:'人工'},
         { amount:1, operator:'*', gljCode:null, coeType:'材料'},
         { amount:1, operator:'*', gljCode:null, coeType:'施工机具'},
-        { amount:1, operator:'*', gljCode:null, coeType:'主材'}
+        { amount:1, operator:'*', gljCode:null, coeType:'主材'},
+        { amount:1, operator:'*', gljCode:null, coeType:'设备'}
     ]
 }