diff --git a/src/stores/SaleStore.js b/src/stores/SaleStore.js index 29a27b9..bba182c 100644 --- a/src/stores/SaleStore.js +++ b/src/stores/SaleStore.js @@ -265,7 +265,7 @@ class SaleStore { sorter: (a, b) => b.WXNewGuestCount - a.WXNewGuestCount, }, ]; - result.dataSource = json.result1; + result.dataSource = json.result1.sort(comm.sortBy('PriceTime')).reverse(); } else if (this.active_tab_key === 'ResponseRateWhatsApp') { result.columns = [ { @@ -341,7 +341,7 @@ class SaleStore { sorter: (a, b) => b.COLI_ConfirmTimeAVG - a.COLI_ConfirmTimeAVG, }, ]; - result.dataSource = json.result1; + result.dataSource = json.result1.sort(comm.sortBy('COLI_ConfirmTimeAVG')).reverse(); } else { const diffDateFlagYes = !comm.isEmpty(date_moment.start_date_cp); // if (this.active_tab_key == "Country") @@ -419,13 +419,17 @@ class SaleStore { vs: comm.fixTo2Decimals(((total_data_value-total_data_value_diff)/total_data_value_diff)*100)+'%', }; result.columns.push({ - title: item.SubTypeName, + title: item.SubTypeName, _val: total_data_value, children: [{ title: diffDateFlagYes ? comm.show_vs_tag(columnDiff.vs, columnDiff.diff, total_data_value, total_data_value_diff) : total_data_value, dataIndex: data_index }], sorter: (a, b) => b[`TV_${item.SubTypeSN}`] - a[`TV_${item.SubTypeSN}`], }); return item; }); - result.dataSource = type_data_arr; + result.columns = [].concat( + comm.cloneDeep(result.columns).slice(0, 2), + comm.cloneDeep(result.columns).slice(2).sort(comm.sortBy('_val')).reverse() + ); + result.dataSource = type_data_arr.sort(comm.sortBy('T_total')).reverse(); } } runInAction(() => {