修改合同管理

src/pages/ContractManager/component/Modal.jsx

@@ -90,6 +90,8 @@ const ContractModal = (props) => {
 
   const { data: companyData, run: runCompany } = useRequest(queryCompany);
 
+  console.log(user);
+
   useEffect(() => {
     userListRun();
     depListRun();
@@ -105,7 +107,8 @@ const ContractModal = (props) => {
     defaultParams: [
       {
         project_id: 1,
-        is_super: true,
+        is_super: user?.IsSuper,
+        created_by: user?.CName,
       },
     ],
     formatResult: (res) => {
@@ -524,6 +527,7 @@ const ContractModal = (props) => {
             <Form.Item
               name="party_a"
               label="甲方："
+              tooltip="合同主体可以下拉选择，可选项需要经办人在“主页--供应商管理”中创建。经办人可以维护和更新供应商信息。"
               initialValue={data?.party_a}
               rules={[
                 {
@@ -611,6 +615,7 @@ const ContractModal = (props) => {
             <Form.Item
               name="party_b"
               label="乙方："
+              tooltip="合同主体可以下拉选择，可选项需要经办人在“主页--供应商管理”中创建。经办人可以维护和更新供应商信息。"
               initialValue={data?.party_b}
               rules={[
                 {
@@ -639,6 +644,7 @@ const ContractModal = (props) => {
         <Form.Item
           name="party_c"
           label="丙方（及其他）："
+          tooltip="可多选。合同主体可以下拉选择，可选项需要经办人在“主页--供应商管理”中创建。经办人可以维护和更新供应商信息。"
           initialValue={data?.party_c ? data?.party_c.split(',') : []}
           labelCol={{ span: 4 }}
         >
@@ -865,6 +871,12 @@ const ContractModal = (props) => {
               label="作废原因："
               initialValue={data?.cancel_desc}
               labelCol={{ span: 4 }}
+              rules={[
+                {
+                  required: true,
+                  message: '请填写作废原因',
+                },
+              ]}
             >
               <Input disabled={type != Type.cancel} />
             </Form.Item>

src/pages/ContractManager/index.jsx

@@ -1,5 +1,14 @@
 import React, { useState, useRef, useEffect } from 'react';
-import { Button, DatePicker, Input, Select, Space, Table, message } from 'antd';
+import {
+  Button,
+  DatePicker,
+  Input,
+  Select,
+  Space,
+  Table,
+  message,
+  Modal,
+} from 'antd';
 import styles from './index.less';
 import ContractModal, { Type } from './component/Modal';
 import { PageContainer } from '@ant-design/pro-components';
@@ -41,6 +50,7 @@ const ConteactManager = (props) => {
   const parentIdRef = useRef(0);
   const [fileViewerVisible, setFileViewerVisible] = useState(false);
   const [fileViewerData, setFileViewerData] = useState();
+  const [modal, contextHolder] = Modal.useModal();
 
   const showBtn = (record, type) => {
     let bool = false;
@@ -196,21 +206,32 @@ const ConteactManager = (props) => {
                 增补
               </a>
             )} */}
-            <a
-              onClick={() => {
-                typeRef.current = Type.cancel;
-                setDetail(record);
-                setVisible(true);
-              }}
-            >
-              作废
-            </a>
+            {record.status == 3 && (
+              <a
+                onClick={() => {
+                  typeRef.current = Type.cancel;
+                  setDetail(record);
+                  setVisible(true);
+                }}
+              >
+                作废
+              </a>
+            )}
           </Space>
         );
       },
     },
   ];
 
+  const config = {
+    title: '提示！',
+    content: (
+      <>
+        将合同（含附件）的原件和相关资料交给集团档案管理部门或分子公司合同专员才能完成合同存档，请注意及时存档。
+      </>
+    ),
+  };
+
   useEffect(() => {
     dispatch({
       type: 'user/fetch',
@@ -234,8 +255,10 @@ const ConteactManager = (props) => {
     manual: true,
     onSuccess: () => {
       message.success('添加成功');
+
       setVisible(false);
       run(searchData);
+      // modal.confirm(config);
     },
     onError: () => {
       message.success('添加失败');