feat: X改成×

web/building_saas/main/js/models/project_glj.js

@@ -978,7 +978,7 @@ ProjectGLJ.prototype.calcEachFreightOrPrice = function (temp,type,priceMap,needU
         }
         sum = scMathUtil.roundForObj(sum,decimal)+"";
         if(type == "freight"){
-          let exp = expList.length == 0?`${temp.otherFee}x${temp.weightCoe}`:`((${expList.join("+")})+${temp.otherFee})x${temp.weightCoe}`
+          let exp = expList.length == 0?`${temp.otherFee}×${temp.weightCoe}`:`((${expList.join("+")})+${temp.otherFee})×${temp.weightCoe}`
           let ndoc = {};
           if(temp.unitFreight != sum) ndoc['unitFreight'] = sum;
           ndoc['exp'] = exp;
@@ -1010,21 +1010,21 @@ ProjectGLJ.prototype.calcEachFreightOrPrice = function (temp,type,priceMap,needU
                 let t = scMathUtil.roundForObj(quantity * g.marketPrice * rationQuantity,processDecimal);//市场价
                 let r_price = gljUtil.getAssUsedPrice(g);//浙江定额时特殊处理，这里取市场价
                 let rt = scMathUtil.roundForObj(quantity * r_price * rationQuantity,processDecimal);//定额价
-                let calString = `${quantity}x${r_price}x${rationQuantity}`;  
+                let calString = `${quantity}×${r_price}×${rationQuantity}`;  
                 if(g.type == gljUtil.gljType.LABOUR){
                   laberSum = scMathUtil.roundForObj(laberSum+rt,processDecimal);
-                  assList.push(`${calString}x${assFeeRate*100}%`) 
+                  assList.push(`${calString}×${assFeeRate*100}%`) 
                 } 
                 if(gljUtil.getMainType(g.type) == 3) machineSum = scMathUtil.roundForObj(machineSum+rt,processDecimal); 
                
-                expList.push(`${quantity}x${g.marketPrice}x${rationQuantity}`); 
+                expList.push(`${quantity}×${g.marketPrice}×${rationQuantity}`); 
                 result = scMathUtil.roundForObj(result + t,processDecimal);
             }
             let as = scMathUtil.roundForObj(laberSum * assFeeRate,processDecimal);//人工消耗量*定额价*定额工程量*辅助生产间接费费率
             let tt = scMathUtil.roundForObj(laberSum + machineSum,processDecimal);//人工定额消耗量*定额价*定额工程量+机械定额消耗量*定额价*定额工程量
             let hs = scMathUtil.roundForObj(tt*hightFeeRate,processDecimal);//（人工定额消耗量*定额价*定额工程量+机械定额消耗量*定额价*定额工程量）*高原取费类别费率
             exp = expList.join("+");
-            if(hightFeeRate!=0) exp += `+${tt}x${hightFeeRate*100}%`;
+            if(hightFeeRate!=0) exp += `+${tt}×${hightFeeRate*100}%`;
             if(assFeeRate!=0 && assList.length > 0) exp += '+'+assList.join("+");
             result = scMathUtil.roundForObj(as + result,processDecimal);
             result = scMathUtil.roundForObj(hs + result,processDecimal);

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

@@ -462,7 +462,7 @@ materialCalcObj = {
       let material = materialCalcObj.getMaterialSelected();
       if(gljUtil.isDef(item.materialType)&&item.materialType != ""){
         let uString = materialCalcObj.getNeiMengUnitFreightString(item.kmDistance,item.materialType);
-        return `((${uString}x(1+${item.freightIncreaseRate}%)+${item.unitLoadingFee}x${item.loadingTimes})/1.09+${item.otherFee})x${material.grossWeightCoe_n}x${item.weightCoe}`;
+        return `((${uString}×(1+${item.freightIncreaseRate}%)+${item.unitLoadingFee}×${item.loadingTimes})/1.09+${item.otherFee})×${material.grossWeightCoe_n}×${item.weightCoe}`;
       }
       //(单位运价×(1+运距增加率%)+装卸费单价×装卸次数+其它费用)×单位毛重×加权系数
       if(item.conveyance == "自办运输"){
@@ -471,7 +471,7 @@ materialCalcObj = {
       }
 
       //(单位运价×km运距×(1+运距增加率%)+装卸费单价×装卸次数+其它费用)×单位毛重×加权系数
-      return `(${item.unitFreight}x${item.kmDistance}x(1+${item.freightIncreaseRate}%)+${item.unitLoadingFee}x${item.loadingTimes}+${item.otherFee})x${material.grossWeightCoe_n}x${item.weightCoe}`;
+      return `(${item.unitFreight}×${item.kmDistance}×(1+${item.freightIncreaseRate}%)+${item.unitLoadingFee}×${item.loadingTimes}+${item.otherFee})×${material.grossWeightCoe_n}×${item.weightCoe}`;
     },
     getSavedFreight:function (start,material) {
         let t = null;
@@ -661,13 +661,13 @@ materialCalcObj = {
 
         //5< kmDistance <= 15  每增运1km 则增加0.6
         less = scMathUtil.roundForObj(less - 10,decimal);
-        if(less <=0)  return `(${resultString}+0.6x${scMathUtil.roundForObj(less + 10,decimal)})`;//baseFreight + (less + 10) * 0.6;
-        resultString =  `${resultString}+0.6x10`;
+        if(less <=0)  return `(${resultString}+0.6×${scMathUtil.roundForObj(less + 10,decimal)})`;//baseFreight + (less + 10) * 0.6;
+        resultString =  `${resultString}+0.6×10`;
         //15< kmDistance <= 100  每增运1km 则增加0.45
         less = scMathUtil.roundForObj(less - 85,decimal);
-        if(less <=0) return `(${resultString}+0.45x${scMathUtil.roundForObj(less + 85,decimal)})`; //baseFreight + (less + 85)*0.45;
-        resultString = `${resultString}+0.45x85`;
-        return `(${resultString}+0.35x${less})`;// >100 的所有部分每增运1km 则增加0.35  baseFreight + less * 0.35
+        if(less <=0) return `(${resultString}+0.45×${scMathUtil.roundForObj(less + 85,decimal)})`; //baseFreight + (less + 85)*0.45;
+        resultString = `${resultString}+0.45×85`;
+        return `(${resultString}+0.35×${less})`;// >100 的所有部分每增运1km 则增加0.35  baseFreight + less * 0.35
     },
 
     onFreightRationValueChange:function (sender,args) {