Squashed commit of the following:

merge dev
commit 3e0df3efd9afb3abb24ddf1f1ee4989aca02437e
Author: Renxy <18510891294@163.com>
Date:   Tue Jul 4 17:43:25 2023 +0800

    Squashed commit of the following:
    merge dev
    commit 3719c1ec1c0a5c00056806fafb3983a10be370b7
    Author: Renxy <18510891294@163.com>
    Date:   Tue Jul 4 17:37:45 2023 +0800

        update

    commit d527e2d6b0c15a07514bef21d7cef500ab4d47a2
    Author: Renxy <18510891294@163.com>
    Date:   Tue Jul 4 17:31:01 2023 +0800

        修改统一用47

src/pages/ContractManager/component/AuditSteps.jsx

@@ -1,4 +1,4 @@
-import { Steps } from 'antd';
+import { Steps, Tooltip } from 'antd';
 const AuditSteps = (props) => {
   // const data =
   //   '[{"id":13,"desc":"","auditor":7,"AuditorUser":{"UserName":"admin","CName":"管理员","Title":"","Mobile":"13426370450","Email":"123123@qq.com","Status":1,"IsSuper":true,"DepId":"undefined","Dep":null,"Password":"4297f44b13955235245b2497399d7a93","QyWxUserId":"HanTangHeYing","DingUserId":"","Role":null,"RoleNames":"","ID":7,"CreatedBy":0,"CreatedOn":"2019-10-04T16:48:04+08:00","UpdatedBy":0,"UpdatedOn":"2022-06-17T14:23:15+08:00","DeletedBy":0,"DeletedOn":null,"DeletedFlag":0,"DefaultProject":"","ForbiddenModule":0,"IsDepLeader":0,"UserType":0,"Permission":null,"Permissions":null,"is_leader":0,"is_accountant":0,"is_opt_mgr":0,"is_wty_mgr":0},"seq":1,"oa_id":7,"seq_name":"审批1","audit_time":"1970-01-01T08:00:00+08:00"},{"id":14,"desc":"","auditor":7,"AuditorUser":{"UserName":"admin","CName":"管理员","Title":"","Mobile":"13426370450","Email":"123123@qq.com","Status":1,"IsSuper":true,"DepId":"undefined","Dep":null,"Password":"4297f44b13955235245b2497399d7a93","QyWxUserId":"HanTangHeYing","DingUserId":"","Role":null,"RoleNames":"","ID":7,"CreatedBy":0,"CreatedOn":"2019-10-04T16:48:04+08:00","UpdatedBy":0,"UpdatedOn":"2022-06-17T14:23:15+08:00","DeletedBy":0,"DeletedOn":null,"DeletedFlag":0,"DefaultProject":"","ForbiddenModule":0,"IsDepLeader":0,"UserType":0,"Permission":null,"Permissions":null,"is_leader":0,"is_accountant":0,"is_opt_mgr":0,"is_wty_mgr":0},"seq":2,"oa_id":7,"seq_name":"审批2","audit_time":"1970-01-01T08:00:00+08:00"}]';

src/pages/ContractManager/component/Modal.jsx

@@ -61,8 +61,6 @@ export const Status = {
   CalCheckSuccess: 6,
 };
 
-let isInLine = location.host.includes('work.greentech.com');
-
 const ContractModal = (props) => {
   const [form] = Form.useForm();
   const { initialState } = useModel('@@initialState');
@@ -118,63 +116,36 @@ const ContractModal = (props) => {
   const parent_code = Form.useWatch('parent_code', form);
 
   //审批流拼接
-  const formData = isInLine
-    ? [
-        {
-          name: '是否本部',
-          id: 'DDSelectField_4ad8bda8-60ce-428b-88a3-bf1a18c24a50',
-          type: 'DDSelectField',
-          value: ['是'],
-        },
-        {
-          name: '合同归档部门',
-          id: 'DDSelectField_3b661423-9fb8-4498-9eda-bcadf2d98473',
-          type: 'DDSelectField',
-          value: ['财务部'],
-        },
-        {
-          name: '合同编码',
-          id: 'TextField_f73531d8-c2c0-4769-a8ef-68b2eae2dc3a',
-          type: 'TextField',
-          value: ['1'],
-        },
-        {
-          name: '提审类型',
-          id: 'DDSelectField_bed77d5f-d02c-4f1d-98bf-0638245a3331',
-          type: 'DDSelectField',
-          value: ['1'],
-        },
-      ]
-    : [
-        {
-          name: '是否本部',
-          id: 'DDSelectField_4fbddb04-9b4f-4281-991b-5047f835fb9d',
-          type: 'DDSelectField',
-          value: ['是'],
-        },
-        {
-          name: '合同归档部门',
-          id: 'DDSelectField_1235c6b9-9d74-4856-a62d-6ca1bb9716a6',
-          type: 'DDSelectField',
-          value: ['财务部'],
-        },
-        {
-          name: '合同编码',
-          id: 'TextField_1a01000b-4458-4dfb-bd13-74a74e7a33e5',
-          type: 'TextField',
-          value: ['1'],
-        },
-        {
-          name: '提审类型',
-          id: 'DDSelectField_c79e124c-c933-4ea1-b799-faceaf830a9b',
-          type: 'DDSelectField',
-          value: ['1'],
-        },
-      ];
+  const formData = [
+    {
+      name: '是否本部',
+      id: 'DDSelectField_4ad8bda8-60ce-428b-88a3-bf1a18c24a50',
+      type: 'DDSelectField',
+      value: ['是'],
+    },
+    {
+      name: '合同归档部门',
+      id: 'DDSelectField_3b661423-9fb8-4498-9eda-bcadf2d98473',
+      type: 'DDSelectField',
+      value: ['财务部'],
+    },
+    {
+      name: '合同编码',
+      id: 'TextField_f73531d8-c2c0-4769-a8ef-68b2eae2dc3a',
+      type: 'TextField',
+      value: ['1'],
+    },
+    {
+      name: '提审类型',
+      id: 'DDSelectField_bed77d5f-d02c-4f1d-98bf-0638245a3331',
+      type: 'DDSelectField',
+      value: ['1'],
+    },
+  ];
 
   //计算审批流数据
   const advance = {
-    flow_id: isInLine ? 47 : 40,
+    flow_id: 47,
     form_list: null,
     formComponentValues: '',
   };

src/pages/ContractManager/index.jsx

@@ -312,7 +312,7 @@ const ConteactManager = (props) => {
 
   //发起OA审批
   const { run: createRun } = useRequest(
-    (data) => createAduit({ ...data, flow_id: 40, cc_list: [], files: '' }),
+    (data) => createAduit({ ...data, flow_id: 47, cc_list: [], files: '' }),
     {
       manual: true,
     },