Просмотр исходного кода

Merge branch 'develop_yh31' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh31

chenrui 1 год назад
Родитель
Сommit
80064193cb

+ 2 - 0
src/libs/tools.js

@@ -7,6 +7,7 @@ export const getOperationalPrecision = (num1, num2) => {
 export const boldAmounts = (text) => {
     let regex = /(\d+\.?\d*)元/g;
     let regex5 = /(\d+\.?\d*)件/g;
+    let regex6 = /(\d+\.?\d*)个/g;
     let regex1 = /再满(\d+\.?\d*)元,可享受优惠/g;
     let regex4 = /再满(\d+\.?\d*)件产品可享受优惠/g;
     let regex2 = /(\d+\.?\d*)(/g
@@ -15,6 +16,7 @@ export const boldAmounts = (text) => {
     rext = rext.replace(regex4, '<b>再满$1件产品可享受优惠</b>');
     rext = rext.replace(regex, '<span>$1</span>元');
     rext = rext.replace(regex5, '<span>$1</span>件');
+    rext = rext.replace(regex6, '<span>$1</span>个');
     rext = rext.replace(regex2, '<span>$1</span>(');
     rext = rext.replace(regex3, '选择<span>$1</span>个');
     return rext;

+ 2 - 2
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -326,9 +326,9 @@
                 const acTotal = await salesPromoDetailCount(activeParams).then(res => res.data)
                 if(acTotal){
                   // 采购额结余
-                  acTotal.cgejyAmount = Number(acTotal.totalPromoGiftsAmount||0) - Number(acTotal.totalUsePromoGiftsAmount||0)
+                  acTotal.cgejyAmount = (Number(acTotal.totalPromoGiftsAmount||0) - Number(acTotal.totalUsePromoGiftsAmount||0)).toFixed(2)
                   // 采购额超出
-                  acTotal.cgeccAmount = Number(acTotal.totalUsePromoGiftsAmount||0) - Number(acTotal.totalPromoGiftsAmount||0)
+                  acTotal.cgeccAmount = (Number(acTotal.totalUsePromoGiftsAmount||0) - Number(acTotal.totalPromoGiftsAmount||0)).toFixed(2)
                 }
                 // 有数据时才调用接口,避免做无用的调用
                 if(acTotal&&acTotal.totalQty){