Merge branch 'master' into develop

src/components/DDComponents/DIYTable/index.tsx

@@ -212,7 +212,8 @@ function DIYTable(props: IProps) {
       for (let index = 0; index < rows.length; index++) {
         // 把每一行的数据提出来到一个对象里
         if (rows) {
-          const row = rows[index];
+          const row = typeof rows[index] === 'string' ? JSON.parse(rows[index]) : rows[index];
+
           if (index === 0) {
             // 列配置
             row.forEach((col: any) => {
@@ -250,7 +251,7 @@ function DIYTable(props: IProps) {
       if (displayOnly) {
         for (let index = 0; index < rows.length; index++) {
           // 把每一行的数据提出来到一个对象里
-          const row = rows[index];
+          const row = typeof rows[index] === 'string' ? JSON.parse(rows[index]) : rows[index];
           const rowData: any = {};
           if (displayOnly) {
             row.forEach((col: any) => {

src/components/DDComponents/ProjectField/index.js

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { Select } from 'antd';
-import { queryApproval } from '@/services/approval';
+import { queryProjectListUser } from '@/services/approval';
 
 function DDProjectField(props) {
   const { value, disabled = false, onChange } = props;
@@ -9,13 +9,11 @@ function DDProjectField(props) {
 
   const getProjectList = async () => {
     setLoading(true);
-    const res = await queryApproval({ pageSize: 9999 }).catch(err => {
-      console.log(err);
+    const res = await queryProjectListUser({ pageSize: 9999 }).catch(err => {
       setLoading(false);
     });
     if (res.code === 200) {
-      console.log(res.data.list);
-      setProjectList(res.data.list);
+      setProjectList(res.data);
       setLoading(false);
     }
   };
@@ -39,8 +37,8 @@ function DDProjectField(props) {
       }
       options={projectList.map(item => {
         return {
-          label: `${item.Name}(${item.Code})`,
-          value: item.ID,
+          label: `${item.project_name}(${item.project_full_code})`,
+          value: item.id,
         };
       })}
     />

src/pages/Detail/CommitAuditModal.js

@@ -137,7 +137,7 @@ function CommitAuditModal(props) {
     edges.filter(edge => edge.source.cell === currentId);
     const auditNodes = nodes.filter(node => {
       // ========为旧清单提供生成PSR的能力，后期舍弃=========
-      if (flag && (node.node_type_psr == 3 || node.node_type_psr == 4)) return true;
+      // if (flag && (node.node_type_psr == 3 || node.node_type_psr == 4)) return true;
       if (type && node.name !== type) {
         return false;
       }
@@ -336,6 +336,7 @@ function CommitAuditModal(props) {
       setFormComponentValues([]);
     });
     setAuditList(addAuditList);
+    if (prevFormData.length == 0) advanceSubmit();
     // advanceSubmit();
   };
 

src/pages/Detail/FormAndFilesNode.js

@@ -6,7 +6,7 @@ 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';
+import { queryProjectListUser } from '@/services/approval';
 
 const { confirm } = Modal;
 const { Panel } = Collapse;
@@ -17,11 +17,11 @@ const FormAndFilesNode = props => {
   const [projectList, setProjectList] = useState([]);
 
   const getProjectList = async () => {
-    const res = await queryApproval({ pageSize: 9999 }).catch(err => {
+    const res = await queryProjectListUser({ pageSize: 9999 }).catch(err => {
       console.log(err);
     });
     if (res.code === 200) {
-      setProjectList(res.data.list);
+      setProjectList(res.data);
     }
   };
 
@@ -79,14 +79,13 @@ const renderFrom = (data, projects) => {
               </Form.Item>
             );
           }
-
           let value = item.value.join(',');
           if (item.id.includes('ProjectField')) {
             if (value) {
               value = Number(value);
-              const project = projects.find(pitem => pitem.ID === value);
+              const project = projects.find(pitem => pitem.id === value);
               if (project) {
-                value = `${project.Name}(${project.Code})`;
+                value = `${project.project_name}(${project.project_full_code})`;
               }
             }
           }

src/pages/Detail/Index.js

@@ -723,7 +723,7 @@ function Detail(props) {
         templateId={templateId}
         onClose={() => setFlowVisible(false)}
         version={version}
-        onChangeVersion={version => changeVersion(version)}
+        onChangeVersion={version => changeVersion(version.id)}
       />
       <AuditModal
         loading={getLoading()}

src/utils/uploadExcelByUrl.js

@@ -5,7 +5,8 @@ window.moment = moment;
 
 const uploadExcelByUrl = (nodeType, versionId, project) => {
   const TEMPLATE_URL =
-    'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/public/bom/psr1010.xlsx';
+    'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/public/bom/psr1121-3.xlsx';
+  // 'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/public/bom/psr1010.xlsx';
   // 'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/public/bom/psr1009.xlsx';
   // 'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/public/bom/psr1008.xlsx';
   // 'https://gt-digitization.oss-cn-hangzhou.aliyuncs.com/public/bom/psr0913.xlsx';