diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue index 32214f6..03df042 100644 --- a/src/views/statisticalReport/budgetProgress.vue +++ b/src/views/statisticalReport/budgetProgress.vue @@ -81,7 +81,8 @@ department: '', showDatePicker:'', start_created_at:'', - end_created_at:'' + end_created_at:'', + sort_type: 'asc' }, rateTotal: '0%', moneyTotal: 0, @@ -150,24 +151,14 @@ width: 180 }, { - prop: 'rate', + prop: 'calculation_result', label: '进展率', width: 200, fixed: "right", customFn: (row) => { - let m2 = row.update_money; - let m1 = row.money; - let m3 = row.use_money_total; - let per = 0; - - if (m2 != 0) { - per = ((m3 / m2) * 100).toFixed(2); - } else if (m1 != 0) { - per = ((m3 / m1) * 100).toFixed(2); - } return ( < div > ) }