Merge branch 'master' into develop

# Conflicts:
#	src/pages/Auth/Auth.js
#	src/pages/Auth/Submit.js
#	src/pages/List/List.js

src/pages/Auth/Auth.js

@@ -57,21 +57,20 @@ function Auth(props) {
     let version = {};
     if (item.type == 'checked') {
       version = checkedVersionList.find(v => v.id == item.id);
+      localStorage.excelItem = JSON.stringify(version);
+      router.push(`/home/detail/${item.project_id}/${item.template_id}`);
     } else {
-      version = authVersionList.find(v => v.id == item.id);
+      //调用接口获取version信息
+      dispatch({
+        type: 'auth/queryVersionByNode',
+        payload: { template_node_id: item.node_id },
+        callback: checkedVersionList => {
+          let version = checkedVersionList.find(v => v.id == item.id) || {};
+          localStorage.excelItem = JSON.stringify(version);
+          router.push(`/home/detail/${item.project_id}/${item.template_id}`);
+        },
+      });
     }
-    localStorage.excelItem = JSON.stringify(version);
-    router.push(`/home/detail/${item.project_id}/${item.template_id}`);
-    //调用接口获取version信息
-    // dispatch({
-    //   type: 'auth/queryVersionByNode',
-    //   payload: { template_node_id: item.node_id },
-    //   callback: checkedVersionList => {
-    //     let version = checkedVersionList.find(v => v.id == item.id) || {};
-    //     localStorage.excelItem = JSON.stringify(version);
-    //     router.push(`/home/detail/${item.project_id}/${item.template_id}`);
-    //   },
-    // });
   };
 
   const renderUnauth = data => (

src/pages/Auth/Submit.js

@@ -7,7 +7,7 @@ import { querySubmitList } from '@/services/bomAuth';
 const { Panel } = Collapse;
 
 function Auth(props) {
-  const { dispatch, typeOptions, currentUser,project } = props;
+  const { dispatch, typeOptions, currentUser, project } = props;
   const [loading, setLoading] = useState(false);
   const [data, setData] = useState({
     list: [],
@@ -49,31 +49,32 @@ function Auth(props) {
       render: item => typeOptions.find(cur => cur.id == item.classify_id)?.name,
     },
     {
-      title: '状态',
+      title: '待审批人',
       width: '15%',
-      render: item => {
-        let style = { color: getColor(item.audit_status) };
-        let txt = '';
-        switch (item.audit_status) {
-          case 0:
-            txt = '未提交';
-            break;
-          case 1:
-            txt = '待审批';
-            break;
-          case 2:
-            txt = '已拒绝';
-            break;
-          case 3:
-            txt = '已通过';
-            break;
-          case 4:
-            txt = '已提交';
-            break;
-        }
-        if (item.status == 1) txt = '已失效';
-        return <span style={style}>{txt}</span>;
-      },
+      dataIndex: 'audit_comment',
+      // render: item => {
+      //   let style = { color: getColor(item.audit_status) };
+      //   let txt = '';
+      //   switch (item.audit_status) {
+      //     case 0:
+      //       txt = '未提交';
+      //       break;
+      //     case 1:
+      //       txt = '待审批';
+      //       break;
+      //     case 2:
+      //       txt = '已拒绝';
+      //       break;
+      //     case 3:
+      //       txt = '已通过';
+      //       break;
+      //     case 4:
+      //       txt = '已提交';
+      //       break;
+      //   }
+      //   if (item.status == 1) txt = '已失效';
+      //   return <span style={style}>{txt}</span>;
+      // },
     },
     {
       title: '操作',
@@ -90,9 +91,15 @@ function Auth(props) {
     //调用接口获取version信息
     dispatch({
       type: 'auth/queryVersionByNode',
-      payload: { template_node_id: item.node_id },
+      payload: { template_node_id: item.TemplateNodeInfo.Id },
       callback: versionList => {
-        let version = versionList.find(v => v.id == item.id) || {};
+        let version;
+        let parentVersion = versionList.find(v => v.id == item.version_id);
+        if (parentVersion && parentVersion.children) {
+          version = parentVersion.children.find(v => v.id == item.id);
+        } else {
+          version = versionList.find(v => v.id == item.id);
+        }
         localStorage.excelItem = JSON.stringify(version);
         router.push(`/home/detail/${item.project_id}/${item.template_id}`);
       },

src/pages/List/List.js

@@ -50,6 +50,7 @@ function List(props) {
     },
     {
       title: '操作',
+      width: 280,
       render: record => (
         <>
           <a
@@ -95,7 +96,7 @@ function List(props) {
               setVersionVisible(true);
             }}
           >
-            最新清单
+            当前节点清单
           </a>
         </>
       ),
@@ -107,6 +108,7 @@ function List(props) {
       type: 'list/queryProjectRecord',
       payload: {
         ...filter,
+        pageSize: 20,
         currentPage: filter.current,
       },
     });

src/utils/request.js

@@ -7,6 +7,9 @@ import { isAntdPro, getToken, GetTokenFromUrl } from './utils';
 // var apiUrl = "http://oraysmart.com:8888"
 // var apiUrl = "http://120.55.44.4:8900"
 
+//节流阀
+let flag = false;
+let tokenFlag = false;
 const checkStatus = response => {
   if (response.status >= 200 && response.status < 300) {
     return response;
@@ -169,13 +172,23 @@ export default function request(url, option, jwt) {
         return response;
       } else if (code !== 200) {
         if (code === 401 || code === 601 || code === 602) {
+          if (tokenFlag) return false;
           // 用户token出错，重定向
+          tokenFlag = true;
+          setTimeout(() => {
+            tokenFlag = false;
+          }, 3000);
           notification.error({
             message: '错误',
             description: 'token失效，请重新登录',
           });
           router.push(`/login?referrer=${encodeURIComponent(encodeURIComponent(location.href))}`);
         } else {
+          if (flag) return false;
+          flag = true;
+          setTimeout(() => {
+            flag = false;
+          }, 3000);
           message.error(response.msg);
         }
         return false;
@@ -187,6 +200,12 @@ export default function request(url, option, jwt) {
       const status = e?.name;
       // environment should not be used
       if (status === 401 || status === 601 || status === 602 || status === 400) {
+        if (tokenFlag) return false;
+        // 用户token出错，重定向
+        tokenFlag = true;
+        setTimeout(() => {
+          tokenFlag = false;
+        }, 3000);
         // 用户token出错，重定向
         notification.error({
           message: '错误',