diff --git a/oms_web/oms_vue/src/utils/ruoyi.js b/oms_web/oms_vue/src/utils/ruoyi.js index 3de2d98d..ae9eadfb 100644 --- a/oms_web/oms_vue/src/utils/ruoyi.js +++ b/oms_web/oms_vue/src/utils/ruoyi.js @@ -226,3 +226,9 @@ export function getNormalPath(p) { export function blobValidate(data) { return data.type !== 'application/json' } +export function preciseCurrencyRound(amount,decimalPlace) { + if (decimalPlace){ + return Number(Math.round(amount + `e${decimalPlace}`) + `e-${decimalPlace}`); + } + return Number(Math.round(amount + 'e2') + 'e-2'); +} diff --git a/oms_web/oms_vue/src/views/approve/approved_order/index.vue b/oms_web/oms_vue/src/views/approve/approved_order/index.vue index 3b2d0762..e09971e6 100644 --- a/oms_web/oms_vue/src/views/approve/approved_order/index.vue +++ b/oms_web/oms_vue/src/views/approve/approved_order/index.vue @@ -148,6 +148,8 @@ export default { customerName: null, dutyName: null, approveNode: null, + orderByColumn:'approveTime', + isAsc: 'desc' }, }; }, diff --git a/oms_web/oms_vue/src/views/approve/order/ConfigInfo.vue b/oms_web/oms_vue/src/views/approve/order/ConfigInfo.vue index b20a64f8..7a7c3db1 100644 --- a/oms_web/oms_vue/src/views/approve/order/ConfigInfo.vue +++ b/oms_web/oms_vue/src/views/approve/order/ConfigInfo.vue @@ -206,6 +206,8 @@