ZhaoJun 1 gadu atpakaļ
vecāks
revīzija
2f93f6338a
2 mainītis faili ar 23 papildinājumiem un 28 dzēšanām
  1. 2 5
      src/components/UserDropdown/index.tsx
  2. 21 23
      src/pages/Flow/OaAuditDetail.js

+ 2 - 5
src/components/UserDropdown/index.tsx

@@ -7,7 +7,6 @@ import styles from './index.less';
 import { useModel } from '@umijs/max';
 
 const RenderDropDown = (menu: any) => {
-  console.log(menu);
   return (
     <div className={styles.dropdown}>
       <a key="1" href="/safety">
@@ -22,10 +21,8 @@ const RenderDropDown = (menu: any) => {
 };
 
 export default function UserDropdown(props: any) {
-  const {
-    initialState,
-  } = useModel('@@initialState');
-  const user = initialState?.user || {}
+  const { initialState } = useModel('@@initialState');
+  const user = initialState?.user || {};
   return (
     <div className={styles.root}>
       <Dropdown placement="top" dropdownRender={(menu) => RenderDropDown(menu)}>

+ 21 - 23
src/pages/Flow/OaAuditDetail.js

@@ -1,19 +1,19 @@
 // 审批详情
-import React, {useState, useMemo, useEffect} from 'react';
-import {Steps, Button, Tooltip, message, Spin} from 'antd';
-import {useRequest, useModel, useLocation} from 'umi';
+import React, { useState, useMemo, useEffect } from 'react';
+import { Steps, Button, Tooltip, message, Spin } from 'antd';
+import { useRequest, useModel, useLocation } from 'umi';
 import AuditModal from './components/AuditModal';
 import FormAndFilesNode from './components/FormAndFilesNode';
-import {queryAuditDetail, updateAuditList} from '@/services/boom';
-import {queryGetContractList} from '@/services/contract';
+import { queryAuditDetail, updateAuditList } from '@/services/boom';
+import { queryGetContractList } from '@/services/contract';
 import PageContent from '@/components/PageContent';
 import SignModal from './components/SignModal';
 import ContractDetail from '../ContractManager/detail';
-import {Type} from '../Profile';
-import {queryContractDetail} from '../../services/contract';
+import { Type } from '../Profile';
+import { queryContractDetail } from '../../services/contract';
 
-function OaAuditDetail() {
-  const {initialState} = useModel('@@initialState');
+function OaAuditDetail(props) {
+  const { initialState } = useModel('@@initialState');
   const user = initialState?.user || {};
   const [auditVisible, setAuditVisible] = useState(false);
   const [visible, setVisible] = useState(false);
@@ -23,20 +23,19 @@ function OaAuditDetail() {
   // 使用queryParams来获取特定查询参数
   const id = queryParams.get('id');
   const code = queryParams.get('code');
-  const token = queryParams.get('JWT-TOKEN')
+  const token = queryParams.get('JWT-TOKEN');
   if (!localStorage['JWT-TOKEN']) {
-    localStorage['JWT-TOKEN'] = token
+    localStorage['JWT-TOKEN'] = token;
   }
 
-  const type = code ? Type.CON : Type.OA
-
+  const type = code ? Type.CON : Type.OA;
 
   useEffect(() => {
-    if (type == Type.CON) runCon({code});
+    if (type == Type.CON) runCon({ code });
   }, [type]);
 
-  const {data, loading, refresh} = useRequest(queryAuditDetail, {
-    defaultParams: [{id}],
+  const { data, loading, refresh } = useRequest(queryAuditDetail, {
+    defaultParams: [{ id }],
   });
   const {
     current_seq,
@@ -58,8 +57,7 @@ function OaAuditDetail() {
     formatResult: (res) => {
       return res?.data?.detail;
     },
-    onSuccess: (res) => {
-    },
+    onSuccess: (res) => {},
   });
   // console.log(conData);
 
@@ -73,7 +71,7 @@ function OaAuditDetail() {
           {str}
           <div>
             <Tooltip title={node.desc}>
-              <span style={{color: '#1A73E8', textDecoration: 'undeline'}}>
+              <span style={{ color: '#1A73E8', textDecoration: 'undeline' }}>
                 审批意见
               </span>
             </Tooltip>
@@ -119,7 +117,7 @@ function OaAuditDetail() {
       return [
         <Button
           key={1}
-          style={{marginRight: 10}}
+          style={{ marginRight: 10 }}
           type="primary"
           onClick={() => setAuditVisible(1)}
         >
@@ -139,7 +137,7 @@ function OaAuditDetail() {
   return (
     <PageContent extra={btns} loading={loading && conLoading}>
       <Steps
-        style={{marginBottom: 20}}
+        style={{ marginBottom: 20 }}
         current={audit_status == 3 ? OaAuditList?.length : current_seq - 1}
         status={audit_status == 2 ? 'error' : 'process'}
         items={OaAuditList?.map((item) => ({
@@ -148,9 +146,9 @@ function OaAuditDetail() {
         }))}
       ></Steps>
       {type == Type.OA ? (
-        <FormAndFilesNode formData={form} fileList={Files}/>
+        <FormAndFilesNode formData={form} fileList={Files} />
       ) : (
-        <ContractDetail data={conData}/>
+        <ContractDetail data={conData} />
       )}
 
       <AuditModal