Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

config/routes/procurementRoute/purchaseRequisitionRoute.ts

@@ -41,14 +41,14 @@ export const purchaseRequisitionRoute = [
       {
         path: '/memberCenter/procurementAbility/purchaseRequisition/readyAddBill/add',
         name: 'addReadyAddBill',
-        component: '@/pages/transaction/purchaseRequisition/increaseRequesition',
+        component: '@/pages/transaction/purchaseRequisition/increaseRequisition',
         hideInMenu: true,
       },
       // 待新增请购单-编辑请购单
       {
         path: '/memberCenter/tranactionAbility/purchaseRequisition/readyAddBill/edit',
         name: 'eidtReadyAddBill',
-        component: '@/pages/transaction/purchaseRequisition/increaseRequesition',
+        component: '@/pages/transaction/purchaseRequisition/increaseRequisition',
         hideInMenu: true,
       },
     ]

src/pages/transaction/purchaseRequisition/increaseRequesition/index.tsx → src/pages/transaction/purchaseRequisition/increaseRequisition/index.tsx

@@ -61,7 +61,7 @@ export const MoneyTotalBox = registerVirtualBox('moneyTotalBox', props => {
 
 
 /** 采购请购单 新增 */
-const IncreaseRequesition:React.FC<{}> = () => {
+const IncreaseRequisition:React.FC<{}> = () => {
   const departmentRef = useRef<any>({}) // 选部门
   const memberRef = useRef<any>({})
   const [formLoading, setFormLoading] = useState(false)
@@ -225,6 +225,6 @@ const IncreaseRequesition:React.FC<{}> = () => {
   )
 }
 
-IncreaseRequesition.defaultProps = {}
+IncreaseRequisition.defaultProps = {}
 
-export default IncreaseRequesition
+export default IncreaseRequisition

src/pages/transaction/purchaseRequisition/requesitionOrder/detail/index.tsx → src/pages/transaction/purchaseRequisition/requisitionOrder/detail/index.tsx

-import React, { useRef } from 'react'
+import React from 'react'
 import { history } from 'umi'
 import { Card, Button, Space } from 'antd'
 import { StandardTable } from 'god'
@@ -10,7 +10,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const'
 import Submit from '@/components/NiceForm/components/Submit'
 import '../index.less'
 import { tableListSchema } from '../../constant'
-import { useSelfTable } from '../model/useRequesitionOrder'
+import { useSelfTable } from '../model/useRequisitionOrder'
 
 // 请购单转订单 详情
 

src/pages/transaction/purchaseRequisition/requesitionOrder/index.tsx → src/pages/transaction/purchaseRequisition/requisitionOrder/index.tsx

-import React, { useRef } from 'react'
+import React from 'react'
 import { history } from 'umi'
 import { Card, Button, Space } from 'antd'
 import { StandardTable } from 'god'
@@ -8,21 +8,21 @@ import { PlusCircleOutlined } from '@ant-design/icons'
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
 import { FORM_FILTER_PATH } from '@/formSchema/const'
 import Submit from '@/components/NiceForm/components/Submit'
-import { useSelfTable } from './model/useRequesitionOrder'
+import { useSelfTable } from './model/useRequisitionOrder'
 import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
 import '../index.less'
 import { tableListSchema } from '../constant'
 
 // 请购单转订单
 
-export interface RequesitionOrderProps {}
+export interface RequisitionOrderProps {}
 
 const fetchTableData = async (params) => {
   const { data } = await PublicApi.getOrderBuyerCreatePage(params)
   return data
 }
 
-const RequesitionOrder:React.FC<RequesitionOrderProps> = () => {
+const RequisitionOrder:React.FC<RequisitionOrderProps> = () => {
   const { columns, ref } = useSelfTable()
 
   const clickAdd = () => {
@@ -80,6 +80,6 @@ const RequesitionOrder:React.FC<RequesitionOrderProps> = () => {
   </PageHeaderWrapper>
 }
 
-RequesitionOrder.defaultProps = {}
+RequisitionOrder.defaultProps = {}
 
-export default RequesitionOrder
+export default RequisitionOrder