2 лет назад · 4d71bc504e
--- a/.umirc.ts
+++ b/.umirc.ts
@@ -152,39 +152,39 @@ export default defineConfig({
 
															     //     },
														
 
															     //   ],
														
 
															     // },
														
 
															+    // {
														
 
															+    //   name: '个人中心',
														
 
															+    //   path: '/profile',
														
 
															+    //   icon: 'https://gt-digitization.oss-cn-hangzhou.aliyuncs.com/doc/department/2023-04/profileIcon.png',
														
 
															+    //   routes: [
														
 
															+    //     {
														
 
															+    //       name: '我的申请',
														
 
															+    //       path: '/profile/apply',
														
 
															+    //       component: './Profile/apply',
														
 
															+    //     },
														
 
															+    //     {
														
 
															+    //       name: '我的审批',
														
 
															+    //       path: '/profile/approve',
														
 
															+    //       component: './Profile/approve',
														
 
															+    //     },
														
 
															+    //     {
														
 
															+    //       name: '已审核',
														
 
															+    //       path: '/profile/approved',
														
 
															+    //       component: './Profile/approved',
														
 
															+    //     },
														
 
															+    //   ],
														
 
															+    //   // component: './Profile/index',
														
 
															+    //   // hideInMenu: true,
														
 
															+    // },
														
 
															     {
														
 
															       name: '个人中心',
														
 
															       path: '/profile',
														
 
															+      component: './Profile/index',
														
 
															       icon: 'https://gt-digitization.oss-cn-hangzhou.aliyuncs.com/doc/department/2023-04/profileIcon.png',
														
 
															-      routes: [
														
 
															-        {
														
 
															-          name: '我的申请',
														
 
															-          path: '/profile/apply',
														
 
															-          component: './Profile/apply',
														
 
															-        },
														
 
															-        {
														
 
															-          name: '我的审批',
														
 
															-          path: '/profile/approve',
														
 
															-          component: './Profile/approve',
														
 
															-        },
														
 
															-        {
														
 
															-          name: '已审核',
														
 
															-          path: '/profile/approved',
														
 
															-          component: './Profile/approved',
														
 
															-        },
														
 
															-      ],
														
 
															-      // component: './Profile/index',
														
 
															-      // hideInMenu: true,
														
 
															     },
														
 
															-    // {
														
 
															-    //   name: '个人中心',
														
 
															-    //   path: '/profile',
														
 
															-    //   component: './Profile/index',
														
 
															-    //   hideInMenu: true,
														
 
															-    // },
														
 
															     {
														
 
															       name: '审批详情',
														
 
															-      path: '/profile/:id',
														
 
															+      path: '/profile/detail',
														
 
															       component: './Flow/OaAuditDetail',
														
 
															       hideInMenu: true,
														
 
															     },
														
--- a/src/pages/ContractManager/component/Modal.jsx
+++ b/src/pages/ContractManager/component/Modal.jsx
@@ -94,7 +94,6 @@ const ContractModal = (props) => {
 
															     },
														
 
															   ];
														
 
															-  const [isPass, setIsPass] = useState(1);
														
 
															   const [companyDepList, setCompanyDepList] = useState(depList || []);
														
 
															   const [archivesDepList, setArchivesDepList] = useState(archivesOptions);
														
 
															   const [dealDisable, setDealDisable] = useState(false);
														
@@ -106,6 +105,9 @@ const ContractModal = (props) => {
 
															   const project_name = Form.useWatch('project_name', form);
														
 
															   const archives_dep = Form.useWatch('archives_dep', form);
														
 
															+  // 当为审核拒绝状态时，点击编辑按钮可以时为强制修改状态
														
 
															+  const [forceModify, setForceModify] = useState(false);
														
 
															+
														
 
															   //是否补充协议，是的话需要填合同编号
														
 
															   const is_supplement = Form.useWatch('is_supplement', form);
														
@@ -212,6 +214,7 @@ const ContractModal = (props) => {
 
															       },
														
 
															     },
														
 
															   );
														
 
															+
														
 
															   //计算合同编号接口
														
 
															   const { run: runCode } = useRequest((data) => queryContractCode(data), {
														
 
															     manual: true,
														
@@ -221,6 +224,7 @@ const ContractModal = (props) => {
 
															       });
														
 
															     },
														
 
															   });
														
 
															+
														
 
															   //供应商列表
														
 
															   const { data: supplierList = [], loading } = useRequest(querySupplierList, {
														
 
															     defaultParams: [
														
@@ -239,6 +243,7 @@ const ContractModal = (props) => {
 
															         : [];
														
 
															     },
														
 
															   });
														
 
															+
														
 
															   //获取OA 归档审批列表
														
 
															   const { data: auditData, run: runAudit } = useRequest(
														
 
															     (data) => queryAuditByCode({ ...data, extend_type: 0 }),
														
@@ -256,6 +261,7 @@ const ContractModal = (props) => {
 
															       },
														
 
															     },
														
 
															   );
														
 
															+
														
 
															   //获取OA 作废审批列表
														
 
															   const { data: auditCelData, run: runCalAudit } = useRequest(
														
 
															     (data) => queryAuditByCode({ ...data, extend_type: 1 }),
														
@@ -274,16 +280,11 @@ const ContractModal = (props) => {
 
															     },
														
 
															   );
														
 
															-  useEffect(() => {
														
 
															-    setCompanyDepList(depList);
														
 
															-  }, [depList]);
														
 
															-
														
 
															   useEffect(() => {
														
 
															     if (!visible) {
														
 
															-      setIsPass(1);
														
 
															       setDealDisable(false);
														
 
															       setAuditList([]);
														
 
															-      // setCompanyDepList([]);
														
 
															+      setCompanyDepList([]);
														
 
															       setArchivesDepList([]);
														
 
															     } else {
														
 
															       userListRun();
														
@@ -293,6 +294,14 @@ const ContractModal = (props) => {
 
															     }
														
 
															   }, [visible]);
														
 
															+  useEffect(() => {
														
 
															+    //兼容之前选择的所属部门，用的现在的接口匹配不到部门显示数字的问题
														
 
															+    if (data?.company_id) {
														
 
															+      const deps = getDepItemById(data?.company_id)?.children;
														
 
															+      setCompanyDepList(deps);
														
 
															+    }
														
 
															+  }, [data, depList]);
														
 
															+
														
 
															   useEffect(() => {
														
 
															     form.resetFields();
														
 
															     if (data?.status >= Status.Checking) runAudit({ extend_code: data.code });
														
@@ -318,23 +327,29 @@ const ContractModal = (props) => {
 
															     if (
														
 
															       type == Type.add ||
														
 
															       type == Type.cancel ||
														
 
															-      data?.status == Status.ReCall
														
 
															+      data?.status == Status.ReCall ||
														
 
															+      (data?.status == Status.CheckReject && forceModify)
														
 
															     )
														
 
															       return true;
														
 
															-    let currentAuditUserID;
														
 
															-    if (data?.status == Status.Checking && auditData) {
														
 
															-      const { OaAuditList, audit_status } = auditData;
														
 
															-      currentAuditUserID = OaAuditList[audit_status]?.auditor;
														
 
															-    } else if (data?.status == Status.CalChecking && auditCelData) {
														
 
															-      const { OaAuditList, audit_status } = auditCelData;
														
 
															-      currentAuditUserID = OaAuditList[audit_status]?.auditor;
														
 
															-    }
														
 
															-    if (user.ID == currentAuditUserID) return true;
														
 
															-    return false;
														
 
															-  }, [user, data, auditData, auditCelData]);
														
 
															+    // let currentAuditUserID;
														
 
															+    // if (data?.status == Status.Checking && auditData) {
														
 
															+    //   const { OaAuditList, audit_status } = auditData;
														
 
															+    //   currentAuditUserID = OaAuditList[audit_status]?.auditor;
														
 
															+    // } else if (data?.status == Status.CalChecking && auditCelData) {
														
 
															+    //   const { OaAuditList, audit_status } = auditCelData;
														
 
															+    //   currentAuditUserID = OaAuditList[audit_status]?.auditor;
														
 
															+    // }
														
 
															+    // if (user.ID == currentAuditUserID) return true;
														
 
															+    // return false;
														
 
															+  }, [data, type, forceModify]);
														
 
															   useEffect(() => {
														
 
															-    if (type !== Type.add && data?.status !== Status.ReCall) return;
														
 
															+    if (
														
 
															+      type !== Type.add &&
														
 
															+      data?.status !== Status.ReCall &&
														
 
															+      data?.status !== Status.CheckReject
														
 
															+    )
														
 
															+      return;
														
 
															     const newCompony = company || data?.company_id; //recall状态时compony是空， 需要用data?.company_id
														
 
															     if (!newCompony) {
														
 
															       setCompanyDepList([]);
														
@@ -357,7 +372,7 @@ const ContractModal = (props) => {
 
															       setArchivesDepList(deps);
														
 
															       form.setFieldsValue({ deal_by: '' });
														
 
															     }
														
 
															-  }, [company, data]);
														
 
															+  }, [company, data, forceModify]);
														
 
															   //获取合同编号逻辑 只有新增才请求
														
 
															   useEffect(() => {
														
@@ -377,7 +392,12 @@ const ContractModal = (props) => {
 
															   //获取审批流逻辑
														
 
															   useEffect(() => {
														
 
															-    if (type !== Type.add && data?.status !== Status.ReCall) return;
														
 
															+    if (
														
 
															+      type !== Type.add &&
														
 
															+      data?.status !== Status.ReCall &&
														
 
															+      data?.status !== Status.CheckReject
														
 
															+    )
														
 
															+      return;
														
 
															     const param = { ...advance };
														
 
															     let formValues = [];
														
 
															     const item = companyData?.find((item) => item.ID == company);
														
@@ -391,8 +411,14 @@ const ContractModal = (props) => {
 
															     runAuditList(param);
														
 
															   }, [company, archives_dep]);
														
 
															+  //根据项目名称填充项目编号逻辑
														
 
															   useEffect(() => {
														
 
															-    if (type !== Type.add && data?.status !== Status.ReCall) return;
														
 
															+    if (
														
 
															+      type !== Type.add &&
														
 
															+      data?.status !== Status.ReCall &&
														
 
															+      data?.status !== Status.CheckReject
														
 
															+    )
														
 
															+      return;
														
 
															     const project_code = projectList?.find(
														
 
															       (item) => item.project_name == project_name,
														
 
															     )?.project_full_code;
														
@@ -402,15 +428,24 @@ const ContractModal = (props) => {
 
															       form.setFieldsValue({ project_code: '' });
														
 
															     }
														
 
															   }, [project_name]);
														
 
															+
														
 
															   const supplyList = useMemo(() => {
														
 
															     return companyData ? [...companyData, ...supplierList] : supplierList;
														
 
															   }, [companyData, supplierList]);
														
 
															   const disableds = useMemo(() => {
														
 
															-    if (data?.status == Status.ReCall) return { contract: false, recall: true };
														
 
															-    if (data?.status > Status.None) return { contract: true, recall: true };
														
 
															+    // 当合同处于审核拒绝状态时，通过修改按钮可强制修改合同并重新进入审核
														
 
															+    if (forceModify && data?.status == Status.CheckReject) {
														
 
															+      return { contract: false, recall: false };
														
 
															+    }
														
 
															+    if (data?.status == Status.ReCall) {
														
 
															+      return { contract: false, recall: true };
														
 
															+    }
														
 
															+    if (data?.status > Status.None) {
														
 
															+      return { contract: true, recall: true };
														
 
															+    }
														
 
															     return { contract: false, recall: false };
														
 
															-  }, [visible]);
														
 
															+  }, [visible, forceModify]);
														
 
															   const UploadProps = {
														
 
															     action: `/api/contract/v1/attach`,
														
@@ -425,6 +460,7 @@ const ContractModal = (props) => {
 
															       }
														
 
															     },
														
 
															   };
														
 
															+
														
 
															   const UploadPropsExtend = {
														
 
															     action: `/api/contract/v1/attach`,
														
 
															     headers: {
														
@@ -487,7 +523,10 @@ const ContractModal = (props) => {
 
															           code: data?.code,
														
 
															         };
														
 
															         handleOk(result, Type.cancel, form, audit_list);
														
 
															-      } else if (data?.status == Status.ReCall) {
														
 
															+      } else if (
														
 
															+        data?.status == Status.ReCall ||
														
 
															+        data?.status == Status.CheckReject
														
 
															+      ) {
														
 
															         const form = getAuditData(values, '1');
														
 
															         const audit_list = auditList.map((item) => item.value);
														
 
															         values.effect_on = dayjs(values.effect_on).format(FORMAT);
														
@@ -509,20 +548,6 @@ const ContractModal = (props) => {
 
															         values.created_by = user?.ID;
														
 
															         values.id = data?.id;
														
 
															         handleOk(values, Type.add, form, audit_list);
														
 
															-      } else if (data?.status == Status.Checking) {
														
 
															-        let result = {
														
 
															-          id: auditData?.id,
														
 
															-          status: values.is_pass,
														
 
															-          desc: '',
														
 
															-        };
														
 
															-        handleOk(result, Type.check, data?.status);
														
 
															-      } else if (data?.status == Status.CalChecking) {
														
 
															-        let result = {
														
 
															-          id: auditCelData?.id,
														
 
															-          status: values.is_pass,
														
 
															-          desc: '',
														
 
															-        };
														
 
															-        handleOk(result, Type.check, data?.status);
														
 
															       }
														
 
															     });
														
 
															   };
														
