diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html index 10dec599..18aa318b 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html @@ -531,7 +531,7 @@ title: '折扣', width: 90, formatter: function (value, row, index) { - let showValue=value?value*100+'%':'0%'; + let showValue=value?(value*100).toFixed(2)+'%':'0%'; var html = $.common.sprintf("" + "" + "", index, value,showValue); diff --git a/ruoyi-admin/src/main/resources/templates/project/info/edit.html b/ruoyi-admin/src/main/resources/templates/project/info/edit.html index 383e13f7..bea4228e 100644 --- a/ruoyi-admin/src/main/resources/templates/project/info/edit.html +++ b/ruoyi-admin/src/main/resources/templates/project/info/edit.html @@ -359,7 +359,7 @@ ele.catalogueAllPriceFormmat = ele.catalogueAllPrice ? formatAmountNumber(ele.catalogueAllPrice) : "" ele.allPriceFormmat = ele.allPrice ? formatAmountNumber(ele.allPrice) : "" ele.discountFormat = ele.discount ? (ele.discount*100).toFixed(2) : "" - ele.guidanceDiscountFormat = ele.guidanceDiscount ? ele.guidanceDiscount*100 : "" + ele.guidanceDiscountFormat = ele.guidanceDiscount ? (ele.guidanceDiscount*100).toFixed(2) : "" addProduct(ele) }) let hardwareProjectProductInfoListAll = [[${projectInfo.hardwareProjectProductInfoList}]] || [] @@ -369,7 +369,7 @@ ele.catalogueAllPriceFormmat = ele.catalogueAllPrice ? formatAmountNumber(ele.catalogueAllPrice) : "" ele.allPriceFormmat = ele.allPrice ? formatAmountNumber(ele.allPrice) : "" ele.discountFormat = ele.discount ? (ele.discount*100).toFixed(2) : "" - ele.guidanceDiscountFormat = ele.guidanceDiscount ? ele.guidanceDiscount*100 : "" + ele.guidanceDiscountFormat = ele.guidanceDiscount ? (ele.guidanceDiscount*100).toFixed(2) : "" addProduct2(ele) }) let maintenanceProjectProductInfoListAll = [[${projectInfo.maintenanceProjectProductInfoList}]] || [] @@ -379,7 +379,7 @@ ele.catalogueAllPriceFormmat = ele.catalogueAllPrice ? formatAmountNumber(ele.catalogueAllPrice) : "" ele.allPriceFormmat = ele.allPrice ? formatAmountNumber(ele.allPrice) : "" ele.discountFormat = ele.discount ? (ele.discount*100).toFixed(2) : "" - ele.guidanceDiscountFormat = ele.guidanceDiscount ? ele.guidanceDiscount*100 : "" + ele.guidanceDiscountFormat = ele.guidanceDiscount ? (ele.guidanceDiscount*100).toFixed(2) : "" addProduct3(ele) }) } diff --git a/ruoyi-admin/src/main/resources/templates/project/order/add.html b/ruoyi-admin/src/main/resources/templates/project/order/add.html index d780d718..e37c2830 100644 --- a/ruoyi-admin/src/main/resources/templates/project/order/add.html +++ b/ruoyi-admin/src/main/resources/templates/project/order/add.html @@ -768,7 +768,7 @@ ${ ele.catalogueAllPriceFormmat = ele.catalogueAllPrice ? formatAmountNumber(ele.catalogueAllPrice) : "" ele.allPriceFormmat = ele.allPrice ? formatAmountNumber(ele.allPrice) : "" ele.discountFormat = ele.discount ? (ele.discount*100).toFixed(2) : "" - ele.guidanceDiscountFormat = ele.guidanceDiscount ? ele.guidanceDiscount*100 : "" + ele.guidanceDiscountFormat = ele.guidanceDiscount ? (ele.guidanceDiscount*100).toFixed(2) : "" addProduct(ele) }) : '' data.hardwareProjectProductInfoList ? data.hardwareProjectProductInfoList.forEach((ele) => { @@ -777,7 +777,7 @@ ${ ele.catalogueAllPriceFormmat = ele.catalogueAllPrice ? formatAmountNumber(ele.catalogueAllPrice) : "" ele.allPriceFormmat = ele.allPrice ? formatAmountNumber(ele.allPrice) : "" ele.discountFormat = ele.discount ? (ele.discount*100).toFixed(2) : "" - ele.guidanceDiscountFormat = ele.guidanceDiscount ? ele.guidanceDiscount*100 : "" + ele.guidanceDiscountFormat = ele.guidanceDiscount ? (ele.guidanceDiscount*100).toFixed(2) : "" addProduct2(ele) }) : '' data.maintenanceProjectProductInfoList ? data.maintenanceProjectProductInfoList.forEach((ele) => { @@ -786,7 +786,7 @@ ${ ele.catalogueAllPriceFormmat = ele.catalogueAllPrice ? formatAmountNumber(ele.catalogueAllPrice) : "" ele.allPriceFormmat = ele.allPrice ? formatAmountNumber(ele.allPrice) : "" ele.discountFormat = ele.discount ? (ele.discount*100).toFixed(2) : "" - ele.guidanceDiscountFormat = ele.guidanceDiscount ? ele.guidanceDiscount*100 : "" + ele.guidanceDiscountFormat = ele.guidanceDiscount ? (ele.guidanceDiscount*100).toFixed(2) : "" addProduct3(ele) }) : '' return @@ -802,7 +802,7 @@ ${ ele.catalogueAllPriceFormmat = ele.catalogueAllPrice ? formatAmountNumber(ele.catalogueAllPrice) : "" ele.allPriceFormmat = ele.allPrice ? formatAmountNumber(ele.allPrice) : "" ele.discountFormat = ele.discount ? (ele.discount*100).toFixed(2) : "" - ele.guidanceDiscountFormat = ele.guidanceDiscount ? ele.guidanceDiscount*100 : "" + ele.guidanceDiscountFormat = ele.guidanceDiscount ? (ele.guidanceDiscount*100).toFixed(2) : "" addProduct(ele) }) : '' res.data.hardwareProjectProductInfoList ? res.data.hardwareProjectProductInfoList.forEach((ele) => { @@ -811,7 +811,7 @@ ${ ele.catalogueAllPriceFormmat = ele.catalogueAllPrice ? formatAmountNumber(ele.catalogueAllPrice) : "" ele.allPriceFormmat = ele.allPrice ? formatAmountNumber(ele.allPrice) : "" ele.discountFormat = ele.discount ? (ele.discount*100).toFixed(2) : "" - ele.guidanceDiscountFormat = ele.guidanceDiscount ? ele.guidanceDiscount*100 : "" + ele.guidanceDiscountFormat = ele.guidanceDiscount ? (ele.guidanceDiscount*100).toFixed(2) : "" addProduct2(ele) }) : '' res.data.maintenanceProjectProductInfoList ? res.data.maintenanceProjectProductInfoList.forEach((ele) => { @@ -820,7 +820,7 @@ ${ ele.catalogueAllPriceFormmat = ele.catalogueAllPrice ? formatAmountNumber(ele.catalogueAllPrice) : "" ele.allPriceFormmat = ele.allPrice ? formatAmountNumber(ele.allPrice) : "" ele.discountFormat = ele.discount ? (ele.discount*100).toFixed(2) : "" - ele.guidanceDiscountFormat = ele.guidanceDiscount ? ele.guidanceDiscount*100 : "" + ele.guidanceDiscountFormat = ele.guidanceDiscount ? (ele.guidanceDiscount*100).toFixed(2) : "" addProduct3(ele) }) : '' }) diff --git a/ruoyi-admin/src/main/resources/templates/project/order/edit.html b/ruoyi-admin/src/main/resources/templates/project/order/edit.html index 089725d4..347ef861 100644 --- a/ruoyi-admin/src/main/resources/templates/project/order/edit.html +++ b/ruoyi-admin/src/main/resources/templates/project/order/edit.html @@ -794,7 +794,7 @@ ${ ele.catalogueAllPriceFormmat = ele.catalogueAllPrice ? formatAmountNumber(ele.catalogueAllPrice) : "" ele.allPriceFormmat = ele.allPrice ? formatAmountNumber(ele.allPrice) : "" ele.discountFormat = ele.discount ? (ele.discount*100).toFixed(2) : "" - ele.guidanceDiscountFormat = ele.guidanceDiscount ? ele.guidanceDiscount*100 : "" + ele.guidanceDiscountFormat = ele.guidanceDiscount ? (ele.guidanceDiscount*100).toFixed(2) : "" addProduct(ele) }) : ''; res.data.hardwareProjectProductInfoList ? res.data.hardwareProjectProductInfoList.forEach((ele) => { @@ -803,7 +803,7 @@ ${ ele.catalogueAllPriceFormmat = ele.catalogueAllPrice ? formatAmountNumber(ele.catalogueAllPrice) : "" ele.allPriceFormmat = ele.allPrice ? formatAmountNumber(ele.allPrice) : "" ele.discountFormat = ele.discount ? (ele.discount*100).toFixed(2) : "" - ele.guidanceDiscountFormat = ele.guidanceDiscount ? ele.guidanceDiscount*100 : "" + ele.guidanceDiscountFormat = ele.guidanceDiscount ? (ele.guidanceDiscount*100).toFixed(2) : "" addProduct2(ele) }) : ''; res.data.maintenanceProjectProductInfoList ? res.data.maintenanceProjectProductInfoList.forEach((ele) => { @@ -812,7 +812,7 @@ ${ ele.catalogueAllPriceFormmat = ele.catalogueAllPrice ? formatAmountNumber(ele.catalogueAllPrice) : "" ele.allPriceFormmat = ele.allPrice ? formatAmountNumber(ele.allPrice) : "" ele.discountFormat = ele.discount ? (ele.discount*100).toFixed(2) : "" - ele.guidanceDiscountFormat = ele.guidanceDiscount ? ele.guidanceDiscount*100 : "" + ele.guidanceDiscountFormat = ele.guidanceDiscount ? (ele.guidanceDiscount*100).toFixed(2) : "" addProduct3(ele) }) : ''; window.localStorage.removeItem('getDetail') diff --git a/ruoyi-admin/src/main/resources/templates/system/product/edit.html b/ruoyi-admin/src/main/resources/templates/system/product/edit.html index 8b52fd66..0f3398cd 100644 --- a/ruoyi-admin/src/main/resources/templates/system/product/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/product/edit.html @@ -122,7 +122,7 @@ } let guidanceDiscount=[[${productInfo.guidanceDiscount}]] if (guidanceDiscount){ - $('#guidanceDiscountFormat').val(guidanceDiscount*100) + $('#guidanceDiscountFormat').val((guidanceDiscount*100).toFixed(2)) } })