Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

public/web/gljUtil.js

@@ -221,7 +221,7 @@ let gljUtil = {
             }
         }
         let coe = 1;
-        if(projectGLJ && projectGLJ.is_adjust_price == 1){
+        if(projectGLJ && projectGLJ.is_adjust_price == 0){
           coe = ration.quantityCoe&&this.isNotEmpty(ration.quantityCoe[coeField])?ration.quantityCoe[coeField]:1;
           coe = parseFloat(coe);
         }else{

web/building_saas/main/js/models/ration.js

@@ -303,28 +303,13 @@ var Ration = {
                 }
             }
         }
-
-        ration.prototype.getChangePosUpdateData = function (ration1, ration2) {
-            var updateData = [];
-            updateData.push({updateType: 'ut_update', updateData: this.getTempRationData(ration1.ID, ration1.billsItemID, ration2.serialNo)});
-            updateData.push({updateType: 'ut_update', updateData: this.getTempRationData(ration2.ID, ration2.billsItemID, ration1.serialNo)});
-            return updateData;
-        };
-        ration.prototype.changePos = function (ration1, ration2) {
-            var updateData = this.getChangePosUpdateData(ration1, ration2);
-            this.project.pushNow('insertRation', [this.getSourceType()], [updateData]);
-
-            var preSerialNo = ration1.serialNo;
-            ration1.serialNo = ration2.serialNo;
-            ration2.serialNo = preSerialNo;
-        };
         ration.prototype.changeMultiPos = function (baseRation, rations) {
             const updateData = [];
             let tempSerialNo = baseRation.serialNo;
             rations.forEach(ration => {
                 updateData.push({
                     updateType: 'ut_update',
-                    updateData: this.getTempRationData(ration.ID, ration.billsItemID, tempSerialNo)
+                    updateData: { ID: ration.ID, serialNo: tempSerialNo, projectID: this.project.ID()}
                 });
                 let orgSerialNo = ration.serialNo;
                 ration.serialNo = tempSerialNo;
@@ -332,7 +317,7 @@ var Ration = {
             });
             updateData.push({
                 updateType: 'ut_update',
-                updateData: this.getTempRationData(baseRation.ID, baseRation.billsItemID, tempSerialNo)
+                updateData: { ID: baseRation.ID, serialNo: tempSerialNo, projectID: this.project.ID()}
             });
             baseRation.serialNo = tempSerialNo;
             this.project.pushNow('insertRation', [this.getSourceType()], [updateData]);

web/building_saas/main/js/views/project_view.js

@@ -2234,7 +2234,6 @@ const throttleUpMove = _.throttle(() => {
         project.Bills.multiUpMoveBills(project.Bills.tree, sourceNodes);
         controller.multiUpMove(mainTreeNodes);
     } else if (firstNode.sourceType === commonConstants.SourceType.RATION) {
-        //project.Ration.changePos(selected.source, selected.preSibling.source);
         project.Ration.changeMultiPos(mainTreeNodes[0].preSibling.source, sourceNodes);
         controller.multiUpMove(mainTreeNodes);
     };

web/over_write/js/shandong_2016.js

@@ -4,4 +4,46 @@ if (typeof module !== 'undefined') {
           return 5
       }
   };
-}
+}
+
+let isSD2016 = true;
+function overwriteRationCalcBases() {
+    if (typeof rationCalcBases == 'undefined') return;
+    for (let key in rationCalcBases) delete rationCalcBases[key];
+
+    rationCalcBases['人工费'] = function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptMarketPrice, isTender);
+    };
+    rationCalcBases['材料费'] = function (node, isTender) {
+        return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptMarketPrice, isTender);
+    };
+    rationCalcBases['施工机械使用费'] = function (node, isTender) {
+        return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptMarketPrice, isTender);
+    };
+    rationCalcBases['商品砼费'] = function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.COMMERCIAL_CONCRETE, gljType.COMMERCIAL_MORTAR], priceTypes.ptMarketPrice, isTender);
+    };
+    rationCalcBases['外购砼构件费'] = function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.PURCHASE_COMPONENT], priceTypes.ptMarketPrice, isTender);
+    };
+};
+
+(function overwriteFeeTypes() {
+    if (typeof cpFeeTypes == 'undefined') return;
+    cpFeeTypes = [
+        { type: 'marketDirect', name: '直接费' },
+        { type: 'marketDirectWork', name: '直接工程费' },
+        { type: 'marketLabour', name: '人工费' },
+        { type: 'marketMaterial', name: '材料费' },
+        { type: 'marketMachine', name: '施工机械使用费' },
+        { type: 'otherFee', name: '其它工程费' },
+        { type: 'otherFee1', name: '其它工程费I' },
+        { type: 'otherFee2', name: '其它工程费II' },
+        { type: 'indirectFee', name: '间接费' },
+        { type: 'manage', name: '企业管理费' },
+        { type: 'force', name: '规费' },
+        { type: 'profit', name: '利润' },
+        { type: 'tax', name: '税金' },
+        { type: 'common', name: '建安费' }
+    ];
+})();