浏览代码

oa审批优化

xjj 2 年之前
父节点
当前提交
0c2a2a96b9
共有 2 个文件被更改,包括 6 次插入2 次删除
  1. 4 1
      src/pages/Flow/OaDetail.js
  2. 2 1
      src/pages/Flow/components/ApprovalProcess.tsx

+ 4 - 1
src/pages/Flow/OaDetail.js

@@ -22,6 +22,9 @@ const OaDetail = () => {
   const navigate = useNavigate();
   const navigate = useNavigate();
   const { data, loading } = useRequest(queryProcessFlows, {
   const { data, loading } = useRequest(queryProcessFlows, {
     defaultParams: [{ ids: oaId }],
     defaultParams: [{ ids: oaId }],
+    onSuccess() {
+      advanceSubmit(null, {});
+    },
   });
   });
   // const { data: OSSData } = useRequest(queryOSSData, {
   // const { data: OSSData } = useRequest(queryOSSData, {
   //   defaultParams: [{ ids: oaId }],
   //   defaultParams: [{ ids: oaId }],
@@ -46,7 +49,7 @@ const OaDetail = () => {
   //填写表单实时计算审批流程
   //填写表单实时计算审批流程
   const advanceSubmit = async (changedFields, allValues) => {
   const advanceSubmit = async (changedFields, allValues) => {
     console.log(changedFields, allValues);
     console.log(changedFields, allValues);
-    let formValues = data.formData
+    let formValues = (data?.formData || [])
       .map((item) => {
       .map((item) => {
         const itemProps = item.props;
         const itemProps = item.props;
         let val = allValues[itemProps.id];
         let val = allValues[itemProps.id];

+ 2 - 1
src/pages/Flow/components/ApprovalProcess.tsx

@@ -102,7 +102,8 @@ const ApprovalProcess = (props: any) => {
             title={
             title={
               item[0]?.name ||
               item[0]?.name ||
               `从${
               `从${
-                roleList?.find((cur: any) => cur.ID == item[0]?.value)?.Name
+                roleList?.find((cur: any) => cur.ID == item[0]?.value)?.Name ||
+                '-'
               }选择`
               }选择`
             }
             }
           />
           />