refactor: 将mobx的contractReturnStore重命名

src/pages/Contract/Content/Income/components/Modal/index.tsx

@@ -1,7 +1,7 @@
 import Authorization from '@/components/Authorization'
 import DatePicker from '@/components/DatePicker'
 import MoneyInput from '@/components/MoneyInput'
-import { contractReturnStore, tenderStore } from '@/store/mobx'
+import { contractStore, tenderStore } from '@/store/mobx'
 import { iModalCommonProps } from '@/types/contract'
 import { apiContractSection } from '@/utils/common/api'
 import { contractTreeBaseId } from '@/utils/common/constStatus'
@@ -97,7 +97,7 @@ const ContractModal: React.FC<iModalCommonProps> = ({ modalObj: { type, visible,
         form.setFieldsValue({ treeId: row.contractId === contractTreeBaseId ? row.id : row.parentId })
       }
       if (type === 'update') {
-        const { content = '', name = '', price = '', partyA = '', partyB = '', partyASigner = '', partyBSigner = '', signerTime = '', remarks = '' } = contractReturnStore.contract
+        const { content = '', name = '', price = '', partyA = '', partyB = '', partyASigner = '', partyBSigner = '', signerTime = '', remarks = '' } = contractStore.contract
         form.setFieldsValue({ content, name, price, partyA, partyB, partyASigner, partyBSigner, signerTime: signerTime ? dayjs(signerTime) : '', remarks })
       } else if (type === 'return') {
         apiGetReturnWay().then(({ code = -1, data = [] }) => {
@@ -110,9 +110,9 @@ const ContractModal: React.FC<iModalCommonProps> = ({ modalObj: { type, visible,
             setOptions(options)
           }
         })
-        form.setFieldsValue({ contractsId: contractReturnStore.contract.id })
+        form.setFieldsValue({ contractsId: contractStore.contract.id })
       } else {
-        form.setFieldsValue({ id: contractReturnStore.contract.id })
+        form.setFieldsValue({ id: contractStore.contract.id })
       }
     }
   }, [ visible ])
@@ -123,7 +123,7 @@ const ContractModal: React.FC<iModalCommonProps> = ({ modalObj: { type, visible,
 
   // 处理添加回款的金额不应该超出最大值
   const handleMaxPrice = () => {
-    const maxPrice = parseFloat(contractReturnStore.contract.price) - parseFloat(contractReturnStore.contract.returned)
+    const maxPrice = parseFloat(contractStore.contract.price) - parseFloat(contractStore.contract.returned)
     return maxPrice
   }
 

src/pages/Contract/Content/Income/components/TableContent/index.tsx

@@ -1,7 +1,7 @@
 import Authorization from '@/components/Authorization'
 import { ZhSubmitButton } from '@/components/Button'
 import OssUploadModal from '@/components/OssUpload'
-import {  contractReturnStore, tenderStore } from '@/store/mobx'
+import {  contractStore, tenderStore } from '@/store/mobx'
 import { ContractTree, iShowTemplateState, iTemplateState } from '@/types/contract'
 import { iFile } from '@/types/file'
 import { apiSaveFileInfo } from '@/utils/common/api'
@@ -90,7 +90,7 @@ const GCsheet: React.FC<iTableContentPorps> = ({ changeModalType, row, setRow, h
           template2: data.sectionTemplate2
         })
       } else {
-        contractReturnStore.updateTree(data.sectionTree.children)
+        contractStore.updateTree(data.sectionTree.children)
       }
     }
     // 初始化时如果id存在说明只是table更新了，那么要将store里面的合同数据也一起更新，防止合同详情不是最新的数据
@@ -103,7 +103,7 @@ const GCsheet: React.FC<iTableContentPorps> = ({ changeModalType, row, setRow, h
   const handleUpdateContractName = async (payload: object) => {
     const { code = -1 } = await apiUpdateContractName(payload)
     if (code === consts.RET_CODE.SUCCESS) {
-      contractReturnStore.resetTree(type, tenderStore.tender.bidsectionId)
+      contractStore.resetTree(type, tenderStore.tender.bidsectionId)
     }
   }
 
@@ -232,14 +232,14 @@ const GCsheet: React.FC<iTableContentPorps> = ({ changeModalType, row, setRow, h
     const { code = -1, section = {}, contract: newContract = {} } = await apiGetContractWithDetail(id, bid, type)
     if (code === consts.RET_CODE.SUCCESS) {
       setRow(section)
-      contractReturnStore.updateContract(newContract)
+      contractStore.updateContract(newContract)
     }
   }
   const handleRowClass = (record: any) => {
     return record.id === row.id ? 'ant-table-row-selected editable-row' : ''
   }
   const tabOnClick = (key: string) => {
-    contractReturnStore.changeUpdate(key)
+    contractStore.changeUpdate(key)
   }
 
   // 阿里oss上传弹窗
@@ -249,7 +249,7 @@ const GCsheet: React.FC<iTableContentPorps> = ({ changeModalType, row, setRow, h
     const { code = -1 } = await apiSaveFileInfo(fileList, type === 'income' ? consts.DATA_TYPE.CONTRACT_RETURN : consts.DATA_TYPE.CONTRACT_PAID, row.contractId)
     if (code === consts.RET_CODE.SUCCESS) {
       setVisible(false)
-      contractReturnStore.changeUpdate('3')
+      contractStore.changeUpdate('3')
     }
   }
 
@@ -347,10 +347,10 @@ const GCsheet: React.FC<iTableContentPorps> = ({ changeModalType, row, setRow, h
     <div className={styles.spreadContent}>
       <div className={styles.spreadSheets}>
         {
-          contractReturnStore.showTable ?
+          contractStore.showTable ?
             <Table
               components={components}
-              dataSource={contractReturnStore.tree}
+              dataSource={contractStore.tree}
               columns={_tableColumns as ColumnTypes}
               bordered
               pagination={false}
@@ -373,14 +373,14 @@ const GCsheet: React.FC<iTableContentPorps> = ({ changeModalType, row, setRow, h
             right:
               <div className="pi-mg-right-5 pi-flex-row">
                 {
-                  contractReturnStore.contract.id && contractReturnStore.contract.status === contractConsts.status.checking ?
+                  contractStore.contract.id && contractStore.contract.status === contractConsts.status.checking ?
                     <>
                       <Button type="primary" size="small" onClick={() => changeModalType('return')} >添加回款</Button>
                     </>
                     : null
                 }
                 {
-                  contractReturnStore.contract.id && contractReturnStore.contract.status !== contractConsts.status.closed ?
+                  contractStore.contract.id && contractStore.contract.status !== contractConsts.status.closed ?
                     <>
                       <Authorization type="contract" auth="add">
                         <Button type="primary" size="small" onClick={() => changeModalType('update')} className="pi-mg-left-5">编辑合同</Button>
@@ -390,19 +390,19 @@ const GCsheet: React.FC<iTableContentPorps> = ({ changeModalType, row, setRow, h
                     : null
                 }
                 {
-                  contractReturnStore.contract.id && contractReturnStore.contract.status === contractConsts.status.willClose ?
+                  contractStore.contract.id && contractStore.contract.status === contractConsts.status.willClose ?
                     <Button type="primary" size="small" danger className="pi-mg-left-5" onClick={() => changeModalType('close')}>关闭合同</Button>
                     : null
                 }
                 {
-                  contractReturnStore.contract.id && contractReturnStore.contract.status === contractConsts.status.closed ?
+                  contractStore.contract.id && contractStore.contract.status === contractConsts.status.closed ?
                     <ZhSubmitButton type="primary" size="small" danger className="pi-mg-left-5" onClick={() => changeModalType('unlock')}>解锁合同</ZhSubmitButton>
                     : null
                 }
               </div>
           }}>
           <TabPane key="1" tab="合同详情">
-            <Detail {...contractReturnStore.contract} />
+            <Detail {...contractStore.contract} />
           </TabPane>
           <TabPane key="2" tab="合同回款">
             <Receivable updateTreeAndContract={initData} type={type}/>

src/pages/Contract/Content/Income/components/Tabs/File/index.tsx

@@ -1,4 +1,4 @@
-import { contractReturnStore } from '@/store/mobx'
+import { contractStore } from '@/store/mobx'
 import { apiDelFile, apiGetFileList } from '@/utils/common/api'
 import consts from '@/utils/consts'
 import { dayjsFormat } from '@/utils/util'
@@ -20,19 +20,19 @@ const File: React.FC<{type: 'income' | 'expenditure'}> = ({ type }) => {
   const [ total, setTotal ] = useState<number>(0)
   const [ id, setId ] = useState<string>('')
   useEffect(() => {
-    if (contractReturnStore.contract.id) {
-      if (contractReturnStore.contract.id !== id) {
-        setId(contractReturnStore.contract.id)
+    if (contractStore.contract.id) {
+      if (contractStore.contract.id !== id) {
+        setId(contractStore.contract.id)
         initData()
-      } else if (contractReturnStore.shouldUpdate && contractReturnStore.shouldUpdate === '3') {
+      } else if (contractStore.shouldUpdate && contractStore.shouldUpdate === '3') {
         initData()
       }
-      contractReturnStore.shouldUpdate && (contractReturnStore.changeUpdate(''))
+      contractStore.shouldUpdate && (contractStore.changeUpdate(''))
     }
-  }, [ contractReturnStore.contract.id, contractReturnStore.shouldUpdate ])
+  }, [ contractStore.contract.id, contractStore.shouldUpdate ])
 
   const initData = async (pageNo: number = 1, pageSize: number = 7) => {
-    const { code = -1, data = [], total = 0 } = await apiGetFileList(type === 'income' ? consts.DATA_TYPE.CONTRACT_RETURN : consts.DATA_TYPE.CONTRACT_PAID, contractReturnStore.contract.id, pageNo, pageSize)
+    const { code = -1, data = [], total = 0 } = await apiGetFileList(type === 'income' ? consts.DATA_TYPE.CONTRACT_RETURN : consts.DATA_TYPE.CONTRACT_PAID, contractStore.contract.id, pageNo, pageSize)
     if (code === consts.RET_CODE.SUCCESS) {
 
       setData(data)

src/pages/Contract/Content/Income/components/Tabs/Receivable/index.tsx

@@ -1,6 +1,6 @@
 import DatePicker from '@/components/DatePicker'
 import FileModal from '@/components/FileModal'
-import { contractReturnStore } from '@/store/mobx'
+import { contractStore } from '@/store/mobx'
 import { iReceivableState, iEditableCellProps } from '@/types/contract'
 import { iFileModal } from '@/types/file'
 import consts from '@/utils/consts'
@@ -68,19 +68,19 @@ const Receivable: React.FC<ReceivableProps> = ({ updateTreeAndContract, type })
   }
 
   useEffect(() => {
-    if (contractReturnStore.contract.id) {
-      if (contractReturnStore.contract.id !== id) {
-        setId(contractReturnStore.contract.id)
+    if (contractStore.contract.id) {
+      if (contractStore.contract.id !== id) {
+        setId(contractStore.contract.id)
         initData()
-      } else if (contractReturnStore.shouldUpdate && contractReturnStore.shouldUpdate === '2') {
+      } else if (contractStore.shouldUpdate && contractStore.shouldUpdate === '2') {
         initData()
       }
-      contractReturnStore.shouldUpdate && (contractReturnStore.changeUpdate(''))
+      contractStore.shouldUpdate && (contractStore.changeUpdate(''))
     }
-  }, [ contractReturnStore.contract.id, contractReturnStore.shouldUpdate ])
+  }, [ contractStore.contract.id, contractStore.shouldUpdate ])
 
   const initData = async () => {
-    const { code = -1, data = [] } = await apiGetReturns(type, contractReturnStore.contract.id, contractReturnStore.contract.bidsectionId)
+    const { code = -1, data = [] } = await apiGetReturns(type, contractStore.contract.id, contractStore.contract.bidsectionId)
     if (code === consts.RET_CODE.SUCCESS) {
       setData(data)
     }

src/pages/Contract/Content/Income/index.tsx

@@ -3,7 +3,7 @@ import Slot from '@/components/Header/slot'
 import RuleModal from '@/components/RuleModal'
 import SvgIcon from '@/components/SvgIcon'
 import { apiSaveRule } from '@/pages/Safe/Content/List/api'
-import { contractReturnStore, tenderStore } from '@/store/mobx'
+import { contractStore, tenderStore } from '@/store/mobx'
 import { ContractTree, iModalProps } from '@/types/contract'
 import { contractTreeBaseId } from '@/utils/common/constStatus'
 import consts from '@/utils/consts'
@@ -14,7 +14,7 @@ import ContractModal from './components/Modal'
 import TableContent from './components/TableContent'
 import Authorization from '@/components/Authorization'
 import { RouteComponentProps } from 'react-router'
-import { ContractType } from '@/store/mobx/contractReturn'
+import { ContractType } from '@/store/mobx/contract'
 
 interface iModal {
   visible: boolean
@@ -26,7 +26,7 @@ const Income: React.FC<RouteComponentProps> = (props) => {
 
   const { history } = props
   useEffect(() => {
-    contractReturnStore.resetContractStore()
+    contractStore.resetContractStore()
   }, [])
   const [ modalObj, setModalObj ] = useState<iModalProps>({
     type: '',
@@ -71,10 +71,10 @@ const Income: React.FC<RouteComponentProps> = (props) => {
     const { code = -1, contract = {} } = await apiResfulContract(type, values)
     if (code === consts.RET_CODE.SUCCESS) {
 
-      contractReturnStore.updateContract(contract)
-      contractReturnStore.resetTree(ContractType.INCOME, tenderStore.bid)
+      contractStore.updateContract(contract)
+      contractStore.resetTree(ContractType.INCOME, tenderStore.bid)
       if (type === 'return') {
-        contractReturnStore.changeUpdate('2')
+        contractStore.changeUpdate('2')
       }
     }
     setModalObj({
@@ -94,7 +94,7 @@ const Income: React.FC<RouteComponentProps> = (props) => {
   const treeResfulApiHandler = async (type: string, payload: any) => {
     const { code = -1, section = {} } = await apiResfulContractTree(type, payload, consts.CONTRACT_TREE.RETURN)
     if (code === consts.RET_CODE.SUCCESS) {
-      contractReturnStore.resetTree(ContractType.INCOME, tenderStore.bid)
+      contractStore.resetTree(ContractType.INCOME, tenderStore.bid)
       if (type !== 'add' && type !== 'del') {
         setRow({ ...row, ...section })
       }

src/pages/Contract/Content/Spending/index.tsx

@@ -4,7 +4,7 @@ import Slot from '@/components/Header/slot'
 import RuleModal from '@/components/RuleModal'
 import SvgIcon from '@/components/SvgIcon'
 import { apiSaveRule } from '@/pages/Safe/Content/List/api'
-import { contractReturnStore, tenderStore } from '@/store/mobx'
+import { contractStore, tenderStore } from '@/store/mobx'
 import { ContractTree, iModalProps } from '@/types/contract'
 import { contractTreeBaseId } from '@/utils/common/constStatus'
 import consts from '@/utils/consts'
@@ -14,7 +14,7 @@ import { apiResfulContract } from './api'
 import ContractModal from '@/pages/Contract/Content/Income/components/Modal'
 import TableContent from '../Income/components/TableContent'
 import { RouteComponentProps } from 'react-router'
-import { ContractType } from '@/store/mobx/contractReturn'
+import { ContractType } from '@/store/mobx/contract'
 import { apiResfulContractTree } from '../Income/api'
 
 interface iModal {
@@ -24,7 +24,7 @@ interface iModal {
 
 const Expenditure: React.FC<RouteComponentProps> = ({ history }) => {
   useEffect(() => {
-    contractReturnStore.resetContractStore()
+    contractStore.resetContractStore()
   }, [])
   const [ modalObj, setModalObj ] = useState<iModalProps>({
     type: '',
@@ -68,10 +68,10 @@ const Expenditure: React.FC<RouteComponentProps> = ({ history }) => {
     })
     const { code = -1, contract = {} } = await apiResfulContract(type, values)
     if (code === consts.RET_CODE.SUCCESS) {
-      contractReturnStore.updateContract(contract)
-      contractReturnStore.resetTree(ContractType.EXPENDITURE, tenderStore.bid)
+      contractStore.updateContract(contract)
+      contractStore.resetTree(ContractType.EXPENDITURE, tenderStore.bid)
       if (type === 'paid') {
-        contractReturnStore.changeUpdate('2')
+        contractStore.changeUpdate('2')
       }
     }
     setModalObj({
@@ -91,7 +91,7 @@ const Expenditure: React.FC<RouteComponentProps> = ({ history }) => {
   const treeResfulApiHandler = async (type: string, payload: any) => {
     const { code = -1, section = {} } = await apiResfulContractTree(type, payload, consts.CONTRACT_TREE.PAID)
     if (code === consts.RET_CODE.SUCCESS) {
-      contractReturnStore.resetTree(ContractType.EXPENDITURE, tenderStore.bid)
+      contractStore.resetTree(ContractType.EXPENDITURE, tenderStore.bid)
       if (type !== 'add' && type !== 'del') {
         setRow({ ...row, ...section })
       }

src/store/mobx/index.ts

@@ -1,4 +1,4 @@
-import contractReturnStore from './contractReturn'
+import contractStore from './contract'
 import frameStore from './frame'
 import tenderStore from './tender'
 import userStore from './user'
@@ -6,6 +6,6 @@ export {
   userStore,
   frameStore,
   tenderStore,
-  contractReturnStore
+  contractStore
 }