Merge branch 'master' into feat/sentry

* master:
  fix: 修改商品导出传参问题
  feat: 修复tab切换页码问题
  feat: 修改分页传参字段

src/pages/AfterSaleManage/index.jsx

@@ -255,7 +255,10 @@ const AfterSale = props => {
   const tabChange = tabIndex => {
     setCurrentTab(tabIndex);
     const { type, dealStatus } = TAB_MAPPING_DATA[tabIndex];
+
     form.resetFields();
+    // 清空页码
+    actionRef.current.reloadAndRest();
     form.setFieldsValue({
       ...tableParams,
       dealStatus,
@@ -332,20 +335,20 @@ const AfterSale = props => {
     scroll: { x: '100%', y: tableScrollY },
     rowKey: r => r.serviceNo,
     request: async params => {
+      console.log(params);
       const [start, end] = params.afterTime || afterTime;
-      const { current: page, pageSize: size } = params;
+      const { current: pageNo, pageSize } = params;
       const startDate = start ? moment(start).format('YYYY-MM-DD') : '';
       const endDate = end ? moment(end).format('YYYY-MM-DD') : '';
       const requestParams = {
-        page,
-        size,
+        pageNo,
+        pageSize,
         ...params,
         startDate,
         endDate,
       };
       delete requestParams.afterTime;
       delete requestParams.current;
-      delete requestParams.pageSize;
       const countRes = await getAfterPendingNum({
         startDate,
         endDate,

src/pages/GoodsManage/SearchForm/index.jsx

@@ -84,7 +84,12 @@ class goodsManage extends Component {
       loading: true,
     });
     const form = this.formRef?.current?.getFieldValue();
-    const res = await apiGoodsInfosExport(form);
+    const params = Object.assign({}, form);
+    const productCategoryId = form?.productCategoryId || [];
+    if (productCategoryId.length) {
+      params.productCategoryId = productCategoryId[productCategoryId.length - 1] || '';
+    }
+    const res = await apiGoodsInfosExport(params);
     this.setState({
       loading: false,
     });