机械台班新项目中间过程取两位小数

modules/pm/models/project_property_template.js

@@ -10,7 +10,8 @@ const defaultDecimal = {
     feeRate: 3,
     quantity_detail: 4,
     material:5,//三材系数
-    process: 6
+    process: 6,
+    marketPriceProcess:2
 };
 const displaySetting = {
     autoHeight:true,

public/web/gljUtil.js

@@ -275,7 +275,7 @@ let gljUtil = {
         let price_decimal = decimalObj.glj.unitPrice;
         let price_hasM_decimal = decimalObj.glj.unitPriceHasMix?decimalObj.glj.unitPriceHasMix:decimalObj.glj.unitPrice;
         let quantity_decimal = decimalObj.glj.quantity;
-        let process_decimal = decimalObj.process;
+        let process_decimal = this.isDef(decimalObj.marketPriceProcess)?decimalObj.marketPriceProcess: decimalObj.process;//20200722  旧的项目还是默认6位，新的用两位
         let priceCoe = this.isDef(tenderCoe)?tenderCoe:1;
         if (!this.isConcreteType(glj.unit_price.type)&& this.notEditType.indexOf(glj.unit_price.type)!=-1&&glj.ratio_data.length>0) {//对于机械台班等有组成物的材料，价格需根据组成物计算得出(排除混凝土、配合比、砂浆这几个类型直接为0)。
             let p =0;
@@ -335,7 +335,7 @@ let gljUtil = {
         let decimal = decimalObj.glj.unitPrice;
         let price_hasM_decimal = decimalObj.glj.unitPriceHasMix?decimalObj.glj.unitPriceHasMix:decimalObj.glj.unitPrice;
         let quantity_decimal =  decimalObj.glj.quantity;
-        let process_decimal = decimalObj.process;
+        let process_decimal = this.isDef(decimalObj.marketPriceProcess)?decimalObj.marketPriceProcess: decimalObj.process;
         let  tem_decimal = isRadio==true?process_decimal:decimal;
         if (glj.unit_price.type == this.gljType.LABOUR || glj.unit_price.type == this.gljType.MACHINE_LABOUR) {//人工、机上人工，调整价根据定额价*调整系数计算得出。
             let labour = _.find(labourCoeDatas.coes,{'ID':glj.adjCoe});

web/building_saas/main/js/views/project_property_decimal_view.js

@@ -12,7 +12,8 @@ let defaultDecimal = {
         material: {editable: false, data: 5},
         feeRate: {editable: true, data: 3},
         quantity_detail: {editable: false, data: 4},
-        process: {editable: false, data: 6}
+        process: {editable: false, data: 6},
+        marketPriceProcess:{editable: false, data: 2}
     }
 };