Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb

merge
# Conflicts:
#	src/pages/ContractManager/component/Modal.jsx
#	src/pages/ContractManager/index.jsx
#	src/pages/Flow/AuditModal.js

src/pages/ContractManager/component/Modal.jsx

@@ -294,6 +294,23 @@ const ContractModal = (props) => {
     return fun(depList);
   };
 
+  const projectNameList = useMemo(() => {
+    let arr =
+      projectList?.map((item) => {
+        return {
+          value: item.project_name,
+          label: item.project_name,
+        };
+      }) || [];
+    return [
+      {
+        label: '日常项目',
+        value: '日常项目',
+      },
+      ...arr,
+    ];
+  }, [projectList]);
+
   return (
     <Modal
       width={'85%'}

src/pages/ContractManager/index.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useRef, useEffect } from 'react';
+import React, { useState, useRef, useEffect, useMemo } from 'react';
 import {
   Button,
   DatePicker,
@@ -402,12 +402,7 @@ const ConteactManager = (props) => {
                 project_name: e,
               });
             }}
-            options={projectData?.list?.map((item) => {
-              return {
-                value: item.project_name,
-                label: item.project_name,
-              };
-            })}
+            options={projectNameList}
           />
         </div>
         <div className={styles.itemFlex}>

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: '合同审批' },
 ];
 
 // 审批意见