feat: 目录结构优化

package.json

@@ -193,6 +193,7 @@
   "dependencies": {
     "@ant-design/charts": "^1.0.19",
     "@ant-design/icons": "^4.5.0",
+    "ali-oss": "^6.13.2",
     "antd": "^4.13.0",
     "axios": "^0.21.1",
     "bignumber.js": "^9.0.1",

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

@@ -4,6 +4,7 @@ import { contractStore } from '@/store/mobx'
 import { ContractType } from '@/store/mobx/contract'
 import { iReceivableState, iEditableCellProps } from '@/types/contract'
 import { iFileModal } from '@/types/file'
+import { contractConsts } from '@/utils/common/constStatus'
 import consts from '@/utils/consts'
 import { dayjsFormat, formatMoney } from '@/utils/util'
 import { DisconnectOutlined } from '@ant-design/icons'
@@ -178,7 +179,7 @@ const Receivable: React.FC<ReceivableProps> = ({ updateTreeAndContract, type })
       // eslint-disable-next-line react/display-name
       render: (text: any, record: iReceivableState) => {
         const editable = isEditing(record)
-        return (
+        return contractStore.contract.status !== contractConsts.status.closed ?
           <div>
             {
               editable ?
@@ -190,7 +191,7 @@ const Receivable: React.FC<ReceivableProps> = ({ updateTreeAndContract, type })
               <span className="pi-link-red pi-mg-left-5">删除</span>
             </Popconfirm>
           </div>
-        )
+        : null
       }
     }
   ]

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

@@ -73,7 +73,7 @@ const Income: React.FC<RouteComponentProps> = (props) => {
 
       contractStore.updateContract(contract)
       contractStore.resetTree(ContractType.INCOME, tenderStore.bid)
-      if (type === 'return') {
+      if (type === 'add') {
         contractStore.changeUpdate('2')
       }
     }

src/pages/Management/Tender/Member/index.tsx

@@ -1,4 +1,4 @@
-import { GroupItem } from '@/components/AuditContent'
+import { GroupItem } from '@/pages/Quality/Content/Info/Detail/components/AuditContent'
 import { ZhButton, ZhDangerButton } from '@/components/Button'
 import Header from '@/components/Header'
 import Slot from '@/components/Header/slot'

src/components/AuditContent/index.tsx

@@ -8,8 +8,8 @@ import { Input, Popover } from 'antd'
 import { observer } from 'mobx-react'
 import QueueAnim from 'rc-queue-anim'
 import React, { ChangeEvent, useEffect, useState } from 'react'
-import { ExpandButton, ZhButton } from '../Button'
-import SvgIcon from '../SvgIcon'
+import { ExpandButton, ZhButton } from '../../../../../../../components/Button'
+import SvgIcon from '../../../../../../../components/SvgIcon'
 import './index.scss'
 
 interface iGroupItem extends iAccountGroupItem {

src/pages/Quality/Content/Info/Detail/components/Modal/index.tsx

@@ -1,4 +1,4 @@
-import { GroupItem } from '@/components/AuditContent'
+import { GroupItem } from '@/pages/Quality/Content/Info/Detail/components/AuditContent'
 import Authorization from '@/components/Authorization'
 import { ZhAuditBackButton, ZhButton, ZhCloseButton, ZhSubmitButton } from '@/components/Button'
 import { tenderStore, userStore } from '@/store/mobx'
@@ -7,6 +7,7 @@ import { iAccountGroupItem, iUserInfo } from '@/types/setting'
 import { getUserGroup } from '@/utils/common/user'
 import { Button, Form, Input, message, Modal, Popover } from 'antd'
 import React, { ChangeEvent, useEffect, useMemo, useState } from 'react'
+import SvgIcon from '@/components/SvgIcon'
 interface iAuditModalProps {
   type: 'safe' | 'quality'
   onCancel: () => void
@@ -71,6 +72,9 @@ const AuditModal: React.FC<iAuditModalProps> = props => {
       if (type === 'pass' && isLastAuditor && curAuditor.progress === '0' && !user.id) {
         return message.error('请指定整改人')
       }
+      if (type === 'back' && !user.id) {
+        return message.error('请选择退回流程')
+      }
       onCreate(values)
     })
   }
@@ -264,7 +268,8 @@ const AuditModal: React.FC<iAuditModalProps> = props => {
                 onVisibleChange={visible => handleVisibleChange(visible)}
                 placement="bottomLeft">
                 <ZhButton size="small" onClick={showPopover}>
-                  选择退回流程
+                  <span>选择退回流程</span>
+                  <SvgIcon type="xxh-caret-down1" />
                 </ZhButton>
               </Popover>
             ) : null}
@@ -275,6 +280,7 @@ const AuditModal: React.FC<iAuditModalProps> = props => {
                 <span>{user.name}</span>
               </div>
             ) : null}
+
           </>
         ) : null}
         {type === 'delete' ? (

src/pages/Quality/Content/Info/Detail/index.tsx

@@ -1,4 +1,4 @@
-import AuditContent from '@/components/AuditContent'
+import AuditContent from '@/pages/Quality/Content/Info/Detail/components/AuditContent'
 import { ZhAuditBackButton, ZhCloseButton, ZhSubmitButton, ZhUploadButton } from '@/components/Button'
 import DatePicker from '@/components/DatePicker'
 import Header from '@/components/Header'

src/pages/Quality/Content/List/index.tsx

@@ -95,7 +95,7 @@ const QualityList: React.FC<{}> = () => {
       render: (text: string, record) => {
         return (
           <span className="pi-pointer" onClick={() => setState({ ...state, fileModal: { ...state.fileModal, dataId: record.id, visible: true } })}>
-            <SvgIcon type="xxh-paperclip1" /> {text}
+            <SvgIcon type="xxh-paperclip1" style={{ color: '#007bff' }}/> {text}
           </span>
         )
       }

src/pages/Safe/Content/Info/Detail/index.tsx

@@ -1,4 +1,4 @@
-import AuditContent from '@/components/AuditContent'
+import AuditContent from '@/pages/Quality/Content/Info/Detail/components/AuditContent'
 import { ZhAuditBackButton, ZhCloseButton, ZhSubmitButton, ZhUploadButton } from '@/components/Button'
 import DatePicker from '@/components/DatePicker'
 import Header from '@/components/Header'

src/pages/Safe/Content/List/index.tsx

@@ -71,7 +71,7 @@ const SafeList: React.FC<{}> = () => {
       render: (text: string, record) => {
         return (
           <span className="pi-pointer" onClick={() => setState({ ...state, fileModal: { ...state.fileModal, dataId: record.id, visible: true } })}>
-            <SvgIcon type="xxh-paperclip1" /> {text}
+            <SvgIcon type="xxh-paperclip1" style={{ color: '#007bff' }}/> {text}
           </span>
         )
       }