Squashed commit of the following:

merge develop
commit 1046d899bb974c79baff9e1116f574deaf7e9c40
Author: Renxy <18510891294@163.com>
Date:   Mon Jun 26 10:27:54 2023 +0800

    修改bug

commit 297c9b753fb568c590b1ef078b80b27121f177af
Author: Renxy <18510891294@163.com>
Date:   Thu Jun 15 13:55:39 2023 +0800

    修改合同管理点击加号查看子合同导致页码不对

commit 95d8668c565b7ace271a657f56189a44398a738b
Author: Renxy <18510891294@163.com>
Date:   Tue Jun 13 18:01:41 2023 +0800

    修改测试cc_list报错问题

commit 0afedb446622c1e1ece45ef7a18ef54ce17a67fb
Author: Renxy <18510891294@163.com>
Date:   Tue Jun 13 17:37:34 2023 +0800

    修改审批流配置时一个审批节点多选人审批

commit 07d9ec5badf6402f6ec309f3e18e234143af1565
Author: Renxy <18510891294@163.com>
Date:   Tue Jun 13 17:28:14 2023 +0800

    Squashed commit of the following:
    合并Oa审批相关修改
    commit 5ebec549350be80379fa3a62b9e84436fddce9f9
    Author: Renxy <18510891294@163.com>
    Date:   Tue Jun 13 17:27:17 2023 +0800

        删除log

    commit f4dc257905af71235bba619ed4d80820e07efb5b
    Author: Renxy <18510891294@163.com>
    Date:   Tue Jun 13 17:24:50 2023 +0800

        审批节点支持选择多人依次审批

    commit f87dbf6acfc4f5feff9c913272a2d381bdb4f080
    Author: Renxy <18510891294@163.com>
    Date:   Tue Jun 13 13:44:42 2023 +0800

        Squashed commit of the following:
        合并develop
        commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
        Author: Renxy <18510891294@163.com>
        Date:   Tue Jun 13 13:41:02 2023 +0800

            合同管理兼容旧审批流程

    commit ea7c41df6b110fef53edc8e5cea0001f5cb3be1e
    Author: Renxy <18510891294@163.com>
    Date:   Tue Jun 13 11:14:22 2023 +0800

        抄送人修改

commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date:   Tue Jun 13 13:41:02 2023 +0800

    合同管理兼容旧审批流程

commit 70e9acd8616204ad9e0a48ce2bf28723acd2c0f7
Author: Renxy <18510891294@163.com>
Date:   Mon Jun 12 11:38:29 2023 +0800

    修改合同管理撤回/添加修改密码

commit 14c5daaa89549fa24d0503fec213a6adccb3839c
Author: Renxy <18510891294@163.com>
Date:   Tue Jun 6 18:28:10 2023 +0800

    修改合同走OA审批流程

commit f7a9b85def9165c9d3c73009b8426e0d12dcb755
Author: Renxy <18510891294@163.com>
Date:   Mon Jun 5 17:05:21 2023 +0800

    修改供应商管理

commit 384b2efc8b51a13875180a12edecb67ba9a79c29
Author: Renxy <18510891294@163.com>
Date:   Fri Jun 2 18:00:54 2023 +0800

    update

commit 538958cebfb957ab52b95ed4e9e3627ea4e1e6ff
Author: Renxy <18510891294@163.com>
Date:   Fri Jun 2 17:59:48 2023 +0800

    修改合同预览/修改合同相关

commit e9fe47ccd098e11b5cf026f0b9a8a151a9863850
Merge: a9c0fb8 e14b706
Author: xjj <645007605@qq.com>
Date:   Wed May 31 18:26:59 2023 +0800

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

commit a9c0fb85e00f662fc0371ce18329e9b75f217683
Author: xjj <645007605@qq.com>
Date:   Wed May 31 18:26:54 2023 +0800

    加签

commit e14b706d41c53066ab6c694d3e1fc86ab1ed4e45
Merge: 1f42e19 e3c5635
Author: Renxy <18510891294@163.com>
Date:   Wed May 31 11:22:43 2023 +0800

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

