Merge branch 'jinfa-20221102' into 'jinfa-20221102'

src/pages/statistic/purchaseStatistics/purchaseReport/index.tsx

 import React, { useState, useEffect } from 'react'
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import { Card, Cascader, Space,Button } from 'antd'
+import { Card, Cascader, Space, Button } from 'antd'
 import Statement from '@/components/statisticsStatement'
 import { useIntl } from 'umi'
 import moment from 'moment'
@@ -13,8 +13,8 @@ import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect'
 import { useCustomerCategoriesBusinessEffects } from '@/formSchema/effects/useCustomerCategoriesBusinessEffectsStatistics'
 import { FORM_FILTER_PATH } from '@/formSchema/const'
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
-import {getMemberAbilityMaintenancePageitems} from '@/services/MemberV2Api';
-import {getReportDxPurchaseExecutionDetailsExport} from '@/services/ReportV2Api';
+import { getMemberAbilityMaintenancePageitems } from '@/services/MemberV2Api';
+import { getReportDxPurchaseExecutionDetailsExport } from '@/services/ReportV2Api';
 import { handleExportFile } from '@/utils/downloads'
 /**
  * 请购单报表
@@ -129,7 +129,7 @@ const Index = () => {
         'x-component-props': {
           rowStyle: {
             justifyContent: 'flex-start',
-            flexWrap: 'nowrap',
+            // flexWrap: 'nowrap',
           },
           colStyle: {
             //改变间隔
@@ -149,6 +149,30 @@ const Index = () => {
               placeholder: intl.formatMessage({ id: 'material.name' }),
             },
           },
+          sapNo: {
+            type: 'string',
+            title: 'SAP物料编码',
+            'x-component-props': {
+              placeholder: intl.formatMessage({ id: 'common.enter' }),
+              style: { width: '120px' },
+            },
+          },
+          sapCode: {
+            type: 'string',
+            title: 'SAP请购单编码',
+            'x-component-props': {
+              placeholder: intl.formatMessage({ id: 'common.enter' }),
+              style: { width: '120px' },
+            },
+          },
+          manager: {
+            type: 'string',
+            title: '产品经理',
+            'x-component-props': {
+              placeholder: intl.formatMessage({ id: 'common.enter' }),
+              style: { width: '120px' },
+            },
+          },
           categoryCode: {
             type: 'string',
             'x-component': 'Cascader',
@@ -217,21 +241,21 @@ const Index = () => {
 
   return (
     <PageHeaderWrapper
-      // subTitle={
-      //   <HeaderSelectCompany
-      //     onOk={(selectedRows) => {
-      //       setSelectedCompany(selectedRows)
-      //       actions.submit()
-      //     }}
-      //   />
-      // }
+    // subTitle={
+    //   <HeaderSelectCompany
+    //     onOk={(selectedRows) => {
+    //       setSelectedCompany(selectedRows)
+    //       actions.submit()
+    //     }}
+    //   />
+    // }
     >
       <Space direction="vertical" size={16} style={{ width: '100%' }}>
         <Card>
           <NiceForm
             actions={actions}
             schema={searchSchema}
-            components={{ Cascader , ExportBtn}}
+            components={{ Cascader, ExportBtn }}
             onSubmit={(values) => handleSubmit(values)}
             onReset={handleReset}
             expressionScope={{
@@ -257,8 +281,8 @@ const Index = () => {
           <Statement
             url="/superset/dashboard/requestPurchase"
             params={params}
-            
-            
+
+
           />
         </Card>
       </Space>