update

modules/glj/routes/glj_router.js

@@ -31,9 +31,6 @@ router.post('/batchUpdateConsumption', gljController.init, gljController.batchUp
 router.post('/modifyKeyValue',gljController.init, gljController.modifyKeyValue);
 router.post('/updateEvaluateMaterial', gljController.updateEvaluateMaterial);
 
-
-
-
 router.get('/test', gljController.init, gljController.test);
 router.get('/testModify', gljController.init, gljController.testModify);
 router.get('/testDelete', gljController.init, gljController.delete);

modules/pm/facade/pm_facade.js

@@ -2492,7 +2492,7 @@ async function doDownLoadAndImport(privateDownloadUrl,info) {
                 doc.projectID = [result.constructionProjectID];
             }
         }catch (error){
-            console.log(error);
+            console.log(error.message);
             doc.errorMsg = "导入失败，请检查文件！";
             doc.status = "error";
         }finally {
@@ -2806,23 +2806,6 @@ async function handleEachProject(data,projectIDMap,labourCoeFileIDMap,calcProgra
 
     return [newProjectSetting,bills,rations,installationFees,projectGLJs,rationGLJs,rationCoes,quantityDetails,rationInstallations,rationTemplates,evaluateList,bidList,contractorList,newCalcProgramsFile,newLabourCoe]
 
- /*    if(newProjectSetting) await projectSettingModel.create(newProjectSetting);
-    if(bills.length > 0) await insertMany(bills,billsModel);
-    if(rations.length > 0) await insertMany(rations,rationModel);
-    if(installationFees.length > 0) await insertMany(installationFees,installationFeeModel);
-    if(projectGLJs.length > 0) await insertMany(projectGLJs,gljListModel);
-    if(rationGLJs.length > 0) await insertMany(rationGLJs,rationGLJModel);
-    if(rationCoes.length > 0) await insertMany(rationCoes,rationCoeModel);
-    if(quantityDetails.length > 0) await insertMany(quantityDetails,quantityDetailModel);
-    if(rationInstallations.length > 0) await insertMany(rationInstallations,rationInstallationModel);
-    if(rationTemplates.length > 0) await insertMany(rationTemplates,rationTemplateModel);
-    if(evaluateList.length > 0) await insertMany(evaluateList,evaluateListModel);
-    if(bidList.length > 0) await insertMany(bidList,bidListModel);
-    if(contractorList.length > 0) await insertMany(contractorList,contractorListModel);
-    if(newCalcProgramsFile) await calcProgramsModel.create(newCalcProgramsFile);
-    if(newLabourCoe) await labourCoesModel.create(newLabourCoe); */
- 
-
 }
 function setMaterialList(datas,newProjectID,projectGLJIDMap){
     let arrs = [];

web/building_saas/glj/html/project_glj.html

@@ -66,8 +66,7 @@
                             <button type="button" class="btn btn-outline-primary btn-sm" id = "filterAgain">重新过滤</button>
                            <!-- <button type="button" class="btn btn-outline-primary btn-sm" id = "autoRelated">自动关联招标材料</button>-->
                         </div>
-                        <div class="main-data-bottom" id="related_sheet" style="overflow:hidden">
-                        </div>
+                        <div class="main-data-bottom" id="related_sheet" style="overflow:hidden"></div>
                     </div>
                 </div>
             </div>

web/building_saas/main/js/views/project_glj_view.js

@@ -711,15 +711,7 @@ let projectGljObject={
         this.materialTreeController.setTreeSelected(this.materialTree.items[sel.row==-1?0:sel.row]);
     },
     initSheetViews:function(){
-        let me = projectGljObject;
-      /*  if(me.displayType == filterType.AMAE){
-            $('#material_adjust').show();
-            $('#adjustType').show();
-            let adjustType = projectObj.project.projectInfo.property.gljAdjustType || 'priceInfo';
-            $('#adjustType').val(adjustType);
-            $('#project-glj-main').hide();
-            $('#config_material').hide();
-        }else*/
+      let me = projectGljObject;
       if(me.displayType == filterType.AMAE || me.displayType == filterType.ZGCL || me.displayType == filterType.PBCL){
             $('#adjustType').hide();
             if(me.displayType == filterType.AMAE){