bugs

modules/main/facade/ration_facade.js

@@ -533,7 +533,7 @@ async function addRationGLJ(std,newRation,compilation,isMaterial,connect_key) {
         if(isMaterial == true){//材料计算添加时要先检查
             for(let sub of std.rationGljList){
                 let t_g = getStdGlj(sub,stdGLJMap,cptGLJMap,{},ext);
-                if(t_g && connect_key == gljUtil.getIndex(t_g)) throw `本定额中包含工料机${t_g.code}，与当前工料机编号相同，添加定额失败`;
+                if(t_g && connect_key == gljUtil.getIndex(t_g,['code','name','specs','unit','gljType'])) throw `本定额中包含工料机[${t_g.code}]${t_g.name}，与当前工料机编号相同，添加定额失败`;
             }
         }
         for(let sub of std.rationGljList){

web/building_saas/main/js/views/material_calc_view.js

@@ -1034,6 +1034,7 @@ materialCalcObj = {
 $(function () {
     $("#calc-nav").on('shown.bs.tab', function () {
         materialCalcObj.initTabWidth();
+        materialCalcObj.showDatas();
         projectGljObject.refreshSubViews();
     });
     $("#calTab ul li a").on('shown.bs.tab', function () {