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

src/components/DDComponents/ProjectField/index.js

@@ -33,7 +33,7 @@ function DDProjectField(props) {
       onChange={val => {
         console.log(val);
         const project = projectList.find(item => item.id === val);
-        onChange(`${project.project_name}(${project.project_full_code})`);
+        onChange(`${val}`);
       }}
       filterOption={(input, option) =>
         (option?.label ?? '').toLowerCase().includes(input.toLowerCase())

src/pages/Detail/CommitAuditModal.js

@@ -746,19 +746,24 @@ function CommitAuditModal(props) {
         params.flow_path = flowPath;
         params.form_list = formList; //创建钉钉表单所需数据
       }
+
       if (!hasFlowId) {
         message.error('当前存在审批节点未绑定审批流程!请联系管理员。');
         return;
       }
+
       await querySaveBomForm({
         project_id: version.project_id,
         node_id: version.template_node_id,
         json: JSON.stringify({ approvalProcess, formList }),
       });
+
       params.audit_series = uuidv4();
+
       if (version.audit_status == 5) {
         params.audit_status = version.audit_status;
       }
+
       params.files = uploadList.current.join(',');
       onSubmitNextNode(params);
     } catch (error) {

src/pages/Detail/FormAndFilesNode.js

@@ -1,11 +1,12 @@
 import { Card, Col, Input, Row, Modal, Empty, Collapse } from 'antd';
 import { Form } from '@ant-design/compatible';
 import { useForm } from 'antd/lib/form/Form';
-import React, { useMemo, useState } from 'react';
+import React, { useMemo, useState, useEffect } from 'react';
 import { connect } from 'dva';
 import CommentContent from '@/components/CommentContent';
 import AttachmentTable from '@/components/AttachmentTable';
 import DIYTable from '@/components/DDComponents/DIYTable';
+import { queryApproval } from '@/services/approval';
 
 const { confirm } = Modal;
 const { Panel } = Collapse;
@@ -13,8 +14,23 @@ const { Panel } = Collapse;
 const FormAndFilesNode = props => {
   const { formData, excelFileList, comment, version, loading } = props;
 
+  const [projectList, setProjectList] = useState([]);
+
+  const getProjectList = async () => {
+    const res = await queryApproval({ pageSize: 9999 }).catch(err => {
+      console.log(err);
+    });
+    if (res.code === 200) {
+      setProjectList(res.data.list);
+    }
+  };
+
+  useEffect(() => {
+    getProjectList();
+  }, []);
+
   const FormContent = useMemo(() => {
-    return renderFrom(formData);
+    return renderFrom(formData, projectList);
   }, [formData]);
 
   if (formData) {
@@ -41,7 +57,7 @@ const FormAndFilesNode = props => {
   return null;
 };
 
-const renderFrom = data => {
+const renderFrom = (data, projects) => {
   if (!data) return <Empty description="没有表单信息" />;
   try {
     const ding_schema = JSON.parse(data)[0];
@@ -68,7 +84,14 @@ const renderFrom = data => {
             );
           }
 
-          const value = item.value.join(',');
+          let value = item.value.join(',');
+          if (item.id.includes('ProjectField')) {
+            if (value) {
+              value = Number(value);
+              const project = projects.find(item => item.id === value);
+              value = `${project.project_name}(${project.project_full_code})`;
+            }
+          }
           return (
             <Form.Item
               key={`FormAndFilesNode_${item.id}`}