perf: 老客户-分析: 移动端显示

src/stores/CustomerStore.js

@@ -463,8 +463,8 @@ class CustomerStore {
         IncludeTickets: { key: '0', label: '不含门票' },
       },
       pivotData: {
-        operatorName: { loading: false, data: [], rawData: [], filterColValues: [] },
+        operatorName: { loading: false, data: [], rawData: [], mergedData: [], filterColValues: [] },
-        country: { loading: false, data: [], rawData: [], filterColValues: [] },
+        country: { loading: false, data: [], rawData: [], mergedData: [], filterColValues: [] },
       },
     };
 

src/views/SalesCustomerCareRegular.jsx

@@ -140,31 +140,8 @@ const SalesCustomerCareRegular = (props) => {
             children: (
               <>
                 {/* <h2>{ele.label}-老客户, 含推荐</h2> */}
-                <Table
-                  sticky
-                  dataSource={dataSource}
-                  loading={pageData[ele.key].loading}
-                  columns={[
-                    {
-                      key: ele.key,
-                      title: ele.label,
-                      dataIndex: ele.key,
-                      width: '6em',
-                      filters: pageData[ele.key].filterColValues,
-                      onFilter: (value, record) => value.includes(record[ele.key]),
-                      filterSearch: true,
-                    },
-                    ...columns,
-                  ]}
-                  pagination={false}
-                />
-              </>
-            ),
-          };
-        })}
-        tabBarExtraContent={{
-          right: (
                 <>
+                  <Divider orientation={'right'} style={{backgroundColor: '#fff', margin: 0, padding: '10px 0'}} >
                   {pageData[pivotRow].data.length > 0 && pivotRow === 'operatorName' && (
                     <Switch
                       unCheckedChildren="各账户"
@@ -179,24 +156,45 @@ const SalesCustomerCareRegular = (props) => {
                   <Divider type={'vertical'} />
                   <TableExportBtn
                     btnTxt="导出明细"
-                label={`${formValuesToSub.Date1}-${'ele.label'}.老客户-明细`}
+                    label={`${formValuesToSub.Date1}-老客户-明细`}
-                {...{ columns: [{ title: 'ele.label', dataIndex: pivotRow, key: pivotRow }, ...rowColumns], dataSource: pageData[pivotRow].rawData }}
+                    {...{ columns: [{ title: ele.label, dataIndex: pivotRow, key: pivotRow }, ...rowColumns], dataSource: pageData[pivotRow].rawData }}
                   />
                   <Divider type={'vertical'} />
                   <TableExportBtn
                     btnTxt="导出下表-展开"
-                label={`${formValuesToSub.Date1}-${'ele.label'}.老客户`}
+                    label={`${formValuesToSub.Date1}-${ele.label}.老客户`}
-                {...{ columns: [{ title: 'ele.label', dataIndex: pivotRow, key: pivotRow }, ...columns], dataSource: dataForExport }}
+                    {...{ columns: [{ title: ele.label, dataIndex: pivotRow, key: pivotRow }, ...columns], dataSource: dataForExport }}
                   />
                   <Divider type={'vertical'} />
                   <TableExportBtn
                     btnTxt="导出下表-总"
-                label={`${formValuesToSub.Date1}-${'ele.label'}.老客户`}
+                    label={`${formValuesToSub.Date1}-${ele.label}.老客户`}
-                {...{ columns: [{ title: 'ele.label', dataIndex: pivotRow, key: pivotRow }, ...columns], dataSource: dataForExportS }}
+                    {...{ columns: [{ title: ele.label, dataIndex: pivotRow, key: pivotRow }, ...columns], dataSource: dataForExportS }}
+                  />
+                  </Divider>
+                </>
+                <Table
+                  sticky
+                  dataSource={dataSource}
+                  loading={pageData[ele.key].loading}
+                  columns={[
+                    {
+                      key: ele.key,
+                      title: ele.label,
+                      dataIndex: ele.key,
+                      width: '6em',
+                      filters: pageData[ele.key].filterColValues,
+                      onFilter: (value, record) => value.includes(record[ele.key]),
+                      filterSearch: true,
+                    },
+                    ...columns,
+                  ]}
+                  pagination={false}
                 />
               </>
             ),
-        }}
+          };
+        })}
       />
     </>
   );