@bit-sun/business-component 2.4.19 → 3.0.0-alpha.0

package/src/components/Business/SearchSelect/BusinessUtils.ts

@@ -1,6 +1,6 @@
 // 此文件用于 处理业务组件 所用到的公共方法
 // @ts-nocheck
-import { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFile2Status, employeeType, orgType, nodeType, personDataSourceType } from './common';
+import { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFile2Status, employeeType, orgType, nodeType } from './common';
 import { getDictionarySource, getDictionaryTextByValue, loadSelectSource } from './utils';
 import { handleTextOverflow, tableColumnsImage } from '@/components/Business/BsSulaQueryTable/utils';
 import { getSkuImg } from '@/utils/TableUtils';
@@ -1900,7 +1900,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
   }
 
   //业务组织选择器（可筛选业务职能/组织类型/组织形态）
-  if (type === 'business-organization') {
+  if (type === 'business-organization') { 
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/orgViewNode/common/pageList`,
       filter: 'qp-name-like', // 过滤参数
@@ -1990,7 +1990,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '组织类型',
           dataIndex: 'orgType',
-          render: (text: any) => {
+          render: (text: any) => { 
             const obj = orgType.find((i: any) => i.value == text);
             return obj ? obj.text : '--';
           }
@@ -1998,7 +1998,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '组织形态',
           dataIndex: 'nodeType',
-          render: (text: any) => {
+          render: (text: any) => { 
             const obj = nodeType.find((i: any) => i.value == text);
             return obj ? obj.text : '--';
           }
@@ -2008,50 +2008,5 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     }
   }
 
-  // 人员选择器
-  if(type === 'person') {
-    requestConfig = {
-      url: `${prefixUrl.selectPrefix}/person`,
-      filter: 'qp-code,name-orGroup,like', // 过滤参数
-      mappingTextField: 'name',
-      mappingTextShowKeyField: 'code',
-      mappingValueField: 'code',
-      otherParams: {
-        sorter: 'desc-id'
-      }, // 默认参数
-      sourceName: 'personCode',
-      ...requestConfigProp,
-    }
-    tableSearchForm = [
-      { name: 'qp-name-like', label: '姓名' },
-      { name: 'qp-code-like', label: '员工工号' },
-      { name: 'qp-phone-like', label: '手机号' },
-    ]
-    modalTableProps = {
-      modalTableTitle: '添加人员',
-      tableSearchForm,
-      tableColumns: [
-        {
-          title: '姓名',
-          dataIndex: 'name',
-        },
-        {
-          title: '员工工号',
-          dataIndex: 'code',
-        },
-        {
-          title: '员工类型',
-          dataIndex: 'dataSource',
-          render: (text: number) => personDataSourceType.find((i: any) => i.value == text)?.text,
-        },
-        {
-          title: '手机号',
-          dataIndex: 'phone',
-        },
-      ],
-      ...modalTableBusProps
-    }
-  }
-
   return { modalTableProps, requestConfig, needModalTable };
 }

package/src/components/Business/SearchSelect/common.ts

@@ -116,19 +116,4 @@ const nodeType = [
   },
 ]
 
-const personDataSourceType = [
-  {
-    text: "平台自建",
-    value: 10,
-  },
-  {
-    text: "MDM",
-    value: 20,
-  },
-  {
-    text: "IAM",
-    value: 30,
-  },
-]
-
-export { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFile2Status, employeeType, orgType, nodeType, personDataSourceType }
+export { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFile2Status, employeeType, orgType, nodeType }

package/src/components/Business/SearchSelect/index.md

@@ -1327,7 +1327,7 @@ export default () => {
 };
 ```
 
-## 角色选择器 Select-ROLE-001
+# 角色选择器 Select-ROLE-001
 
 ```tsx
 import React, { useState } from 'react';
@@ -1384,61 +1384,4 @@ export default () => {
 };
 ```
 
-## 人员选择器 Select-PERSON-001
-
-```tsx
-import React, { useState } from 'react';
-import { Tabs } from 'antd';
-import {BusinessSearchSelect} from '../../../index.ts';
-
-const { TabPane } = Tabs;
-
-export default () => {
-  const selectProps = {
-    // mode: 'multiple',
-    // maxTagCount: 1,
-    // disabled: true
-  }
-  const selectPropsMultiple = {
-    mode: 'multiple',
-    maxTagCount: 1,
-  }
-
-  const [ tabKey, setTabKey ] = useState('single')
-  const [value, setValue] = useState(selectProps?.mode ? [] : null);
-  
-  const props = {
-    value,
-    onChange: (value: any) => {
-      console.log(value)
-      setValue(value)
-    },
-    selectProps,
-    selectBusinessType: 'person',
-  };
-
-  const onTabChange = (key) => {
-    setTabKey(key)
-    setValue(key === 'single' ? null: [])
-  }
-  
-  return (
-    <div>
-      <Tabs onChange={onTabChange} activeKey={tabKey}>
-        <TabPane tab='单选' key='single'>
-          {tabKey === 'single' && (
-            <BusinessSearchSelect {...props} />
-          )}
-        </TabPane>
-        <TabPane tab='多选' key='multiple'>
-          {tabKey === 'multiple' && (
-            <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
-          )}
-        </TabPane>
-      </Tabs>
-    </div>
-  );
-};
-```
-
 More skills for writing demo: https://d.umijs.org/guide/demo-principle

package/src/components/Business/SearchSelect/utils.ts

@@ -1,4 +1,4 @@
-import axios from 'axios';
+import request from '@/utils/request';
 import { message } from 'antd';
 import { stringify } from 'querystring';
 import ENUM from '@/utils/enumConfig';
@@ -57,7 +57,7 @@ const getDictionaryTextByValue = (dicCode: string, value: string | number) => {
 
 const loadSelectSource = (url: string, params?: any) => {
   return new Promise((resolve, reject) => {
-    axios
+    request
       .get(`${url}?${stringify(params)}`)
       .then((result: any) => {
         result = result.data;
@@ -67,7 +67,7 @@ const loadSelectSource = (url: string, params?: any) => {
         }
         resolve(result);
       })
-      .catch((err) => {
+      .catch((err: any) => {
         reject(err);
       });
   })
@@ -85,7 +85,7 @@ const handleDefaultPrefixUrl = (type: string) => {
     case 'physicalWarehouse': case 'realWarehouse': case 'virtualWarehouse': case 'channelWarehouse': case 'ownerWarehouse':
       result =  '/stock';
       break;
-    case 'inventoryOrg2': case 'purchaseOrg': case 'salesOrg': case 'employee2': case 'role': case 'person':
+    case 'inventoryOrg2': case 'purchaseOrg': case 'salesOrg': case 'employee2': case 'role':
       result =  '/user';
       break;
     case 'deliveryMode': case 'ruleTemplate':

package/src/components/Business/columnSettingTable/columnSetting.tsx

@@ -15,7 +15,7 @@ import fixedLeft from '../../../assets/fixed-left.svg';
 import fixedLeftActive from '../../../assets/fixed-left-active.svg';
 import fixedRight from '../../../assets/fixed-right.svg';
 import fixedRightActive from '../../../assets/fixed-right-active.svg';
-import axios from 'axios';
+import request from '@/utils/request';
 // import { request } from 'umi';
 import './index.less';
 import ENUM from '@/utils/enumConfig';
@@ -77,7 +77,7 @@ class SortableTable extends React.Component<SortTableProps> {
       fixed: item.fixed
     }))
 
-    axios({
+    request({
       url: handleRequestUrl('/user','/appConfig/saveUserOrder',appRequestConfig),
       method:'POST',
       data: {
@@ -140,12 +140,14 @@ class SortableTable extends React.Component<SortTableProps> {
     });
   };
 
+  isColumnsChange = (pre=[], next=[]) => {
+    const preKeyStr = pre.map(item => item.key || item.dataIndex).join(',');
+    const nextKeyStr = next.map(item => item.key || item.dataIndex).join(',');
+    return preKeyStr !== nextKeyStr;
+  }
+
   componentWillReceiveProps(nextProps: any) {
-    if (
-      this.props?.datasource &&
-      JSON.stringify(this.props?.datasource) !=
-      JSON.stringify(nextProps?.datasource)
-    ) {
+    if (this.isColumnsChange(this.props?.datasource, nextProps?.datasource)) {
       this.setInitValue(nextProps?.datasource || []);
     }
   }
@@ -763,4 +765,4 @@ class SortableTable extends React.Component<SortTableProps> {
   }
 }
 
-export default SortableTable;
+export default SortableTable;

package/src/components/Business/columnSettingTable/utils.tsx

@@ -13,35 +13,35 @@ import {
  //设置queryTable默认列宽
 export const getItemDefaultWidth = (item: any) => {
   let defaultWidth = 200;
+  if (Array.isArray(item.key) || Array.isArray(item.dataIndex)) return defaultWidth;
   let lowerCaseKey = (item.key || item.dataIndex)?.toLowerCase();
-  if (lowerCaseKey) {
-    switch (true) {
-      case item?.title === '操作' || lowerCaseKey === 'operate':
-        defaultWidth = 60;
-        break;
-      case lowerCaseKey.indexOf('number') > -1:
-      case lowerCaseKey.indexOf('quantity') > -1:
-      case lowerCaseKey.indexOf('amount') > -1:
-        defaultWidth = 90;
-        break;
-      case (lowerCaseKey.indexOf('no') > -1):
-        defaultWidth = 200;
-        break;
-      case lowerCaseKey.indexOf('code') > -1:
-        defaultWidth = 170;
-        break;
-      case lowerCaseKey.indexOf('time') > -1:
-        defaultWidth = 130;
-        break;
-      case lowerCaseKey.indexOf('status') > -1:
-        defaultWidth = 100;
-        break;
-      case lowerCaseKey.indexOf('user') > -1:
-        defaultWidth = 130;
-        break;
-      default:
-        break;
-    }
+  if (!lowerCaseKey) return defaultWidth;
+  switch (true) {
+    case item?.title === '操作' || lowerCaseKey === 'operate':
+      defaultWidth = 60;
+      break;
+    case lowerCaseKey.indexOf('number') > -1:
+    case lowerCaseKey.indexOf('quantity') > -1:
+    case lowerCaseKey.indexOf('amount') > -1:
+      defaultWidth = 90;
+      break;
+    case (lowerCaseKey.indexOf('no') > -1):
+      defaultWidth = 200;
+      break;
+    case lowerCaseKey.indexOf('code') > -1:
+      defaultWidth = 170;
+      break;
+    case lowerCaseKey.indexOf('time') > -1:
+      defaultWidth = 130;
+      break;
+    case lowerCaseKey.indexOf('status') > -1:
+      defaultWidth = 100;
+      break;
+    case lowerCaseKey.indexOf('user') > -1:
+      defaultWidth = 130;
+      break;
+    default:
+      break;
   }
   return defaultWidth;
 };
@@ -68,4 +68,4 @@ export const handleTextOverflow = (
       </span>
     </Tooltip>
   );
-};
+};

package/src/components/Functional/AddSelect/helps.ts

@@ -1,4 +1,5 @@
-import axios from 'axios';
+
+import request from '@/utils/request';
 import { stringify } from 'querystring';
 import { message } from 'antd';
 import { judgeIsRequestError } from '@/utils/requestUtils';
@@ -20,7 +21,7 @@ export const getSelectDataList = (record: any,item: any, selectKey: string) => {
 
 export const loadSelectSource = (url: string, params?: any) => {
   return new Promise((resolve, reject) => {
-    axios
+    request
       .get(`${url}?${stringify(params)}`)
       .then((result: any) => {
         result = result.data;
@@ -31,7 +32,7 @@ export const loadSelectSource = (url: string, params?: any) => {
         }
         resolve(result);
       })
-      .catch((err) => {
+      .catch((err:any) => {
         reject(err);
       });
   })

package/src/components/Functional/AddSelect/index.tsx

@@ -3,7 +3,7 @@ import React, { useState, useEffect } from 'react';
 import { useDebounceFn } from 'ahooks';
 import { Input, Button, Modal, Select, InputNumber, message, Spin, Form, Table, Checkbox, TreeSelect, Tooltip, Tag } from 'antd';
 import { SearchOutlined, CopyOutlined, CloseCircleOutlined } from '@ant-design/icons';
-import axios from 'axios';
+import request from '@/utils/request';
 import { stringify } from 'querystring';
 import _ from "lodash"
 import './index.less';
@@ -18,9 +18,19 @@ import { getItemDefaultWidth, noEmptyArray } from '@/components/Business/columnS
 import { getEmployeeId } from '@/utils/LocalstorageUtils';
 import { getSelectDataList, loadSelectSource, formatFormSourceList } from './helps';
 
+interface SearchFormItem {
+  name: string;
+  label: string;
+  filterFormItem?: FormItemProps;
+  initialSource?: any[];
+  field: any;
+  type?: string;
+  [formItemProps: string]: any;
+}
+
 const checkSpuMatchCode = (data: any) => {
   return new Promise((resolve, reject) => {
-      axios.post(`/stock/rwFrontRecordSkcDetail/checkSpuMatchCode`,data)
+      request.post(`/stock/rwFrontRecordSkcDetail/checkSpuMatchCode`,data)
         .then((result: any) => {
           result = result.data;
           if (judgeIsRequestError(result)) {
@@ -30,7 +40,7 @@ const checkSpuMatchCode = (data: any) => {
           }
           resolve(result);
         })
-        .catch((err) => {
+        .catch((err: any) => {
           reject(err);
         });
     })
@@ -75,13 +85,14 @@ const AddSelect = (props: any) => {
     needModalTable = true,
     getPopupContainer = undefined,
     onSaveCallback,
+    onCancelCallback,
     buttonText = '添加',
     buttonProps = {},
     beforeShowModal,
     tableCodeList = [], // 非必填 默认取组件定义code,如需自定义----数组第一位为供选择商品的table的code,第二位为已选择商品的table的code
     businessType = 'sku',
     isAllowRepeatedSelect = false,
-
+    clearTitle
   } = props;
   const { url, otherParams, isMap, fixedparameter, fieldValToParam, mappingTextField = 'name', mappingTextShowKeyField, mappingValueField = 'code', mappingTextShowTextField } = requestConfig || {};
   const resultSourceKey = sourceName || requestConfig?.sourceName || 'supplierCode'
@@ -134,7 +145,7 @@ const AddSelect = (props: any) => {
   );
 
   const [form] = Form.useForm();
-  const [tableSearchForm, setTableSearchForm] = useState(modalTableProps?.tableSearchForm)
+  const [tableSearchForm, setTableSearchForm] = useState<Array<SearchFormItem>>(modalTableProps?.tableSearchForm)
   const [caretLeftFlag, setCaretLeftFlag] = useState(true);
   const [tableData, setTableData] = useState([]);
   const [tablePagination, setTablePagination] = useState({ total: 0, size: "small", current: 1, pageSize: tableInitPageSize })
@@ -153,6 +164,7 @@ const AddSelect = (props: any) => {
   const codeToChoose = tableCodeList[0] || initTableCode[businessType][0];
   const codeSelected = tableCodeList[1] || initTableCode[businessType][1];
 
+  // FIXME: 特殊业务逻辑
   const checkSelectChange = async (bType: string, tList: any, recordKey: string, recordItem: any, selectItem: any, changeValue: string) => {
     if(bType == 'skc' && tList.some((i: any) => i[recordKey] == recordItem[recordKey] && i[selectItem.dataIndex] == changeValue)) {
       message.warning('相同skc配码不可设置相同哦')
@@ -186,6 +198,7 @@ const AddSelect = (props: any) => {
   }
   const setBusinessDefaultValue = (list: any, recordList: any) => {
     let result = list;
+    // FIXME: 特殊业务逻辑
     if(businessType == 'spu' && (recordList?.some((i: any) => i?.colorValues?.length == 1) || recordList?.some((i: any) => i?.defaultMatchingCode))) {
       result = list.map((i: any) => {
         recordList.forEach((record: any) => {
@@ -220,6 +233,7 @@ const AddSelect = (props: any) => {
             if(record.needFocus === true && currentIndex === 0) {
 
             }
+            // FIXME: 特殊业务逻辑
             let precisionObj=businessType == 'skc'?{
               precision: 0
             }:{};
@@ -478,7 +492,17 @@ const AddSelect = (props: any) => {
             }
           });
           delete params[key];
+        } else if (element && key.indexOf('*multiInput') >= 0) {
+        let name = '',
+          value = element['value'];
+        if (value.indexOf(',') >= 0) {
+          name = `qp-${element['name']}-in`;
+        } else {
+          name = `qp-${element['name']}-like`;
         }
+        params[name] = value;
+        delete params[key];
+      }
         else if (element && key.indexOf('*') >= 0) {
           const dataParams = key.split('*');
           dataParams.forEach((value, index) => {
@@ -513,8 +537,19 @@ const AddSelect = (props: any) => {
       ...fixedParam,
       ...params,
     }
-    axios
-      .get(`${url}?${stringify(queryParams)}`)
+    //todo 为了满足单个使用like查询，多个含，的使用in查询
+    if(!queryParams.unConvert){
+      Object.keys(queryParams).forEach(key =>{
+        if(String(queryParams[key]).includes(',')){
+          if(key.includes('like')){
+            queryParams[key.replace('like','in')]=queryParams[key];
+            delete queryParams[key];
+          }
+        }
+      })
+    }
+    request
+      .get(`${url}${url.includes("?")?"&":"?"}${stringify(queryParams)}`)
       .then((result: any) => {
         setFetching(false)
         result = result.data;
@@ -590,7 +625,7 @@ const AddSelect = (props: any) => {
           setTablePagination({ ...tablePagination, total: Number(res?.total || res?.totalCount || source.length), pageSize: Number(res?.size || res?.pageSize || (params?.pageSize || pageSize)), current: Number(res?.page || res?.currentPage || (params?.currentPage || currentPage)) })
         }
       })
-      .catch((err) => { setFetching(false) });
+      .catch((err: any) => { setFetching(false) });
   }
 
   const SelectScroll = e => {
@@ -742,6 +777,7 @@ const AddSelect = (props: any) => {
     setTableFormParams({});
     setIsModalVisible(false);
     setTableData([])
+    onCancelCallback && onCancelCallback();
     // if (selectMode) {
     //   run();
     // }
@@ -758,18 +794,24 @@ const AddSelect = (props: any) => {
   }
 
   const onSearchTable = () => {
-    const params = form.getFieldsValue();
-    setTableFormParams(params);
-    getData({ ...params, pageSize: tableInitPageSize }, 2)
-    // if (selectMode) {
-    //   getData(params)
-    // }
+    form.validateFields()
+    .then(() => {
+      const params = form.getFieldsValue();
+      setTableFormParams(params);
+      getData({ ...params, pageSize: tableInitPageSize }, 2)
+    })
   }
 
   const onResetTable = () => {
     form.resetFields();
     setTableFormParams({});
-    getData({ pageSize: tableInitPageSize, currentPage: 1 }, 2)
+    form.validateFields()
+    .then(() => {
+      getData({ pageSize: tableInitPageSize, currentPage: 1 }, 2)
+    })
+    .catch(() => {
+      setTableData([]);
+    })
   }
 
   const handleTableChange = (pagination) => {
@@ -846,14 +888,18 @@ const AddSelect = (props: any) => {
 
   const themeColor = { color: '#005CFF' }
 
-  const formItem = (list) => {
+  const formItem = (list: Array<SearchFormItem>) => {
     if (isModalVisible && list?.length) {
-      return list.map((i: any, index) => {
-        if (i?.type === 'select' || i?.field?.type === 'select') {
+      return list.map((i: SearchFormItem, index) => {
+        const {name, label, field, type='', filterFormItem, initialSource=[], ...restProps} = i;
+
+        if (type === 'custom_filter_form_item') return filterFormItem;
+
+        if (type === 'select' || field?.type === 'select') {
           return (
-            <Form.Item name={i.name} label={i.label} key={i.name}>
-              <Select style={{ width: '100%' }} placeholder='请选择' {...i?.field?.props}>
-                {i?.initialSource?.length && i?.initialSource.map((m: any) => (
+            <Form.Item name={name} label={label} key={name} {...restProps}>
+              <Select style={{ width: '100%' }} placeholder='请选择' {...field?.props}>
+                {initialSource.length && initialSource.map((m: any) => (
                   <Option value={m.value} key={m.value}>{m.text}</Option>
                 ))}
               </Select>
@@ -861,31 +907,31 @@ const AddSelect = (props: any) => {
           )
         }
 
-        if (i?.type === 'treeSelect' || i?.field?.type === 'treeSelect') {
+        if (type === 'treeSelect' || field?.type === 'treeSelect') {
           return (
-            <Form.Item name={i.name} label={i.label} key={i.name}>
-              <TreeSelect style={{ width: '100%' }} placeholder='请选择' {...i?.field?.props}></TreeSelect>
+            <Form.Item name={name} label={label} key={name} {...restProps}>
+              <TreeSelect style={{ width: '100%' }} placeholder='请选择' {...field?.props}></TreeSelect>
             </Form.Item>
           )
         }
 
-        if (i?.type === 'BusinessSearchSelect' || i?.field?.type === 'BusinessSearchSelect') {
+        if (type === 'BusinessSearchSelect' || field?.type === 'BusinessSearchSelect') {
           return (
             <div>
-              <Form.Item name={i.name} label={i.label} key={i.name}>
-                <BusinessSearchSelect {...i.field.props} />
+              <Form.Item name={name} label={label} key={name} {...restProps}>
+                <BusinessSearchSelect {...field?.props} />
               </Form.Item>
             </div>
           )
         }
 
-        if (i?.type === 'multipleQueryInput' || i?.field?.type === 'multipleQueryInput') {
+        if (type === 'multipleQueryInput' || field?.type === 'multipleQueryInput') {
           return (
             <div>
-              <Form.Item name={i.name} label={i.label} key={i.name}>
+              <Form.Item name={name} label={label} key={name} {...restProps}>
                 <QueryMutipleInput onValueChange={(value) => {
                   form.setFieldsValue({
-                    [i.name]: value
+                    [name]: value
                   })
                 }} />
               </Form.Item>
@@ -895,12 +941,12 @@ const AddSelect = (props: any) => {
 
         // 默认type是input
         return (
-          <Form.Item name={i.name} label={i.label} key={i.name}>
+          <Form.Item name={name} label={label} key={name} {...restProps}>
             <Input id={index === 0 ? "first-query" : 'index'} style={{ width: '100%' }} onKeyDown={(e) => {
               if (e.keyCode === 13) {
                 onSearchTable()
               }
-            }} placeholder='请输入' allowClear maxLength={100}  {...i?.field?.props} />
+            }} placeholder='请输入' allowClear maxLength={100}  {...field?.props} />
           </Form.Item>
         )
       })
@@ -1137,7 +1183,7 @@ const AddSelect = (props: any) => {
                       settingImgAttribute={{ width: 20, style: { marginTop: -2 } }}
                     />
                   </span>
-                  <div style={{ marginRight: 8 }}><span onClick={deleteSelectRows} style={{ ...themeColor, cursor: 'pointer' }}>清空所选商品</span></div>
+                  <div style={{ marginRight: 8 }}><span onClick={deleteSelectRows} style={{ ...themeColor, cursor: 'pointer' }}>{clearTitle??'清空所选商品'}</span></div>
                 </div>
               </div>
               <Table

package/src/components/Functional/BillEntry/index.tsx

@@ -4,7 +4,7 @@ import React, { useState, useRef, useEffect } from 'react';
 import { SearchOutlined, CopyOutlined, CloseCircleOutlined } from '@ant-design/icons';
 import { stringify } from 'querystring';
 import './index.less';
-import axios from 'axios';
+import request from '@/utils/request';
 import { Resizable } from 'react-resizable';
 import { checkQuantityAccuracy, precisionQuantity } from '@/utils/checkUtils';
 import { tableColumnsImage } from '@/components/Business/BsSulaQueryTable/utils';
@@ -27,7 +27,7 @@ const InputElement = ({
   const inputRef = useRef(false);
 
   const onSerchdata = (name: any) => {
-    axios
+    request
       .get(`/items/sku/pager/v2?${stringify({ 'skuCodeAndSkuName': name, 'pageSize': 100, 'qp-combination-eq': false, 'qp-approveStatus-eq': 1, 'qp-status-eq': 1 })}`)
       .then(({ data, status }: any) => {
         if (status === 200) {
@@ -624,7 +624,7 @@ const BillEntry: React.FC = ({ onSaveCallback, validDataUrl="/items/sku/import/c
     if(isBrandAuth){
       otherParams = { brandAuth: 'ctl-withAuth' }
     }
-    return axios
+    return request
       .post(validDataUrl, {
         ...otherParams,
         columns: ["skuCode", "quantity"],

package/src/components/Functional/DataImport/index.tsx

@@ -25,7 +25,7 @@ import {
   ProfileTwoTone,
   UnorderedListOutlined,
 } from '@ant-design/icons';
-import axios from 'axios';
+import request from '@/utils/request';
 import './index.less';
 import _ from "lodash"
 import { judgeIsRequestError } from '@/utils/requestUtils';
@@ -429,7 +429,7 @@ class DataImport extends React.Component {
       return _.compact(Object.values(d)).length
     })
 
-    axios
+    request
       .post(validDataUrl, {
         columns: columns,
         data: resultData,
@@ -489,7 +489,7 @@ class DataImport extends React.Component {
         console.log(setExportData);
         setExportData([123123]);
       })
-      .catch((err) => { });
+      .catch((err: any) => { });
   };
 
   filterData = (type: string) => {