diff --git a/src/stores/MeetingData.js b/src/stores/MeetingData.js index 180bb10..bb889f8 100644 --- a/src/stores/MeetingData.js +++ b/src/stores/MeetingData.js @@ -174,7 +174,7 @@ class MeetingData { GHTableData = []; GHTableLoading = false; /** - * 获取市场订单数据 + * 获取市场订单数据 --------------------------------------------------------------------------------------------------- */ dataGHOrder = async (param) => { // console.log('dataGH', param); @@ -227,7 +227,7 @@ class MeetingData { GHSalesTableData = []; GHSalesLoading = false; /** - * 获取GH销售数据 + * 获取GH销售数据 --------------------------------------------------------------------------------------------------- */ dataGHSales = async (param) => { this.GHSalesLoading = true; @@ -272,17 +272,25 @@ class MeetingData { GHServiceTableData = []; GHServiceLoading = false; + /** + * 获取GH服务数据 --------------------------------------------------------------------------------------------------- + */ dataGHService = async (param) => { this.GHServiceLoading = true; const serviceParam = { ...param, DateType: 'startDate' }; - const { total1: CHDataWeek } = await getAgentGroupInfoALL({ ...serviceParam, 'DepartmentList': '1', }); + // 走团数 + const { ordercountTotal1: { OrderCount: GroupCount } } = await getOrderCountByType({ ...serviceParam, 'DepartmentList': '1', 'WebCode': 'All', OrderType: 'Form' }); + // 好评数 + const { total1: { GoodCount } } = await getAgentGroupInfoALL({ ...serviceParam, 'DepartmentList': '1', }); const yearStart = moment().startOf("year").format(DATE_FORMAT); - const { total1: CHDataYear } = await getAgentGroupInfoALL({ ...serviceParam, Date1: yearStart, 'DepartmentList': '1', }); + // 走团数 - 年 + const { ordercountTotal1: { OrderCount: GroupCountYear } } = await getOrderCountByType({ ...serviceParam, 'DepartmentList': '1', 'WebCode': 'All', OrderType: 'Form', Date1: yearStart, }); + const { total1: { GoodCountYear } } = await getAgentGroupInfoALL({ ...serviceParam, Date1: yearStart, 'DepartmentList': '1', }); // const { total1: yearData } = await getAgentGroupInfoALL({ ...serviceParam, 'DepartmentList': '28,33', Country: 'foreign' }); const rows = [ - { key: 'ch', label: '中国', ...pick(CHDataWeek, ['GroupCount', 'GoodCount']), rowYear: { GroupCount: CHDataYear.GroupCount, GoodCount: CHDataYear.GoodCount } }, + { key: 'ch', label: '中国', ...{GoodCount, GroupCount}, rowYear: { GroupCount: GroupCountYear, GoodCount: GoodCountYear } }, // { key: 'ja', label: '日本+', ...dataJA(exceptCHData, exceptCHDataYear) }, // { key: 'se', label: '东南亚+', ...dataSE(exceptCHData, exceptCHDataYear) }, // { key: 'in', label: '印度+', ...dataIN(exceptCHData, exceptCHDataYear) },