Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop

src/components/AuditForm/ComponentLibrary.js

@@ -22,7 +22,7 @@ function ComponentLibrary(props) {
     <Modal open={visible} onCancel={handleCancel} onOk={handleOk}>
       <Row gutter={12} style={{ paddingTop: 20 }}>
         {COMPONENT_LIST.map((item) => {
-          if (addToTable && item.props.label === '表格') {
+          if (addToTable && item.componentName === 'DIYTable') {
             return null;
           }
           return (

src/components/AuditForm/index.js

@@ -57,7 +57,7 @@ function AuditForm(props) {
       props: { ...item.props, id: `${item.componentName}_${uuidv4()}` },
     };
     // 如果是表格的话
-    if (item.props.label === '表格') {
+    if (item.componentName === 'DIYTable') {
       newItem.columns = [];
       newItem.isTable = true;
     }
@@ -165,7 +165,7 @@ function AuditForm(props) {
           onChange={handleChangeList}
           onTableColumnChange={handleTableColumnChange}
           list={formList}
-        ></FormContent>
+        />
         <ItemAttribute
           formList={formList}
           key={selectList[selectList.length - 1]}

src/pages/Flow/OaAuditDetail.js

@@ -1,33 +1,42 @@
 // 审批详情
-import React, { useState, useMemo, useEffect } from 'react';
-import { Steps, Button, Tooltip, message, Spin } from 'antd';
-import { useParams, 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');
+  const {initialState} = useModel('@@initialState');
   const user = initialState?.user || {};
   const [auditVisible, setAuditVisible] = useState(false);
-  const location = useLocation();
-  const {
-    state: { id, type, code },
-  } = location;
   const [visible, setVisible] = useState(false);
 
+  const location = useLocation();
+  const queryParams = new URLSearchParams(location.search);
+  // 使用queryParams来获取特定查询参数
+  const id = queryParams.get('id');
+  const code = queryParams.get('code');
+  const token = queryParams.get('JWT-TOKEN')
+  if (!localStorage['JWT-TOKEN']) {
+    localStorage['JWT-TOKEN'] = token
+  }
+
+  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,
@@ -49,7 +58,8 @@ function OaAuditDetail() {
     formatResult: (res) => {
       return res?.data?.detail;
     },
-    onSuccess: (res) => {},
+    onSuccess: (res) => {
+    },
   });
   // console.log(conData);
 
@@ -63,7 +73,7 @@ function OaAuditDetail() {
           {str}
           <div>
             <Tooltip title={node.desc}>
-              <span style={{ color: '#1A73E8', textDecoration: 'undeline' }}>
+              <span style={{color: '#1A73E8', textDecoration: 'undeline'}}>
                 审批意见
               </span>
             </Tooltip>
@@ -109,7 +119,7 @@ function OaAuditDetail() {
       return [
         <Button
           key={1}
-          style={{ marginRight: 10 }}
+          style={{marginRight: 10}}
           type="primary"
           onClick={() => setAuditVisible(1)}
         >
@@ -129,7 +139,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) => ({
@@ -138,9 +148,9 @@ function OaAuditDetail() {
         }))}
       ></Steps>
       {type == Type.OA ? (
-        <FormAndFilesNode formData={form} fileList={Files} />
+        <FormAndFilesNode formData={form} fileList={Files}/>
       ) : (
-        <ContractDetail data={conData} />
+        <ContractDetail data={conData}/>
       )}
 
       <AuditModal

src/pages/Profile/index.js

@@ -85,17 +85,9 @@ function profile(props) {
                   style={{ color: '#4096ff' }}
                   onClick={() => {
                     if (record.extend_code) {
-                      navigate('/profile/detail', {
-                        state: {
-                          id: record.id,
-                          code: record.extend_code,
-                          type: Type.CON,
-                        },
-                      });
+                      navigate(`/profile/detail?id=${record.id}&code=${record.extend_code}`);
                     } else {
-                      navigate('/profile/detail', {
-                        state: { id: record.id, type: Type.OA },
-                      });
+                      navigate(`/profile/detail?id=${record.id}`);
                     }
                   }}
                 >