commit 1f42e196c5703cc4d4ee9a6ea676c0925547e1e9
Author: Renxy <18510891294@163.com>
Date:   Wed May 31 11:22:34 2023 +0800

    update

commit 46cb4fe1081fa498603abf808e83adafa1606959
Author: Renxy <18510891294@163.com>
Date:   Wed May 31 11:22:01 2023 +0800

    合同详情里面添加预览按钮

commit e3c563564c937c19c06bada3620c6eb92c1ef361
Merge: b920297 4eba9cf
Author: xjj <645007605@qq.com>
Date:   Tue May 30 15:08:41 2023 +0800

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

commit b9202974083f2f6c59b0c422ef41f15e9b70ff09
Author: xjj <645007605@qq.com>
Date:   Tue May 30 15:08:29 2023 +0800

    增加或条件

commit 4eba9cf99126d93ee283dfb69b1ec78a323246df
Merge: 3a93b15 0860bbd
Author: Renxy <18510891294@163.com>
Date:   Thu May 18 13:45:47 2023 +0800

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

commit 3a93b15457311d57c8a9f22b7403a4a1c52f3827
Author: Renxy <18510891294@163.com>
Date:   Thu May 18 13:45:38 2023 +0800

    修改合同审核

commit 0860bbd4fd51b4897df483facf318df5638bca9b
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date:   Sat May 13 18:00:45 2023 +0800

    审批流类型 合同审批改为合同归档审批

# Conflicts:
#	.umirc.ts
#	src/pages/ContractManager/component/Modal.jsx
#	src/pages/ContractManager/index.jsx

.umirc.ts

@@ -24,8 +24,8 @@ export default defineConfig({
   proxy: {
     '/api': {
       // target: 'http://47.96.12.136:8888/',
-      target: 'http://47.96.12.136:8895/',
-      // target: 'https://work.greentech.com.cn/',
+      // target: 'http://47.96.12.136:8895/',
+      target: 'https://work.greentech.com.cn/',
       changeOrigin: true,
     },
   },

src/pages/ContractManager/component/Modal.jsx

@@ -999,7 +999,7 @@ const ContractModal = (props) => {
                 <Select
                   style={{ width: '100%' }}
                   options={archivesDepList?.map((item) => {
-                    return { label: item.Name, value: item.ID };
+                    return { label: item.Name, value: item.Name };
                   })}
                   disabled={disableds.contract}
                 />

src/pages/ContractManager/index.jsx

@@ -333,29 +333,11 @@ const ConteactManager = (props) => {
       setVisible(false);
       message.success('审核成功');
     },
-    onErroe: () => {
+    onError: () => {
       message.error('审核失败');
     },
   });
 
-  //审核合同
-  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 { data: projectData } = useRequest(queryApproval, {
     defaultParams: [{ pageSize: 99999 }],

src/pages/Profile/approve.js

@@ -132,6 +132,38 @@ function Approve(props) {
   //   },
   // );
 
+  // //审核合同
+  // const { run: runCheck, loading: checkLoading } = useRequest(
+  //   (data) => queryContractCheck(data),
+  //   {
+  //     manual: true,
+  //     onSuccess: () => {
+  //       conAuditRun({ multi_status: '1,4', current: 1, page_size: 10 });
+  //       // conAuditedRun({ check_by: user.CName });
+  //       setConVisible(false);
+  //       message.success('审核成功');
+  //     },
+  //     onErroe: () => {
+  //       message.error('审核失败');
+  //     },
+  //   },
+  // );
+  // //作废审核
+  // const { run: calCheckRun } = useRequest(
+  //   (data) => queryContractCancelCheck(data),
+  //   {
+  //     manual: true,
+  //     onSuccess: () => {
+  //       message.success('审核成功');
+  //       setConVisible(false);
+  //       conAuditRun({ multi_status: '1,4', current: 1, page_size: 10 });
+  //     },
+  //     onError: () => {
+  //       message.success('审核失败');
+  //     },
+  //   },
+  // );
+
   //审核合同
   const { run: runOACheck } = useRequest(audit, {
     manual: true,