bugs

modules/ration_glj/facade/glj_calculate_facade.js

@@ -208,7 +208,8 @@ async function getMixRatioMap(glj,gljList,coeList,assList,mixRatioMap) {//生成
     for(let m of mixList){
         if(glj.createType ==  'replace'&& glj.mIndexObj){//如果是替换过的工料机，要造一条加的数据去补回下面的减数据
             //与下面的减相对应，如果有没被引用子组成物工料机，会少一条加的数据，这样，那条没被引用的消耗量会被减为0
-            addToMixMap(m,mixRatioMap,glj.rationItemQuantity,0);
+            addToMixMap(m,mixRatioMap,assCoeQuantity,0); //addToMixMap(m,mixRatioMap,glj.rationItemQuantity,0); -- 2019-04-15 和下面的减相对做修改
+
         }
         if(!noCustomQuantiyt(glj)) {//有自定义消耗量才做正常的计算处理
             addToMixMap(m,mixRatioMap,glj.customQuantity,assCoeQuantity);
@@ -218,7 +219,9 @@ async function getMixRatioMap(glj,gljList,coeList,assList,mixRatioMap) {//生成
         let t_con_key = gljUtil.getIndex(glj.mIndexObj);
         let tmixList = await mixRatioModel.find({"unit_price_file_id":unitPriceFileId,'connect_key':t_con_key});
         for(let tm of tmixList ){
-            addToMixMap(tm,mixRatioMap,0,glj.rationItemQuantity);
+             addToMixMap(tm,mixRatioMap,0,assCoeQuantity); //addToMixMap(tm,mixRatioMap,0,glj.rationItemQuantity);
+            // -- 2019-04-15 修改bugs 这里把glj.rationItemQuantity 改成assCoeQuantity。 定额下组成物的消耗量要减去父工料机经过辅助定额或者子目换算后的对应的增加量
+
         }
     }
     function addToMixMap(m,map,cust,ass,isReplace = false) {

public/web/slideResize.js

@@ -38,8 +38,8 @@ const SlideResize = (function() {
             otherPercentWidth = otherDecimalWidth * 100 + '%';
         resize.css('width', resizePercentWidth);
         other.css('width', otherPercentWidth);
-
-
+        console.log(other)
+        console.log(otherPercentWidth)
     }
 
     let mouseMoveCount = 0;
@@ -72,10 +72,10 @@ const SlideResize = (function() {
                 let moveSize = e.clientX - startPoint;
                 leftChange = leftWidth + moveSize;
                 leftChange = leftChange < limit.min ? limit.min : leftChange;
-                leftChange = leftChange > limitMax ? limitMax - 5 : leftChange;
+                leftChange = leftChange > limitMax ? limitMax  : leftChange; //2019-04-15  原先是 limitMax - 5，造成有部分空白
                 rightChange = rightWidth - moveSize;
                 rightChange = rightChange < limit.min ? limit.min : rightChange;
-                rightChange = rightChange > limitMax ? limitMax - 5 : rightChange;
+                rightChange = rightChange > limitMax ? limitMax  : rightChange;//2019-04-15  原先是 limitMax - 5，造成有部分空白
                 let leftPercentWidth = leftChange / eleObj.parent.width() * 100 + '%',
                     rightPercentWidth = rightChange / eleObj.parent.width() * 100 + '%';
                 eleObj.left.css('width', leftPercentWidth);
@@ -107,6 +107,7 @@ const SlideResize = (function() {
             let cache = getLocalCache(`${module}${ele.attr('id')}Width`);
             if (cache) {
                 ele.css('width', cache);
+                console.log(ele)
             }
         }
         for (let resize of resizes) {

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

@@ -401,7 +401,7 @@ materialCalcObj = {
         if($("#mix_ratio_sheet").is(':visible')) return ;//如果是组成物计算界面，返回
         let mr_sideResizeEles = this.getSideResize();
         SlideResize.loadHorizonWidth(mr_sideResizeEles.eleObj.module,
-            [rg_sideResizeEles.eleObj.resize], [mr_sideResizeEles.eleObj.left, mr_sideResizeEles.eleObj.right],null,2);
+            [mr_sideResizeEles.eleObj.resize], [mr_sideResizeEles.eleObj.left, mr_sideResizeEles.eleObj.right],null,2);
         $("#spreadTabDiv").width( $('#calcDiv').width() - mr_sideResizeEles.eleObj.resize.width() - 32)
     }
 };