diff --git a/src/stores/CustomerStore.js b/src/stores/CustomerStore.js index 8c6525b..c6074c3 100644 --- a/src/stores/CustomerStore.js +++ b/src/stores/CustomerStore.js @@ -463,8 +463,8 @@ class CustomerStore { IncludeTickets: { key: '0', label: '不含门票' }, }, pivotData: { - operatorName: { loading: false, data: [], rawData: [], filterColValues: [] }, - country: { loading: false, data: [], rawData: [], filterColValues: [] }, + operatorName: { loading: false, data: [], rawData: [], mergedData: [], filterColValues: [] }, + country: { loading: false, data: [], rawData: [], mergedData: [], filterColValues: [] }, }, }; diff --git a/src/views/SalesCustomerCareRegular.jsx b/src/views/SalesCustomerCareRegular.jsx index 0c2e325..158e140 100644 --- a/src/views/SalesCustomerCareRegular.jsx +++ b/src/views/SalesCustomerCareRegular.jsx @@ -140,6 +140,39 @@ const SalesCustomerCareRegular = (props) => { children: ( <> {/*

{ele.label}-老客户, 含推荐

*/} + <> + + {pageData[pivotRow].data.length > 0 && pivotRow === 'operatorName' && ( + { + setIfmerge(e); + }} + /> + )} + + + + + + + + { ), }; })} - tabBarExtraContent={{ - right: ( - <> - {pageData[pivotRow].data.length > 0 && pivotRow === 'operatorName' && ( - { - setIfmerge(e); - }} - /> - )} - - - - - - - - ), - }} /> );