2 anos atrás · 9e6e944a98
--- a/src/components/Flow/index.tsx
+++ b/src/components/Flow/index.tsx
@@ -147,12 +147,13 @@ export const Demo: React.FC<IProps> = (props) => {
 
				                 id: item.id,
			
 
				                 source: item.source,
			
 
				                 target: item.target,
			
 
				+                zIndex: 0,
			
 
				                 // attr: JSON.stringify(item.attrs),
			
 
				               };
			
 
				             });
			
 
				 
			
 
				-            console.log(simpleNodes);
			
 
				-            console.log(JSON.stringify(data));
			
 
				+            // console.log(simpleNodes);
			
 
				+            // console.log(JSON.stringify(data));
			
 
				             cb?.(JSON.stringify(data), JSON.stringify(simpleNodes));
			
 
				             return data;
			
 
				           },
			
--- a/src/components/Flow/node/judgeNode/index.tsx
+++ b/src/components/Flow/node/judgeNode/index.tsx
@@ -22,7 +22,7 @@ const JudgeRect = (props: any) => {
 
				       let name = '';
			
 
				       for (let i = 0; i < data.length; i++) {
			
 
				         let item = data[i];
			
 
				-        if (item.ID == id) {
			
 
				+        if (item.id == id) {
			
 
				           return item.title;
			
 
				         } else if (item.children?.length > 0) {
			
 
				           let title: any = getName(id, item.children);
			
@@ -41,7 +41,7 @@ const JudgeRect = (props: any) => {
 
				           case ComponentName.Inner:
			
 
				             const list = judge?.values
			
 
				               ?.map((item) => {
			
 
				-                return getName(item.value, depUserTree);
			
 
				+                return getName(item.origin, depUserTree);
			
 
				               })
			
 
				               .filter((item) => item);
			
 
				             text.push('发起人属于:' + list?.join('或'));
			
@@ -100,8 +100,9 @@ const JudgeRect = (props: any) => {
 
				       <div
			
 
				         style={{
			
 
				           height: `${height - 32}px`,
			
 
				-          overflow: 'hidden',
			
 
				-          textOverflow: 'ellipsis',
			
 
				+          // overflow: 'hidden',
			
 
				+          // textOverflow: 'ellipsis',
			
 
				+          // whiteSpace: 'nowrap',
			
 
				           fontSize,
			
 
				         }}
			
 
				       >
			
--- a/src/pages/ContractManager/component/Modal.jsx
+++ b/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 }}
			
 
				         >
			
@@ -672,12 +678,16 @@ const ContractModal = (props) => {
 
				               label="合同及合同附件上传："
			
 
				               tooltip="请上传合同正式盖章文本的扫描件（含技术协议、质保承诺等附件），不得用照片、图片格式，不得遗漏附件"
			
 
				               name="attach"
			
 
				-              rules={[
			
 
				-                {
			
 
				-                  required: true,
			
 
				-                  message: '请上传合同及合同相关附件',
			
 
				-                },
			
 
				-              ]}
			
 
				+              rules={
			
 
				+                disableds.contract
			
 
				+                  ? []
			
 
				+                  : [
			
 
				+                      {
			
 
				+                        required: true,
			
 
				+                        message: '请上传合同及合同相关附件',
			
 
				+                      },
			
 
				+                    ]
			
 
				+              }
			
 
				             >
			
 
				               {type == Type.add ? (
			
 
				                 <Upload {...UploadProps}>
			
@@ -717,13 +727,22 @@ const ContractModal = (props) => {
 
				           <Col span={10}>
			
 
				             <Form.Item
			
 
				               label="合同相关资料上传："
			
 
				-              tooltip="依据《合同管理办法》，合同相关资料需要作为合同电子档案的一部分，包括：
			
 
				-              1）合同会审纪要或投资决策通知书（如有）；
			
 
				-              2）合同相对方的营业执照等资质证的复印件（首次签约的须加盖公章）、个人身份证复印件（合同一方为自然人时提供）；
			
 
				-              3）合同相对方经办人员的授权委托书原件及其身份证复印件（如有）；
			
 
				-              4） 涉及房屋或场地租赁的，还应提供房屋及场地的权属证明资料，但如果续签租赁合同，且房屋所有权人没有发生变更的，在附具相关说明后可不再提供上述资料；
			
 
				-              5）其他资料。
			
 
				-              "
			
 
				+              tooltip={
			
 
				+                <div>
			
 
				+                  依据《合同管理办法》，合同相关资料需要作为合同电子档案的一部分，包括：
			
 
				+                  <br />
			
 
				+                  1）合同会审纪要或投资决策通知书（如有）；
			
 
				+                  <br />
			
 
				+                  2）合同相对方的营业执照等资质证的复印件（首次签约的须加盖公章）、个人身份证复印件（合同一方为自然人时提供）；
			
 
				+                  <br />
			
 
				+                  3）合同相对方经办人员的授权委托书原件及其身份证复印件（如有）；
			
 
				+                  <br />
			
 
				+                  4）
			
 
				+                  涉及房屋或场地租赁的，还应提供房屋及场地的权属证明资料，但如果续签租赁合同，且房屋所有权人没有发生变更的，在附具相关说明后可不再提供上述资料；
			
 
				+                  <br />
			
 
				+                  5）其他资料。
			
 
				+                </div>
			
 
				+              }
			
 
				             >
			
 
				               {type == Type.add ? (
			
 
				                 <Upload {...UploadPropsExtend}>
			
@@ -734,10 +753,10 @@ const ContractModal = (props) => {
 
				                   {data?.attach_extend &&
			
 
				                     JSON.parse(data?.attach_extend)?.map((item, idx) => (
			
 
				                       <li key={`${idx}_${item.name}`}>
			
 
				-                        <Space>
			
 
				+                        {/* <Space>
			
 
				                           {item.name} <span>预览</span>{' '}
			
 
				                           <a href={item.url}>下载</a>
			
 
				-                        </Space>
			
 
				+                        </Space> */}
			
 
				                       </li>
			
 
				                     ))}
			
 
				                 </ul>
			
@@ -861,6 +880,12 @@ const ContractModal = (props) => {
 
				               label="作废原因："
			
 
				               initialValue={data?.cancel_desc}
			
 
				               labelCol={{ span: 4 }}
			
 
				+              rules={[
			
 
				+                {
			
 
				+                  required: true,
			
 
				+                  message: '请填写作废原因',
			
 
				+                },
			
 
				+              ]}
			
 
				             >
			
 
				               <Input disabled={type != Type.cancel} />
			
 
				             </Form.Item>
			
--- a/src/pages/ContractManager/index.jsx
+++ b/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',
			
@@ -233,9 +254,10 @@ const ConteactManager = (props) => {
 
				   const { run: editRun } = useRequest((data) => queryContract(data), {
			
 
				     manual: true,
			
 
				     onSuccess: () => {
			
 
				-      message.success('添加成功');
			
 
				+      // message.success('添加成功');
			
 
				       setVisible(false);
			
 
				       run(searchData);
			
 
				+      modal.info(config);
			
 
				     },
			
 
				     onError: () => {
			
 
				       message.success('添加失败');
			
@@ -443,6 +465,7 @@ const ConteactManager = (props) => {
 
				           setFileViewerVisible(false);
			
 
				         }}
			
 
				       />
			
 
				+      {contextHolder}
			
 
				     </PageContent>
			
 
				   );
			
 
				 };
			
--- a/src/pages/Flow/OaDetail.js
+++ b/src/pages/Flow/OaDetail.js
@@ -1,5 +1,5 @@
 
				 import React, { useRef, useState } from 'react';
			
 
				-import { Button, Col, Empty, Row, message } from 'antd';
			
 
				+import { Button, Col, Empty, Form, Row, message } from 'antd';
			
 
				 import ApprovalProcess from './components/ApprovalProcess';
			
 
				 import AuditDetailed from './components/AuditDetailed';
			
 
				 import PageContent from '@/components/PageContent';
			
@@ -14,6 +14,7 @@ import {
 
				 import { useParams, useRequest, useNavigate } from 'umi';
			
 
				 
			
 
				 const OaDetail = () => {
			
 
				+  const [form] = Form.useForm();
			
 
				   const [approvalProcess, setApprovalProcess] = useState([]);
			
 
				   const { oaId } = useParams();
			
 
				   const formValueRef = useRef({
			
@@ -86,30 +87,32 @@ const OaDetail = () => {
 
				   };
			
 
				 
			
 
				   const submit = () => {
			
 
				-    const { form } = formValueRef.current;
			
 
				-    let audit_list = [];
			
 
				-    approvalProcess?.forEach((item) => {
			
 
				-      if (item[0].type == 'role') audit_list.push(item[0].nowValue);
			
 
				-      else if (item[0].type == 'leader')
			
 
				-        audit_list.push(
			
 
				-          ...leaderData.slice(0, item[0].value).map((leader) => leader.ID),
			
 
				-        );
			
 
				-      else audit_list.push(item[0].value);
			
 
				-    });
			
 
				-    let files = [],
			
 
				-      formData = [];
			
 
				-    form.forEach((item) => {
			
 
				-      if (item.type == 'DDAttachment') {
			
 
				-        files = files.concat(item.value);
			
 
				-      } else {
			
 
				-        formData.push(item);
			
 
				-      }
			
 
				-    });
			
 
				-    createRun({
			
 
				-      flow_id: Number(oaId),
			
 
				-      form: JSON.stringify(formData),
			
 
				-      audit_list,
			
 
				-      files: files.join(','),
			
 
				+    form.validateFields().then((values) => {
			
 
				+      const { form: formCur } = formValueRef.current;
			
 
				+      let audit_list = [];
			
 
				+      approvalProcess?.forEach((item) => {
			
 
				+        if (item[0].type == 'role') audit_list.push(item[0].nowValue);
			
 
				+        else if (item[0].type == 'leader')
			
 
				+          audit_list.push(
			
 
				+            ...leaderData.slice(0, item[0].value).map((leader) => leader.ID),
			
 
				+          );
			
 
				+        else audit_list.push(item[0].value);
			
 
				+      });
			
 
				+      let files = [],
			
 
				+        formData = [];
			
 
				+      formCur.forEach((item) => {
			
 
				+        if (item.type == 'DDAttachment') {
			
 
				+          files = files.concat(item.value);
			
 
				+        } else {
			
 
				+          formData.push(item);
			
 
				+        }
			
 
				+      });
			
 
				+      createRun({
			
 
				+        flow_id: Number(oaId),
			
 
				+        form: JSON.stringify(formData),
			
 
				+        audit_list,
			
 
				+        files: files.join(','),
			
 
				+      });
			
 
				     });
			
 
				   };
			
 
				   // const OnModelFileDone = (file) => {
			
@@ -138,6 +141,7 @@ const OaDetail = () => {
 
				               />
			
 
				             )} */}
			
 
				           <AuditDetailed
			
 
				+            form={form}
			
 
				             items={data?.formData}
			
 
				             onValuesChange={advanceSubmit}
			
 
				           />
			
--- a/src/pages/Flow/components/AuditDetailed.js
+++ b/src/pages/Flow/components/AuditDetailed.js
@@ -3,8 +3,8 @@ import React, { useMemo, useState } from 'react';
 
				 import { Button, Form } from 'antd';
			
 
				 
			
 
				 const AuditDetailed = (props) => {
			
 
				-  const [form] = Form.useForm();
			
 
				-  const { items, onValuesChange } = props;
			
 
				+  // const [form] = Form.useForm();
			
 
				+  const { items, form, onValuesChange } = props;
			
 
				 
			
 
				   const behavior = useMemo(() => {
			
 
				     let data = {};