Merge branch 'develop' of xujunjie/BomWeb into master

src/pages/Detail/AuditModal.js

@@ -15,14 +15,16 @@ function AuditModal(props) {
   };
   useEffect(() => {
     if (visible) {
-      const comment = sheetRef.current.getComment();
-      console.log(comment);
-      let str = '';
-      comment.forEach(item => {
-        let col = String.fromCharCode(item.c + 65);
-        str += `单元格${col}${item.r}：${item.value}\n`;
-      });
-      form.setFieldsValue({ audit_comment: str });
+      try {
+        const comment = sheetRef.current.getComment();
+        console.log(comment);
+        let str = '';
+        comment.forEach(item => {
+          let col = String.fromCharCode(item.c + 65);
+          str += `单元格${col}${item.r}：${item.value}\n`;
+        });
+        form.setFieldsValue({ audit_comment: str });
+      } catch (error) {}
     }
   }, [visible]);
 

src/pages/Detail/FlowModal.js

@@ -181,10 +181,10 @@ function FlowModal(props) {
     }
     let dataList = list.map(template_node_id => {
       let itemDataList = data.filter(item => item.template_node_id == template_node_id);
-      let curid = 3;
+      let curid = 0;
       let status = 'process';
       itemDataList.forEach(item => {
-        if (item.audit_status != 3 && item.node_id <= curid) curid = item.node_id - 1;
+        if (item.audit_status == 3) curid++;
         if (item.audit_status == 2) status = 'error';
       });
       let curNode = flowDetail.nodes.find(item => item.Id == itemDataList[0].template_node_id);