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

src/pages/ContractManager/component/Modal.jsx

@@ -90,7 +90,7 @@ const ContractModal = (props) => {
 
   const { data: companyData, run: runCompany } = useRequest(queryCompany);
 
-  console.log(user);
+  console.log(user, data, depList);
 
   useEffect(() => {
     userListRun();
@@ -127,6 +127,7 @@ const ContractModal = (props) => {
   }, [user]);
 
   useEffect(() => {
+    if (type !== Type.add) return;
     const item = companyData?.find((item) => item.ID == company);
     if (item?.Flag == 1) {
       //公司为本部
@@ -249,13 +250,13 @@ const ContractModal = (props) => {
           values.dep_id = 0;
         }
         values.created_by = user?.ID;
-        handleOk(values);
+        handleOk(values, Type.add);
       } else if (type == Type.cancel) {
         let result = {
           id: data?.id,
           cancel_desc: values.cancel_desc,
         };
-        handleOk(result);
+        handleOk(result, Type.cancel);
       } else if (data?.status == Status.Checking) {
         let result = {
           id: data?.id,
@@ -264,7 +265,7 @@ const ContractModal = (props) => {
           is_pass: values.is_pass,
           check_desc: values?.check_desc,
         };
-        handleOk(result);
+        handleOk(result, data?.status);
       } else if (data?.status == Status.CalChecking) {
         let result = {
           id: data?.id,
@@ -273,7 +274,7 @@ const ContractModal = (props) => {
           is_pass: values.is_pass,
           // check_desc: values?.check_desc,
         };
-        handleOk(result);
+        handleOk(result, data?.status);
       }
     });
   };

src/pages/ContractManager/index.jsx

@@ -10,7 +10,7 @@ import {
   Modal,
 } from 'antd';
 import styles from './index.less';
-import ContractModal, { Type } from './component/Modal';
+import ContractModal, { Type, Status } from './component/Modal';
 import { PageContainer } from '@ant-design/pro-components';
 import { useRequest, useModel } from '@umijs/max';
 import { connect } from 'umi';
@@ -20,6 +20,7 @@ import {
   queryContract,
   queryContractCancel,
   queryContractCancelCheck,
+  queryContractCheck,
   queryContractDownload,
   queryGetContractList,
 } from '../../services/contract';
@@ -294,6 +295,24 @@ const ConteactManager = (props) => {
     },
   );
 
+  //审核合同
+  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 }],
@@ -344,12 +363,14 @@ const ConteactManager = (props) => {
     }
   };
 
-  const handleOk = (data) => {
-    if (typeRef.current == Type.add) {
+  const handleOk = (data, type) => {
+    if (type == Type.add) {
       editRun(data);
-    } else if (typeRef.current == Type.cancel) {
+    } else if (type == Type.cancel) {
       calRun(data);
-    } else {
+    } else if (type == Status.Checking) {
+      runCheck(data);
+    } else if (type == Status.CalChecking) {
       calCheckRun(data);
     }
   };

src/pages/Flow/AuditModal.js

@@ -4,7 +4,7 @@ import { Modal, Input, Form, Select } from 'antd';
 const flowTypeList = [
   { value: 1, label: '文档审批' },
   { value: 2, label: 'OA审批' },
-  { value: 3, label: '合同审批' },
+  { value: 3, label: '合同归档审批' },
 ];
 
 // 审批意见