@@ -554,16 +579,34 @@ const ContractModal = (props) => {
 
															   const renderFooter = () => {
														
 
															     return (
														
 
															       <Space>
														
 
															-        {data?.status == Status.Checking && type !== Type.check && (
														
 
															+        {data?.status == Status.Checking && (
														
 
															           <Button onClick={() => handlerReCall(auditData?.id)}>撤回</Button>
														
 
															         )}
														
 
															-        <Button onClick={handleCancel}>取消</Button>
														
 
															+        <Button
														
 
															+          onClick={() => {
														
 
															+            setForceModify(false);
														
 
															+            form.resetFields();
														
 
															+            handleCancel();
														
 
															+          }}
														
 
															+        >
														
 
															+          取消
														
 
															+        </Button>
														
 
															+        {data?.status == Status.CheckReject && !forceModify && (
														
 
															+          <Button
														
 
															+            onClick={() => {
														
 
															+              setForceModify(true);
														
 
															+            }}
														
 
															+          >
														
 
															+            修改
														
 
															+          </Button>
														
 
															+        )}
														
 
															         <Button type="primary" onClick={handleSubmit} disabled={!isSuper}>
														
 
															           提交
														
 
															         </Button>
														
 
															       </Space>
														
 
															     );
														
 
															   };
														
 
															+
														
 
															   return (
														
 
															     <>
														
 
															       <Modal
														
@@ -948,7 +991,9 @@ const ContractModal = (props) => {
 
															                 }
														
 
															                 initialValue={attachData.attach}
														
 
															               >
														
 
															-                {type == Type.add || data?.status == Status.ReCall ? (
														
 
															+                {type == Type.add ||
														
 
															+                data?.status == Status.ReCall ||
														
 
															+                forceModify ? (
														
 
															                   <Upload {...UploadProps}>
														
 
															                     <Button icon={<CloudUploadOutlined />}>Upload</Button>
														
 
															                   </Upload>
														
@@ -1008,7 +1053,7 @@ const ContractModal = (props) => {
 
															                   </div>
														
 
															                 }
														
 
															               >
														
 
															-                {type == Type.add ? (
														
 
															+                {type == Type.add || forceModify ? (
														
 
															                   <Upload {...UploadPropsExtend}>
														
 
															                     <Button icon={<CloudUploadOutlined />}>Upload</Button>
														
 
															                   </Upload>
														
@@ -1028,7 +1073,7 @@ const ContractModal = (props) => {
 
															             </Col>
														
 
															           </Row>
														
 
															-          {data?.status >= Status.Checking && (
														
 
															+          {data?.status >= Status.Checking && !forceModify && (
														
 
															             <>
														
 
															               <ModuleTitle title="归档流程" />
														
 
															               <div className={styles.modelItem}>
														
@@ -1036,58 +1081,6 @@ const ContractModal = (props) => {
 
															               </div>
														
 
															             </>
														
 
															           )}
														
 
															-          {isSuper && data.status == Status.Checking && (
														
 
															-            <>
														
 
															-              <ModuleTitle title="审核情况" />
														
 
															-              <Row>
														
 
															-                <Col span={10} offset={1}>
														
 
															-                  <Form.Item
														
 
															-                    name="check_by"
														
 
															-                    initialValue={user?.CName}
														
 
															-                    label="审核人："
														
 
															-                  >
														
 
															-                    <Input disabled />
														
 
															-                  </Form.Item>
														
 
															-                  <Form.Item name="is_pass" initialValue={1} label="审核意见：">
														
 
															-                    <Select
														
 
															-                      onChange={(e) => {
														
 
															-                        setIsPass(e);
														
 
															-                      }}
														
 
															-                      style={{ width: '100%' }}
														
 
															-                      options={[
														
 
															-                        {
														
 
															-                          value: 1,
														
 
															-                          label: '同意',
														
 
															-                        },
														
 
															-                        {
														
 
															-                          value: 2,
														
 
															-                          label: '拒绝',
														
 
															-                        },
														
 
															-                      ]}
														
 
															-                    />
														
 
															-                  </Form.Item>
														
 
															-                </Col>
														
 
															-                <Col span={10}>
														
 
															-                  <Form.Item
														
 
															-                    name="check_date"
														
 
															-                    initialValue={dayjs().format(FORMAT)}
														
 
															-                    label="审核时间："
														
 
															-                  >
														
 
															-                    <Input disabled />
														
 
															-                  </Form.Item>
														
 
															-                </Col>
														
 
															-              </Row>
														
 
															-              {isPass == 2 && (
														
 
															-                <Form.Item
														
 
															-                  name="check_desc"
														
 
															-                  label="拒绝原因："
														
 
															-                  labelCol={{ span: 4 }}
														
 
															-                >
														
 
															-                  <Input.TextArea />
														
 
															-                </Form.Item>
														
 
															-              )}
														
 
															-            </>
														
 
															-          )}
														
 
															           {(type == Type.cancel || data?.status >= Status.CalChecking) && (
														
 
															             <>
														
 
															               <ModuleTitle title="作废信息" />
														
@@ -1134,59 +1127,7 @@ const ContractModal = (props) => {
 
															               </div>
														
 
															             </>
														
 
															           )}
														
 
															-          {isSuper && data.status == Status.CalChecking && (
														
 
															-            <>
														
 
															-              <ModuleTitle title="审核情况" />
														
 
															-              <Row>
														
 
															-                <Col span={10} offset={1}>
														
 
															-                  <Form.Item
														
 
															-                    name="cancel_check_by"
														
 
															-                    initialValue={user?.CName}
														
 
															-                    label="审核人："
														
 
															-                  >
														
 
															-                    <Input disabled />
														
 
															-                  </Form.Item>
														
 
															-                  <Form.Item name="is_pass" initialValue={1} label="审核意见：">
														
 
															-                    <Select
														
 
															-                      onChange={(e) => {
														
 
															-                        setIsPass(e);
														
 
															-                      }}
														
 
															-                      style={{ width: '100%' }}
														
 
															-                      options={[
														
 
															-                        {
														
 
															-                          value: 1,
														
 
															-                          label: '同意',
														
 
															-                        },
														
 
															-                        {
														
 
															-                          value: 0,
														
 
															-                          label: '拒绝',
														
 
															-                        },
														
 
															-                      ]}
														
 
															-                    />
														
 
															-                  </Form.Item>
														
 
															-                </Col>
														
 
															-                <Col span={10}>
														
 
															-                  <Form.Item
														
 
															-                    name="check_date"
														
 
															-                    initialValue={dayjs().format(FORMAT)}
														
 
															-                    label="审核时间："
														
 
															-                  >
														
 
															-                    <Input disabled />
														
 
															-                  </Form.Item>
														
 
															-                </Col>
														
 
															-              </Row>
														
 
															-              {!isPass && (
														
 
															-                <Form.Item
														
 
															-                  name="cancel_check_result"
														
 
															-                  label="拒绝原因："
														
 
															-                  labelCol={{ span: 4 }}
														
 
															-                >
														
 
															-                  <Input.TextArea />
														
 
															-                </Form.Item>
														
 
															-              )}
														
 
															-            </>
														
 
															-          )}
														
 
															-          {(type == Type.add || data?.status == Status.ReCall) &&
														
 
															+          {(type == Type.add || data?.status == Status.ReCall || forceModify) &&
														
 
															             auditList.length > 0 && (
														
 
															               <>
														
 
															                 <ModuleTitle title="审批流程" />
														
--- a/src/pages/ContractManager/detail.js
+++ b/src/pages/ContractManager/detail.js
@@ -0,0 +1,438 @@
 
															+import ModuleTitle from '@/components/ModuleTitle/moduleTitle';
														
 
															+import FileViewerModal from '@/components/FileViewerNew';
														
 
															+import {
														
 
															+  Divider,
														
 
															+  Form,
														
 
															+  Modal,
														
 
															+  Row,
														
 
															+  Col,
														
 
															+  Input,
														
 
															+  Radio,
														
 
															+  InputNumber,
														
 
															+  Card,
														
 
															+} from 'antd';
														
 
															+import dayjs from 'dayjs';
														
 
															+import { useEffect, useState } from 'react';
														
 
															+import { useParams, useRequest, useNavigate } from 'umi';
														
 
															+import { Status } from './component/Modal';
														
 
															+import styles from './index.less';
														
 
															+import AuditSteps from './component/AuditSteps';
														
 
															+import { queryAuditByCode } from '../../services/contract';
														
 
															+
														
 
															+const ContractDetail = ({ data }) => {
														
 
															+  const [form] = Form.useForm();
														
 
															+  const FORMAT = 'YYYY-MM-DD';
														
 
															+
														
 
															+  const [fileViewerVisible, setFileViewerVisible] = useState(false);
														
 
															+  const [fileViewerData, setFileViewerData] = useState();
														
 
															+  const [attachData, setAttachData] = useState({
														
 
															+    attach: [],
														
 
															+    attach_extend: [],
														
 
															+  });
														
 
															+
														
 
															+  useEffect(() => {
														
 
															+    form.resetFields();
														
 
															+    if (data?.status >= Status.Checking) runAudit({ extend_code: data.code });
														
 
															+    let result = { attach: [], attach_extend: [] };
														
 
															+    if (data?.attach) {
														
 
															+      let att = JSON.parse(data.attach);
														
 
															+      result.attach = att.map((item, idx) => {
														
 
															+        return { ...item, uid: idx, status: 'done' };
														
 
															+      });
														
 
															+    }
														
 
															+    if (data?.attach_extend) {
														
 
															+      let att = JSON.parse(data.attach_extend);
														
 
															+      result.attach_extend = att.map((item, idx) => {
														
 
															+        return { ...item, uid: idx, status: 'done' };
														
 
															+      });
														
 
															+    }
														
 
															+    setAttachData(result);
														
 
															+  }, [data]);
														
 
															+
														
 
															+  //获取OA 归档审批列表
														
 
															+  const { data: auditData, run: runAudit } = useRequest(
														
 
															+    (data) => queryAuditByCode({ ...data, extend_type: 0 }),
														
 
															+    {
														
 
															+      manual: true,
														
 
															+      formatResult: (res) => {
														
 
															+        if (res?.data) {
														
 
															+          return res.data;
														
 
															+        } else {
														
 
															+          if (data?.status == Status.CheckReject) {
														
 
															+            return { ...oldAuditList, audit_status: 2 };
														
 
															+          }
														
 
															+          return oldAuditList;
														
 
															+        }
														
 
															+      },
														
 
															+    },
														
 
															+  );
														
 
															+
														
 
															+  const handlePreViewSingle = (data) => {
														
 
															+    if (!data) return;
														
 
															+    const arr = data.name.split('.');
														
 
															+    const type = arr[arr.length - 1];
														
 
															+    const dataItem = { url: data.url, name: data.name, type };
														
 
															+    setFileViewerData(dataItem);
														
 
															+    setFileViewerVisible(true);
														
 
															+  };
														
 
															+
														
 
															+  return (
														
 
															+    <>
														
 
															+      <Card title={data?.status == Status.Checking ? '归档审批' : '作废审批'}>
														
 
															+        <Form
														
 
															+          form={form}
														
 
															+          // initialValues={data}
														
 
															+          labelCol={{ span: 7 }}
														
 
															+          wrapperCol={{ span: 17 }}
														
 
															+        >
														
 
															+          <ModuleTitle title="存档人信息" />
														
 
															+          <Row>
														
 
															+            <Col span={10} offset={1}>
														
 
															+              <Form.Item
														
 
															+                name="created_name"
														
 
															+                initialValue={data?.created_name}
														
 
															+                label="存档人："
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+              <Form.Item
														
 
															+                name="company_name"
														
 
															+                label="所属公司："
														
 
															+                tooltip="请选择该存档合同所属公司"
														
 
															+                initialValue={data?.company_name}
														
 
															+                rules={[
														
 
															+                  {
														
 
															+                    required: true,
														
 
															+                    message: '请填写所属公司',
														
 
															+                  },
														
 
															+                ]}
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+            </Col>
														
 
															+            <Col span={10}>
														
 
															+              <Form.Item
														
 
															+                name="created_on"
														
 
															+                initialValue={data?.created_on || dayjs().format(FORMAT)}
														
 
															+                label="存档时间："
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+              <Form.Item
														
 
															+                name="dep_id"
														
 
															+                label="所属部门："
														
 
															+                initialValue={data?.dep_name}
														
 
															+                rules={[
														
 
															+                  {
														
 
															+                    required: true,
														
 
															+                    message: '请选择所属部门',
														
 
															+                  },
														
 
															+                ]}
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+            </Col>
														
 
															+          </Row>
														
 
															+          <ModuleTitle title="经办人信息" />
														
 
															+          <Row>
														
 
															+            <Col span={10} offset={1}>
														
 
															+              <Form.Item
														
 
															+                name="deal_by"
														
 
															+                label="经办人："
														
 
															+                tooltip="经办人应负责合同审批流程、签字盖章、合同原件存档和电子档案存档。母公司的经办人为OA审批提交人，也是存档人。子公司经办人由子公司合同专员填写，一般是合同审批时的提交人或者是合同实际执行的负责人"
														
 
															+                initialValue={data?.deal_by}
														
 
															+                rules={[
														
 
															+                  {
														
 
															+                    required: true,
														
 
															+                    message: '请选择经办人',
														
 
															+                  },
														
 
															+                ]}
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+            </Col>
														
 
															+            <Col span={10}>
														
 
															+              <Form.Item
														
 
															+                name="created_dep"
														
 
															+                label="签约承办部门："
														
 
															+                tooltip="请选择该存档合同的实际履行部门，一般为经办人所在部门"
														
 
															+                initialValue={data?.created_dep}
														
 
															+                rules={[
														
 
															+                  {
														
 
															+                    required: true,
														
 
															+                    message: '请选择签约承办部门',
														
 
															+                  },
														
 
															+                ]}
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+            </Col>
														
 
															+          </Row>
														
 
															+          <ModuleTitle title="合同信息" />
														
 
															+
														
 
															+          <Row>
														
 
															+            <Col span={10} offset={1}>
														
 
															+              <Form.Item
														
 
															+                name="is_supplement"
														
 
															+                label="是否补充协议："
														
 
															+                tooltip="合同名称"
														
 
															+                initialValue={0}
														
 
															+                rules={[
														
 
															+                  {
														
 
															+                    required: true,
														
 
															+                    message: '请填写合同名称',
														
 
															+                  },
														
 
															+                ]}
														
 
															+              >
														
 
															+                <Radio.Group disabled>
														
 
															+                  <Radio value={1}>是</Radio>
														
 
															+                  <Radio value={0}>否</Radio>
														
 
															+                </Radio.Group>
														
 
															+              </Form.Item>
														
 
															+              <Form.Item
														
 
															+                name="name"
														
 
															+                label="合同名称："
														
 
															+                tooltip="请与OA审批时填写的合同名称一致"
														
 
															+                initialValue={data?.name}
														
 
															+                rules={[
														
 
															+                  {
														
 
															+                    required: true,
														
 
															+                    message: '请填写合同名称',
														
 
															+                  },
														
 
															+                ]}
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+              <Form.Item
														
 
															+                name="effect_on"
														
 
															+                label="合同签订日期："
														
 
															+                initialValue={data?.effect_on}
														
 
															+                tooltip="合同主体各方签字盖章完成之日，以最后签字盖章的为准"
														
 
															+                rules={[
														
 
															+                  {
														
 
															+                    required: true,
														
 
															+                    message: '请填写合同名称',
														
 
															+                  },
														
 
															+                ]}
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+              <Form.Item
														
 
															+                name="project_name"
														
 
															+                label="项目名称："
														
 
															+                tooltip="不涉及项目请选“日常项目”"
														
 
															+                initialValue={data?.project_name}
														
 
															+                rules={[
														
 
															+                  {
														
 
															+                    required: true,
														
 
															+                    message: '请填写项目名称',
														
 
															+                  },
														
 
															+                ]}
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+              <Form.Item
														
 
															+                name="party_a"
														
 
															+                label="甲方："
														
 
															+                tooltip="合同主体可以下拉选择，可选项需要经办人在“主页--供应商管理”中创建。经办人可以维护和更新供应商信息。"
														
 
															+                initialValue={data?.party_a}
														
 
															+                rules={[
														
 
															+                  {
														
 
															+                    required: true,
														
 
															+                    message: '请选择甲方',
														
 
															+                  },
														
 
															+                ]}
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+            </Col>
														
 
															+            <Col span={10}>
														
 
															+              <Form.Item
														
 
															+                style={{ opacity: data?.is_supplement ? 1 : 0 }}
														
 
															+                name="parent_code"
														
 
															+                tooltip="请先查询原合同编号，原合同未录入本系统的，需先录入存档。"
														
 
															+                initialValue={data?.parent_code}
														
 
															+                label="原合同编号："
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+              <Form.Item
														
 
															+                name="code"
														
 
															+                tooltip="合同编号按《合同管理办法》的合同编码规则编号。"
														
 
															+                initialValue={data?.code}
														
 
															+                label="合同编号："
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+              <Form.Item
														
 
															+                label="合同总价款："
														
 
															+                name="amount"
														
 
															+                tooltip="请与OA审批时填写的“合同金额”一致。不涉及金额填“0”"
														
 
															+                initialValue={data?.amount}
														
 
															+                rules={[
														
 
															+                  {
														
 
															+                    required: true,
														
 
															+                    message: '请输入合同总价款',
														
 
															+                  },
														
 
															+                ]}
														
 
															+              >
														
 
															+                <InputNumber
														
 
															+                  style={{ width: '100%' }}
														
 
															+                  precision={2}
														
 
															+                  addonAfter="万元"
														
 
															+                  disabled
														
 
															+                />
														
 
															+              </Form.Item>
														
 
															+
														
 
															+              <Form.Item
														
 
															+                name="project_code"
														
 
															+                initialValue={data?.project_code}
														
 
															+                label="项目编号："
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+              <Form.Item
														
 
															+                name="party_b"
														
 
															+                label="乙方："
														
 
															+                tooltip="合同主体可以下拉选择，可选项需要经办人在“主页--供应商管理”中创建。经办人可以维护和更新供应商信息。"
														
 
															+                initialValue={data?.party_b}
														
 
															+                rules={[
														
 
															+                  {
														
 
															+                    required: true,
														
 
															+                    message: '请选择乙方',
														
 
															+                  },
														
 
															+                ]}
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+            </Col>
														
 
															+          </Row>
														
 
															+          <Form.Item
														
 
															+            name="party_c"
														
 
															+            label="丙方（及其他）："
														
 
															+            tooltip="可多选。合同主体可以下拉选择，可选项需要经办人在“主页--供应商管理”中创建。经办人可以维护和更新供应商信息。"
														
 
															+            initialValue={data?.party_c ? data?.party_c.split(',') : []}
														
 
															+            labelCol={{ span: 4 }}
														
 
															+          >
														
 
															+            <Input disabled />
														
 
															+          </Form.Item>
														
 
															+          <Form.Item
														
 
															+            name="perform"
														
 
															+            initialValue={data?.perform}
														
 
															+            label="合同履行情况："
														
 
															+            labelCol={{ span: 4 }}
														
 
															+          >
														
 
															+            <Input.TextArea disabled />
														
 
															+          </Form.Item>
														
 
															+          <Row>
														
 
															+            <Col span={10} offset={1}>
														
 
															+              <Form.Item
														
 
															+                label="合同及合同附件上传："
														
 
															+                tooltip="请上传合同正式盖章文本的扫描件（含技术协议、质保承诺等附件），不得用照片、图片格式，不得遗漏附件"
														
 
															+                name="attach"
														
 
															+                initialValue={attachData.attach}
														
 
															+              >
														
 
															+                <ul>
														
 
															+                  {data?.attach &&
														
 
															+                    JSON.parse(data?.attach)?.map((item, idx) => (
														
 
															+                      <li key={`${idx}_${item.name}`}>
														
 
															+                        <a onClick={() => handlePreViewSingle(item)}>
														
 
															+                          {item.name}
														
 
															+                        </a>
														
 
															+                      </li>
														
 
															+                    ))}
														
 
															+                </ul>
														
 
															+              </Form.Item>
														
 
															+              <Form.Item
														
 
															+                name="archives_dep"
														
 
															+                initialValue={data?.archives_dep}
														
 
															+                label="合同原件存档部门："
														
 
															+                tooltip="母公司财务部和采购部门的合同请选择“财务部”，其他部门请选择“行政部”，子公司合同选择“综合管理部”"
														
 
															+                rules={[
														
 
															+                  {
														
 
															+                    required: true,
														
 
															+                    message: '请选择合同原件存档部门',
														
 
															+                  },
														
 
															+                ]}
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+            </Col>
														
 
															+            <Col span={10}>
														
 
															+              <Form.Item
														
 
															+                name="attach_extend"
														
 
															+                label="合同相关资料上传："
														
 
															+                initialValue={attachData.attach_extend}
														
 
															+                tooltip={
														
 
															+                  <div>
														
 
															+                    依据《合同管理办法》，合同相关资料需要作为合同电子档案的一部分，包括：
														
 
															+                    <br />
														
 
															+                    1）合同会审纪要或投资决策通知书（如有）；
														
 
															+                    <br />
														
 
															+                    2）合同相对方的营业执照等资质证的复印件（首次签约的须加盖公章）、个人身份证复印件（合同一方为自然人时提供）；
														
 
															+                    <br />
														
 
															+                    3）合同相对方经办人员的授权委托书原件及其身份证复印件（如有）；
														
 
															+                    <br />
														
 
															+                    4）
														
 
															+                    涉及房屋或场地租赁的，还应提供房屋及场地的权属证明资料，但如果续签租赁合同，且房屋所有权人没有发生变更的，在附具相关说明后可不再提供上述资料；
														
 
															+                    <br />
														
 
															+                    5）其他资料。
														
 
															+                  </div>
														
 
															+                }
														
 
															+              >
														
 
															+                <ul>
														
 
															+                  {data?.attach_extend &&
														
 
															+                    JSON.parse(data?.attach_extend)?.map((item, idx) => (
														
 
															+                      <li key={`${idx}_${item.name}`}>
														
 
															+                        <a onClick={() => handlePreViewSingle(item)}>
														
 
															+                          {item.name}
														
 
															+                        </a>
														
 
															+                      </li>
														
 
															+                    ))}
														
 
															+                </ul>
														
 
															+              </Form.Item>
														
 
															+            </Col>
														
 
															+          </Row>
														
 
															+
														
 
															+          {data?.status > Status.Checking && (
														
 
															+            <>
														
 
															+              <ModuleTitle title="归档流程" />
														
 
															+              <div className={styles.modelItem}>
														
 
															+                <AuditSteps {...auditData} statusText="已归档" />
														
 
															+              </div>
														
 
															+            </>
														
 
															+          )}
														
 
															+
														
 
															+          {data?.status > Status.CalChecking && (
														
 
															+            <>
														
 
															+              <ModuleTitle title="作废信息" />
														
 
															+              <Form.Item
														
 
															+                name="cancel_desc"
														
 
															+                label="作废原因："
														
 
															+                initialValue={data?.cancel_desc}
														
 
															+                labelCol={{ span: 4 }}
														
 
															+                rules={[
														
 
															+                  {
														
 
															+                    required: true,
														
 
															+                    message: '请填写作废原因',
														
 
															+                  },
														
 
															+                ]}
														
 
															+              >
														
 
															+                <Input disabled />
														
 
															+              </Form.Item>
														
 
															+            </>
														
 
															+          )}
														
 
															+        </Form>
														
 
															+      </Card>
														
 
															+      <FileViewerModal
														
 
															+        data={fileViewerData}
														
 
															+        visible={fileViewerVisible}
														
 
															+        onCancel={() => {
														
 
															+          setFileViewerVisible(false);
														
 
															+        }}
														
 
															+      />
														
 
															+    </>
														
 
															+  );
														
 
															+};
														
 
															+
														
 
															+export default ContractDetail;
														
--- a/src/pages/ContractManager/index.jsx
+++ b/src/pages/ContractManager/index.jsx
@@ -283,40 +283,6 @@ const ConteactManager = (props) => {
 
															     },
														
 
															   });
														
 
															-  // //作废审核
														
 
															-  // const { run: calCheckRun } = useRequest(
														
 
															-  //   (data) => queryContractCancelCheck(data),
														
 
															-  //   {
														
 
															-  //     manual: true,
														
 
															-  //     onSuccess: () => {
														
 
															-  //       message.success('审核成功');
														
 
															-  //       setVisible(false);
														
 
															-  //       run(searchData);
														
 
															-  //     },
														
 
															-  //     onError: () => {
														
 
															-  //       message.success('审核失败');
														
 
															-  //     },
														
 
															-  //   },
														
 
															-  // );
														
 
															-
														
 
															-  // //审核合同
														
 
															-  // const { run: runCheck, loading: checkLoading } = useRequest(
														
 
															-  //   (data) => queryContractCheck(data),
														
 
															-  //   {
														
 
															-  //     manual: true,
														
 
															-  //     onSuccess: () => {
														
 
															-  //       // conAuditRun({ multi_status: '1,4', currentPage: 1, page_size: 10 });
														
 
															-  //       // conAuditedRun({ check_by: user.CName });
														
 
															-  //       setVisible(false);
														
 
															-  //       run(searchData);
														
 
															-  //       message.success('审核成功');
														
 
															-  //     },
														
 
															-  //     onErroe: () => {
														
 
															-  //       message.error('审核失败');
														
 
															-  //     },
														
 
															-  //   },
														
 
															-  // );
														
 
															-
														
 
															   //审核合同
														
 
															   const { run: runOACheck } = useRequest(audit, {
														
 
															     manual: true,
														
@@ -440,6 +406,14 @@ const ConteactManager = (props) => {
 
															       });
														
 
															     } else if (type == Type.check) {
														
 
															       runOACheck(data);
														
 
															+    } else if (type == Type.modify) {
														
 
															+      calRun(data);
														
 
															+      createRun({
														
 
															+        form: JSON.stringify(formData),
														
 
															+        audit_list,
														
 
															+        extend_code: data.code,
														
 
															+        extend_type: 0, //归档提交
														
 
															+      });
														
 
															     }
														
 
															   };
														
--- a/src/pages/Flow/OaAuditDetail.js
+++ b/src/pages/Flow/OaAuditDetail.js
@@ -1,18 +1,33 @@
 
															 // 审批详情
														
 
															-import React, { useState, useMemo } from 'react';
														
 
															-import { Steps, Button, Tooltip, message } from 'antd';
														
 
															-import { useParams, useRequest, useModel } from 'umi';
														
 
															+import React, { useState, useMemo, useEffect } from 'react';
														
 
															+import { Steps, Button, Tooltip, message, Spin } from 'antd';
														
 
															+import { useParams, 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 PageContent from '@/components/PageContent';
														
 
															 import SignModal from './components/SignModal';
														
 
															+import ContractDetail from '../ContractManager/detail';
														
 
															+import { Type } from '../Profile';
														
 
															+import { queryContractDetail } from '../../services/contract';
														
 
															-function OaAuditDetail(props) {
														
 
															+function OaAuditDetail() {
														
 
															+  const {
														
 
															+    initialState,
														
 
															+  } = useModel('@@initialState');
														
 
															+  const user = initialState?.user || {}
														
 
															   const [auditVisible, setAuditVisible] = useState(false);
														
 
															-  const { oaId, id } = useParams();
														
 
															+  const location = useLocation();
														
 
															+  const {
														
 
															+    state: { id, type, code },
														
 
															+  } = location;
														
 
															   const [visible, setVisible] = useState(false);
														
 
															+  useEffect(() => {
														
 
															+    if (type == Type.CON) runCon({ code });
														
 
															+  }, [type]);
														
 
															+
														
 
															   const { data, loading, refresh } = useRequest(queryAuditDetail, {
														
 
															     defaultParams: [{ id }],
														
 
															   });
														
@@ -24,11 +39,21 @@ function OaAuditDetail(props) {
 
															     audit_status,
														
 
															     AuditorInfo,
														
 
															   } = data || {};
														
 
															-  if (OaAuditList) console.log(JSON.stringify(OaAuditList));
														
 
															+  // if (OaAuditList) console.log(JSON.stringify(OaAuditList));
														
 
															+
														
 
															+  //请求列表
														
 
															   const {
														
 
															-    initialState,
														
 
															-  } = useModel('@@initialState');
														
 
															-  const user = initialState?.user || {}
														
 
															+    data: conData,
														
 
															+    run: runCon,
														
 
															+    loading: conLoading,
														
 
															+  } = useRequest((data) => queryContractDetail(data), {
														
 
															+    manual: true,
														
 
															+    formatResult: (res) => {
														
 
															+      return res?.data?.detail;
														
 
															+    },
														
 
															+    onSuccess: (res) => {},
														
 
															+  });
														
 
															+  // console.log(conData);
														
 
															   const getDescription = (node) => {
														
 
															     let str = node?.AuditRoleInfo
														
@@ -104,7 +129,7 @@ function OaAuditDetail(props) {
 
															   }, [user, data]);
														
 
															   return (
														
 
															-    <PageContent extra={btns} loading={loading}>
														
 
															+    <PageContent extra={btns} loading={loading && conLoading}>
														
 
															       <Steps
														
 
															         style={{ marginBottom: 20 }}
														
 
															         current={audit_status == 3 ? OaAuditList?.length : current_seq - 1}
														
@@ -114,7 +139,11 @@ function OaAuditDetail(props) {
 
															           description: getDescription(item),
														
 
															         }))}
														
 
															       ></Steps>
														
 
															-      <FormAndFilesNode formData={form} fileList={Files} />
														
 
															+      {type == Type.OA ? (
														
 
															+        <FormAndFilesNode formData={form} fileList={Files} />
														
 
															+      ) : (
														
 
															+        <ContractDetail data={conData} />
														
 
															+      )}
														
 
															       <AuditModal
														
 
															         id={id}
														
--- a/src/pages/Profile/index.js
+++ b/src/pages/Profile/index.js
@@ -1,234 +1,35 @@
 
															 import React, { Fragment, useState, useEffect, useMemo, useRef } from 'react';
														
 
															 import { useNavigate } from 'umi';
														
 
															-import {
														
 
															-  Card,
														
 
															-  Table,
														
 
															-  Empty,
														
 
															-  Button,
														
 
															-  Modal,
														
 
															-  message,
														
 
															-  Form,
														
 
															-  DatePicker,
														
 
															-  Row,
														
 
															-  Col,
														
 
															-  Select,
														
 
															-} from 'antd';
														
 
															-const { RangePicker } = DatePicker;
														
 
															-import { useRequest, useModel } from '@umijs/max';
														
 
															-import { queryProfileList, queryApplyList } from '@/services/boom';
														
 
															+import { Table, Modal, DatePicker, Divider } from 'antd';
														
 
															+import { useRequest } from '@umijs/max';
														
 
															+import { queryProfileList, queryApplyList, applyRepeal } from '@/services/boom';
														
 
															 import dayjs from 'dayjs';
														
 
															-import { queryContractCheck, queryGetContractList } from '@/services/contract';
														
 
															-import ContractModal, {
														
 
															-  Status,
														
 
															-  StatusText,
														
 
															-  Type,
														
 
															-} from '../ContractManager/component/Modal';
														
 
															 import PageContent from '@/components/PageContent';
														
 
															+import { queryApprovedList } from '@/services/contract';
														
 
															+import { ExclamationCircleOutlined } from '@ant-design/icons';
														
 
															+
														
 
															+export const Type = {
														
 
															+  OA: 1,
														
 
															+  CON: 2,
														
 
															+};
														
 
															 function profile(props) {
														
 
															-  const {
														
 
															-    initialState,
														
 
															-  } = useModel('@@initialState');
														
 
															-  const user = initialState?.user || {}
														
 
															   const [tabActive, setTabActive] = useState('1');
														
 
															-  const approveFormRef = useRef();
														
 
															-  const applyFormRef = useRef();
														
 
															-  let navigate = useNavigate();
														
 
															-  const [detail, setDetail] = useState({});
														
 
															-  const [conVisible, setConVisible] = useState(false);
														
 
															-
														
 
															-  const TYPE = {
														
 
															-    Contract: 1,
														
 
															-    OA: 2,
														
 
															-  };
														
 
															-
														
 
															-  //OA我的申请列表
														
 
															-  const {
														
 
															-    data: OAApplyData,
														
 
															-    run: OAApplyRun,
														
 
															-    loading: OAApplyLoading,
														
 
															-  } = useRequest(queryProfileList, {
														
 
															-    // manual: true,
														
 
															-    formatResult: (res) => {
														
 
															-      return res.data?.list?.map((item) => {
														
 
															-        return {
														
 
															-          ...item,
														
 
															-          CName: item.AuthorInfo.CName,
														
 
															-          table_desc: [item.table_desc],
														
 
															-          statusText: (() => {
														
 
															-            switch (item.audit_status) {
														
 
															-              case 0:
														
 
															-                return '审核中';
														
 
															-              case 1:
														
 
															-                return '通过';
														
 
															-              case 2:
														
 
															-                return '拒绝';
														
 
															-              case 3:
														
 
															-                return '终审通过';
														
 
															-            }
														
 
															-          })(),
														
 
															-          key: `${TYPE.Contract}_${item.id}`,
														
 
															-          type: TYPE.OA,
														
 
															-        };
														
 
															-      });
														
 
															-    },
														
 
															+  const [loading, setLoading] = useState(false);
														
 
															+  const [columns, setColumes] = useState([]);
														
 
															+  const [data, setData] = useState({
														
 
															+    list: [],
														
 
															+    pagination: {},
														
 
															   });
														
 
															-  //OA我的审批和待审批列表
														
 
															-  const {
														
 
															-    data: OAAuditData,
														
 
															-    run: OAAuditRun,
														
 
															-    loading: OAAuditLoading,
														
 
															-  } = useRequest(queryProfileList, {
														
 
															-    manual: true,
														
 
															-    formatResult: (res) => {
														
 
															-      return res.data?.list?.map((item) => {
														
 
															-        return {
														
 
															-          ...item,
														
 
															-          CName: item.AuthorInfo.CName,
														
 
															-          table_desc: [item.table_desc],
														
 
															-          statusText: item.status,
														
 
															-          // key: `${TYPE.Contract}_${item.id}`,
														
 
															-          showBtn: true,
														
 
															-          type: TYPE.OA,
														
 
															-        };
														
 
															-      });
														
 
															-    },
														
 
															-  });
														
 
															-
														
 
															-  //合同管理返回处理函数
														
 
															-  const contractResult = (res) => {
														
 
															-    let data = res.data?.list;
														
 
															-    return data?.map((item) => {
														
 
															-      return {
														
 
															-        ...item,
														
 
															-        table_name: `${user.CName}提交的合同审批`,
														
 
															-        table_desc: [
														
 
															-          `合同名称：${item.name}`,
														
 
															-          `合同编号：${item.code}`,
														
 
															-          `合同金额：${item.amount}万元`,
														
 
															-        ],
														
 
															-        CName: user.CName,
														
 
															-        create_time: item.cancel_on || item.created_on,
														
 
															-        type: TYPE.Contract,
														
 
															-        statusText: StatusText[item.status],
														
 
															-        showBtn:
														
 
															-          item.status == Status.Checking || item.status == Status.CalChecking,
														
 
															-        // key: `${TYPE.Contract}_${item.id}`,
														
 
															-      };
														
 
															-    });
														
 
															-  };
														
 
															-
														
 
															-  //合同管理相关数据
														
 
															-  //请求我的申请列表
														
 
															-  const {
														
 
															-    data: conApplyData,
														
 
															-    run: conApplyRun,
														
 
															-    loading: conApplyLoading,
														
 
															-  } = useRequest(queryGetContractList, {
														
 
															-    defaultParams: [{ created_by: user?.ID }],
														
 
															-    formatResult: contractResult,
														
 
															-  });
														
 
															-  //我的待审批列表
														
 
															-  const {
														
 
															-    data: conAuditData,
														
 
															-    run: conAuditRun,
														
 
															-    loading: conAduitLoading,
														
 
															-  } = useRequest((data) => queryGetContractList(data), {
														
 
															-    manual: true,
														
 
															-    formatResult: contractResult,
														
 
															-  });
														
 
															-  //我审批过的列表
														
 
															-  const {
														
 
															-    data: conAuditedData,
														
 
															-    run: conAuditedRun,
														
 
															-    loading: conAduitedLoading,
														
 
															-  } = useRequest((data) => queryGetContractList(data), {
														
 
															-    manual: true,
														
 
															-    formatResult: contractResult,
														
 
															-  });
														
 
															-
														
 
															-  //审核合同
														
 
															-  const { run: runCheck, loading: checkLoading } = useRequest(
														
 
															-    (data) => queryContractCheck(data),
														
 
															-    {
														
 
															-      manual: true,
														
 
															-      onSuccess: () => {
														
 
															-        conAuditRun({ status: 1 });
														
 
															-        conAuditedRun({ check_by: user.CName });
														
 
															-        setConVisible(false);
														
 
															-        message.success('审核成功');
														
 
															-      },
														
 
															-      onErroe: () => {
														
 
															-        message.error('审核失败');
														
 
															-      },
														
 
															-    },
														
 
															-  );
														
 
															-
														
 
															-  //拼接审核数据和申请数据  审核loading和申请loading
														
 
															-  const auditData = useMemo(() => {
														
 
															-    let result = [];
														
 
															-    if (OAAuditData && OAAuditData.length > 0) result = [...OAAuditData];
														
 
															-    if (conAuditData && conAuditData.length > 0)
														
 
															-      result = [...result, ...conAuditData];
														
 
															-    if (conAuditedData && conAuditedData.length > 0)
														
 
															-      result = [...result, ...conAuditedData];
														
 
															-    return result;
														
 
															-  }, [OAAuditData, conAuditData, conAuditedData]);
														
 
															-
														
 
															-  const auditLoading = useMemo(() => {
														
 
															-    let loading = false;
														
 
															-    if (OAAuditLoading || conAduitLoading || conAduitedLoading) loading = true;
														
 
															-    return loading;
														
 
															-  }, [OAAuditLoading, conAduitLoading, conAduitedLoading]);
														
 
															-
														
 
															-  const applyData = useMemo(() => {
														
 
															-    let result = [];
														
 
															-    if (OAApplyData && OAApplyData.length > 0) result = [...OAApplyData];
														
 
															-    if (conApplyData && conApplyData.length > 0)
														
 
															-      result = [...result, ...conApplyData];
														
 
															-    return result;
														
 
															-  }, [OAApplyData, conApplyData]);
														
 
															-
														
 
															-  const applyLoading = useMemo(() => {
														
 
															-    let loading = false;
														
 
															-    if (OAApplyLoading || conApplyLoading) loading = true;
														
 
															-    return loading;
														
 
															-  }, [OAApplyLoading, conApplyLoading]);
														
 
															-
														
 
															-  // useEffect(() => {
														
 
															-  //   if (user?.Permission['menu-001-audit']) run({ status: 1 });
														
 
															-  // }, [user]);
														
 
															+  let navigate = useNavigate();
														
 
															-  const onTabChange = (activeKey) => {
														
 
															-    if (activeKey == '1') {
														
 
															-      OAApplyRun();
														
 
															-      conApplyRun();
														
 
															-    } else {
														
 
															-      OAAuditRun();
														
 
															-      if (user?.Permission['menu-001-audit']) conAuditRun({ status: 1 });
														
 
															-      conAuditedRun({ check_by: user.CName });
														
 
															-    }
														
 
															-    setTabActive(activeKey);
														
 
															-  };
														
 
															-  const columns = [
														
 
															+  const columnsApplay = [
														
 
															     {
														
 
															       title: '标题',
														
 
															       dataIndex: 'table_name',
														
 
															       width: '30%',
														
 
															     },
														
 
															-    {
														
 
															-      title: '摘要',
														
 
															-      dataIndex: 'table_desc',
														
 
															-      render: (descList) => {
														
 
															-        return (
														
 
															-          <ul>
														
 
															-            {descList?.map((item) => (
														
 
															-              <li>{item}</li>
														
 
															-            ))}
														
 
															-          </ul>
														
 
															-        );
														
 
															-      },
														
 
															-    },
														
 
															+
														
 
															     {
														
 
															       title: '发起人',
														
 
															       dataIndex: 'CName',
														
@@ -243,203 +44,197 @@ function profile(props) {
 
															     },
														
 
															     {
														
 
															       title: '流程状态',
														
 
															-      dataIndex: 'statusText',
														
 
															-      // render: (record) => {
														
 
															-      //   switch (record.audit_status) {
														
 
															-      //     case 0: return '审核中'
														
 
															-      //     case 1: return '通过'
														
 
															-      //     case 2: return '拒绝'
														
 
															-      //     case 3: return '终审通过'
														
 
															-      //   }
														
 
															-      // },
														
 
															-      // width: '20%'
														
 
															+      // dataIndex: 'status',
														
 
															+      render: (record) => {
														
 
															+        if (record.is_repeal) return '已撤回';
														
 
															+        switch (record.audit_status) {
														
 
															+          case 0:
														
 
															+            return '审核中';
														
 
															+          case 1:
														
 
															+            return '通过';
														
 
															+          case 2:
														
 
															+            return '拒绝';
														
 
															+          case 3:
														
 
															+            return '终审通过';
														
 
															+        }
														
 
															+      },
														
 
															+      width: '20%',
														
 
															     },
														
 
															     {
														
 
															       title: '操作',
														
 
															-      render: (text, record) => (
														
 
															-        <Fragment>
														
 
															-          <>
														
 
															-            <a
														
 
															-              style={{ color: '#4096ff' }}
														
 
															-              onClick={() => {
														
 
															-                navigate(`/profile/${record.id}`);
														
 
															-              }}
														
 
															-            >
														
 
															-              详情
														
 
															-            </a>
														
 
															-          </>
														
 
															-        </Fragment>
														
 
															-      ),
														
 
															-      width: '10%',
														
 
															-    },
														
 
															-  ];
														
 
															-  const approveColumns = [
														
 
															-    {
														
 
															-      title: '标题',
														
 
															-      dataIndex: 'table_name',
														
 
															-    },
														
 
															-    {
														
 
															-      title: '摘要',
														
 
															-      dataIndex: 'table_desc',
														
 
															-      render: (descList) => {
														
 
															+      render: (record) => {
														
 
															         return (
														
 
															-          <ul>
														
 
															-            {descList?.map((item) => (
														
 
															-              <li>{item}</li>
														
 
															-            ))}
														
 
															-          </ul>
														
 
															+          !record.is_repeal && (
														
 
															+            <Fragment>
														
 
															+              <>
														
 
															+                <a
														
 
															+                  style={{ color: '#4096ff' }}
														
 
															+                  onClick={() => {
														
 
															+                    if (record.extend_code) {
														
 
															+                      navigate('/profile/detail', {
														
 
															+                        state: {
														
 
															+                          id: record.id,
														
 
															+                          code: record.extend_code,
														
 
															+                          type: Type.CON,
														
 
															+                        },
														
 
															+                      });
														
 
															+                    } else {
														
 
															+                      navigate('/profile/detail', {
														
 
															+                        state: { id: record.id, type: Type.OA },
														
 
															+                      });
														
 
															+                    }
														
 
															+                  }}
														
 
															+                >
														
 
															+                  详情
														
 
															+                </a>
														
 
															+                {tabActive == '1' && record?.audit_status == 0 && (
														
 
															+                  <>
														
 
															+                    <Divider type="vertical" />
														
 
															+                    <a
														
 
															+                      style={{ color: '#4096ff' }}
														
 
															+                      onClick={() => onRepeal(record)}
														
 
															+                    >
														
 
															+                      撤回
														
 
															+                    </a>
														
 
															+                  </>
														
 
															+                )}
														
 
															+              </>
														
 
															+            </Fragment>
														
 
															+          )
														
 
															         );
														
 
															       },
														
 
															+      width: '10%',
														
 
															     },
														
 
															+  ];
														
 
															+  const columnsApproved = [
														
 
															     {
														
 
															-      title: '发起人',
														
 
															-      dataIndex: 'CName',
														
 
															+      title: '标题',
														
 
															+      dataIndex: 'name',
														
 
															+      width: '30%',
														
 
															     },
														
 
															+    // {
														
 
															+    //   title: '摘要',
														
 
															+    //   dataIndex: 'table_desc',
														
 
															+    //   render: (descList) => {
														
 
															+    //     return (
														
 
															+    //       <ul>
														
 
															+    //         {descList?.map((item) => (
														
 
															+    //           <li>{item}</li>
														
 
															+    //         ))}
														
 
															+    //       </ul>
														
 
															+    //     );
														
 
															+    //   },
														
 
															+    // },
														
 
															+    // {
														
 
															+    //   title: '发起人',
														
 
															+    //   dataIndex: 'CName',
														
 
															+    //   width: '20%',
														
 
															+    // },
														
 
															     {
														
 
															       title: '发起时间',
														
 
															       render: (record) => {
														
 
															         return dayjs(record.create_time).format('YYYY-MM-DD HH:mm:ss');
														
 
															       },
														
 
															+      width: '20%',
														
 
															     },
														
 
															     {
														
 
															-      title: '流程状态',
														
 
															-      dataIndex: 'statusText',
														
 
															+      title: '我审批的时间',
														
 
															+      render: (record) => {
														
 
															+        return dayjs(record.audit_time).format('YYYY-MM-DD HH:mm:ss');
														
 
															+      },
														
 
															+      width: '20%',
														
 
															     },
														
 
															     {
														
 
															-      title: '操作',
														
 
															-      dataIndex: 'showBtn',
														
 
															-      render: (text, record) => (
														
 
															-        <>
														
 
															-          {text ? (
														
 
															-            <a
														
 
															-              style={{ color: '#4096ff' }}
														
 
															-              onClick={() => {
														
 
															-                if (record.type == TYPE.Contract) {
														
 
															-                  setDetail(record);
														
 
															-                  setConVisible(true);
														
 
															-                } else {
														
 
															-                  navigate(`/oa/detail/${record.flow_id}/${record.id}`);
														
 
															-                }
														
 
															-              }}
														
 
															-            >
														
 
															-              审批
														
 
															-            </a>
														
 
															-          ) : (
														
 
															-            <div>已审批</div>
														
 
															-          )}
														
 
															-        </>
														
 
															-      ),
														
 
															+      title: '状态',
														
 
															+      // dataIndex: 'status',
														
 
															+      render: (record) => {
														
 
															+        switch (record.audit_status) {
														
 
															+          case 0:
														
 
															+            return '审核中';
														
 
															+          case 1:
														
 
															+            return '通过';
														
 
															+          case 2:
														
 
															+            return '拒绝';
														
 
															+          case 3:
														
 
															+            return '终审通过';
														
 
															+        }
														
 
															+      },
														
 
															+      width: '20%',
														
 
															     },
														
 
															   ];
														
 
															-  const handleApplySubmit = (values) => {
														
 
															-    console.log(values);
														
 
															-    queryApplyListRequest.run(values);
														
 
															+
														
 
															+  //我的申请
														
 
															+  const queryApplay = async () => {
														
 
															+    const data = await queryApplyList();
														
 
															+    console.log(data);
														
 
															+    setData(data);
														
 
															+    setLoading(false);
														
 
															   };
														
 
															-  const handleApproveSubmit = (values) => {
														
 
															-    console.log(values);
														
 
															+  //我的待审批
														
 
															+  const queryApprove = async () => {
														
 
															+    const data = await queryProfileList();
														
 
															+    console.log(data);
														
 
															+    setData(data);
														
 
															+    setLoading(false);
														
 
															   };
														
 
															-  const handleApplyPaginationChange = (pagination) => {
														
 
															-    queryApplyListRequest.run({
														
 
															-      currentPage: pagination.current,
														
 
															-      pageSize: pagination.pageSize,
														
 
															-    });
														
 
															+  //我的已审批
														
 
															+  const queryApproved = async () => {
														
 
															+    const data = await queryApprovedList();
														
 
															+    console.log(data);
														
 
															+    setData(data);
														
 
															+    setLoading(false);
														
 
															   };
														
 
															-  const handleProfilePaginationChange = (pagination) => {
														
 
															-    queryProfileListRequest.run({
														
 
															-      currentPage: pagination.current,
														
 
															-      pageSize: pagination.pageSize,
														
 
															-    });
														
 
															+
														
 
															+  //撤回申请
														
 
															+  const { run: runRepeal, loading: repealLoading } = useRequest(
														
 
															+    (id) => applyRepeal({ id }),
														
 
															+    {
														
 
															+      manual: true,
														
 
															+      onSuccess: () => {
														
 
															+        handlerTabChange(tabActive);
														
 
															+      },
														
 
															+    },
														
 
															+  );
														
 
															+
														
 
															+  const handlerTabChange = (tab) => {
														
 
															+    setLoading(true);
														
 
															+    switch (tab) {
														
 
															+      case '1':
														
 
															+        setColumes(columnsApplay);
														
 
															+        queryApplay();
														
 
															+        break;
														
 
															+      case '2':
														
 
															+        setColumes(columnsApplay);
														
 
															+        queryApprove();
														
 
															+        break;
														
 
															+      case '3':
														
 
															+        setColumes(columnsApproved);
														
 
															+        queryApproved();
														
 
															+        break;
														
 
															+    }
														
 
															   };
														
 
															-  const renderPage = (activeKey) => {
														
 
															-    if (activeKey == '1')
														
 
															-      return (
														
 
															-        <>
														
 
															-          {' '}
														
 
															-          <Form
														
 
															-            name="basic"
														
 
															-            // labelCol={{ span: 0 }}
														
 
															-            // wrapperCol={{ span: 24 }}
														
 
															-            onFinish={handleApplySubmit}
														
 
															-            ref={applyFormRef}
														
 
															-          >
														
 
															-            <div style={{ display: 'flex' }}>
														
 
															-              <Form.Item name="range-picker" label="申请时间：">
														
 
															-                <RangePicker />
														
 
															-              </Form.Item>
														
 
															-              <Form.Item>
														
 
															-                <Button
														
 
															-                  type="primary"
														
 
															-                  htmlType="submit"
														
 
															-                  style={{ marginLeft: 10 }}
														
 
															-                >
														
 
															-                  查询
														
 
															-                </Button>
														
 
															-              </Form.Item>
														
 
															-            </div>
														
 
															-          </Form>
														
 
															-          <Table
														
 
															-            columns={columns}
														
 
															-            dataSource={applyData}
														
 
															-            loading={applyLoading}
														
 
															-            // columns={columns}
														
 
															-            // loading={queryApplyListRequest.loading}
														
 
															-            // dataSource={queryApplyListRequest?.data?.list}
														
 
															-            // pagination={queryApplyListRequest?.data?.pagination}
														
 
															-            // onChange={handleApplyPaginationChange}
														
 
															-          />
														
 
															-        </>
														
 
															-      );
														
 
															-    else if (activeKey == '2')
														
 
															-      return (
														
 
															-        <>
														
 
															-          {' '}
														
 
															-          <Form
														
 
															-            name="basic"
														
 
															-            // labelCol={{ span: 0 }}
														
 
															-            // wrapperCol={{ span: 24 }}
														
 
															-            onFinish={handleApproveSubmit}
														
 
															-            ref={approveFormRef}
														
 
															-          >
														
 
															-            <div style={{ display: 'flex' }}>
														
 
															-              <Form.Item name="range-picker" label="审批时间：">
														
 
															-                <RangePicker />
														
 
															-              </Form.Item>
														
 
															-              <Form.Item name="audit_status" label="状态：" initialValue="">
														
 
															-                <Select
														
 
															-                  style={{ width: 120 }}
														
 
															-                  options={[
														
 
															-                    { value: '', label: '全部' },
														
 
															-                    { value: '0', label: '审核中' },
														
 
															-                    { value: '1', label: '通过' },
														
 
															-                    { value: '2', label: '拒绝' },
														
 
															-                    { value: '3', label: '终审通过' },
														
 
															-                  ]}
														
 
															-                />
														
 
															-              </Form.Item>
														
 
															-              <Form.Item>
														
 
															-                <Button
														
 
															-                  type="primary"
														
 
															-                  htmlType="submit"
														
 
															-                  style={{ marginLeft: 10 }}
														
 
															-                >
														
 
															-                  查询
														
 
															-                </Button>
														
 
															-              </Form.Item>
														
 
															-            </div>
														
 
															-          </Form>
														
 
															-          <Table
														
 
															-            columns={approveColumns}
														
 
															-            dataSource={auditData}
														
 
															-            loading={auditLoading}
														
 
															-            // loading={queryProfileListRequest.loading}
														
 
															-            // columns={approveColumns}
														
 
															-            // dataSource={queryProfileListRequest?.data?.list}
														
 
															-            // pagination={queryProfileListRequest?.data?.pagination}
														
 
															-            // onChange={handleProfilePaginationChange}
														
 
															-          />
														
 
															-        </>
														
 
															-      );
														
 
															+
														
 
															+  useEffect(() => {
														
 
															+    handlerTabChange('1');
														
 
															+  }, []);
														
 
															+
														
 
															+  useEffect(() => {
														
 
															+    handlerTabChange(tabActive);
														
 
															+  }, [tabActive]);
														
 
															+
														
 
															+  const onRepeal = (record) => {
														
 
															+    Modal.confirm({
														
 
															+      title: '撤回',
														
 
															+      icon: <ExclamationCircleOutlined />,
														
 
															+      content: `确定撤回申请`,
														
 
															+      okText: '确认',
														
 
															+      cancelText: '取消',
														
 
															+      onOk: () => {
														
 
															+        runRepeal(record.id);
														
 
															+      },
														
 
															+    });
														
 
															   };
														
 
															+
														
 
															   return (
														
 
															     <PageContent
														
 
															       tabList={[
														
@@ -451,20 +246,14 @@ function profile(props) {
 
															           tab: '我的审批',
														
 
															           key: '2',
														
 
															         },
														
 
															+        {
														
 
															+          tab: '已审批',
														
 
															+          key: '3',
														
 
															+        },
														
 
															       ]}
														
 
															-      onTabChange={onTabChange}
														
 
															+      onTabChange={setTabActive}
														
 
															     >
														
 
															-      <div>{renderPage(tabActive)}</div>
														
 
															-      <ContractModal
														
 
															-        detail={detail}
														
 
															-        type={Type.check}
														
 
															-        // projectList={projectData?.list}
														
 
															-        visible={conVisible}
														
 
															-        handleOk={(data) =>
														
 
															-          detail.status == Status.Checking ? runCheck(data) : null
														
 
															-        }
														
 
															-        handleCancel={() => setConVisible(false)}
														
 
															-      />
														
 
															+      <Table columns={columns} dataSource={data?.list} loading={loading} />
														
 
															     </PageContent>
														
 
															   );
														
 
															 }
														
--- a/src/services/boom.js
+++ b/src/services/boom.js
@@ -223,16 +223,30 @@ export async function queryProfileList(params) {
 
															       (child) => item.flow_id === child?.list.id,
														
 
															     );
														
 
															     if (audit) {
														
 
															-      item.table_name = item.AuthorInfo?.CName + audit.list.name;
														
 
															+      item.CName = item.AuthorInfo.CName;
														
 
															+      item.table_name = item.name;
														
 
															       item.table_desc = audit.list.desc;
														
 
															       item.status = '待审批';
														
 
															     }
														
 
															   });
														
 
															   console.log(profileList);
														
 
															-  return profileList;
														
 
															+  return profileList?.data;
														
 
															 }
														
 
															 export async function queryApplyList(params) {
														
 
															-  return request(`/api/v1/oa/audit/my/list`, { params });
														
 
															+  const res = await request(`/api/v1/oa/audit/my/list`, { params });
														
 
															+  if (res?.data) {
														
 
															+    const list = res.data?.list?.map((item) => {
														
 
															+      return {
														
 
															+        ...item,
														
 
															+        CName: item.AuthorInfo.CName,
														
 
															+        table_desc: item.table_desc,
														
 
															+        table_name: item.name,
														
 
															+      };
														
 
															+    });
														
 
															+    return { list, pagination: res.data?.pagination };
														
 
															+  } else {
														
 
															+    return { list: [], pagination: {} };
														
 
															+  }
														
 
															 }
														
 
															 //获取多级主管
														
--- a/src/services/contract.js
+++ b/src/services/contract.js
@@ -63,9 +63,10 @@ export const queryContractCancelCheck = async (data) => {
 
															 //OA已审核过的
														
 
															 export const queryApprovedList = async (data) => {
														
 
															-  return await request('/api/v1/oa/audited/my/list', {
														
 
															+  const res = await request('/api/v1/oa/audited/my/list', {
														
 
															     params: data,
														
 
															   });
														
 
															+  if (res?.data) return res.data;
														
 
															 };
														
 
															 //公司列表
														
@@ -98,3 +99,10 @@ export const queryDelById = async (data) => {
 
															     params: data,
														
 
															   });
														
 
															 };
														
 
															+
														
 
															+//合同详情接口
														
 
															+export const queryContractDetail = async (data) => {
														
 
															+  return await request(`/api/contract/v1/detail`, {
														
 
															+    params: data,
														
 
															+  });
														
 
															+};