Merge branch 'master' of http://192.168.1.12:3000/SmartCost/ConstructionCost

public/web/gljUtil.js

@@ -13,7 +13,8 @@ let gljUtil = {
         let rationMap = _.indexBy(rations,'ID');
         let quantityMap={};
         let rationGljGroup = _.groupBy(rationGLJDatas,'projectGLJID');
-        let [billIDs,tech_billIDS] = this.getSubdivisionAndTechBillsLeavesID(billsDatas);//分别取分部分项和技术措施项目的所有叶子清单ID
+        let IDarray =  this.getSubdivisionAndTechBillsLeavesID(billsDatas);//分别取分部分项和技术措施项目的所有叶子清单ID
+        let billIDs = IDarray[0],tech_billIDS = IDarray[1];
         for(let pglj of project_gljs ){
             let pg_index = this.getIndex(pglj,gljKeyArray);
             pglj.subdivisionQuantity = 0;
@@ -121,7 +122,7 @@ let gljUtil = {
             }
         }
     },
-    getGLJPrice:function (glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio=false,_,scMathUtil) {
+    getGLJPrice:function (glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil) {
         let result = {};
         result.marketPrice = this.getMarketPrice(glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil);
         if(this.calcPriceDiff(glj,calcOptions)==true){//计取价差
@@ -183,7 +184,7 @@ let gljUtil = {
             return scMathUtil.roundForObj(glj.unit_price.base_price,tem_decimal);
         }
     },
-    getAdjustPrice:function (glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio=false,_,scMathUtil) {
+    getAdjustPrice:function (glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil) {
         let decimal = decimalObj.glj.unitPrice;
         let quantity_decimal =  decimalObj.glj.quantity;
         let process_decimal = decimalObj.process;

web/building_saas/complementary_ration_lib/js/ration.js

@@ -198,6 +198,7 @@ let rationOprObj = {
                         callback: function(){},
                         items: {
                             "delete": {name: "删除", disabled: delDis, icon: "fa-remove", callback: function (key, opt) {
+                                me.rationsCodes.splice(me.rationsCodes.indexOf(ration.code.toString()), 1);
                                 me.mixDel = 1;
                                 me.mixUpdateRequest([], [], [ration.ID]);
                             }}