Squashed commit of the following:

merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date:   Wed Jul 27 10:04:01 2022 +0800

    查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date:   Tue Jul 26 18:08:24 2022 +0800

    修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date:   Tue Jul 26 16:13:37 2022 +0800

    bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date:   Mon Jul 25 14:22:22 2022 +0800

    merge develop

# Conflicts:
#	src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js

src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js

@@ -52,50 +52,45 @@ function FlowModal(props) {
     if (!id) return;
     let node = graphData.nodes.find(item => item.id == id);
     setNodeLoading(true);
+    let node_type = node.name == "custom-rect" ? 0 : 1;
     try {
-      res = await queryVserionByNode({ template_node_id: node.Id });
+      res = await queryVserionByNode({ template_node_id: node.Id, node_type });
       let data = [];
-      Object.values(res.data.excel_version).map(arr => {
+      res.data.excel_version_tree.map(arr => {
         if (res.data.flow_id) {
-          data = [...data, {...arr[0], flow_id:res.data.flow_id}];
-          console.log(data)
+          data = [...data, {...arr, flow_id:res.data.flow_id}];
         } else {
-          data = [...data, ...arr];
+          data = [...data, arr];
         }
       });
       
-      const nameSet = new Set();
       data.forEach((item, id)=>{
         //解决key报错问题
         data[id].key=`${id}-${item.name}`;
-        nameSet.add(item.version_name);
+        item.isParent = true;
       })
 
-
-      const getDataParent = () => {
-
-      }
-      let dataNew = [...nameSet].map(name=>{
-        let list = data.filter(item=>item.version_name == name)
-        if(list.length == 1) {
-          return list[0]
-        }else if(list.filter(item=>!item.version_no).length > 0) {
-          return list.filter(item=>!item.version_no)[0]
-        }else {
-          return list.reduce((a, b)=> a.version_no > b.version_no ? b : a)
-        }
-      })
-      // let dataNew = data.filter(item=>!item.version_no);
-      dataNew.forEach(item=>{
-        let curItem = data.find(node => node.version_name == item.version_name && node.version_id != item.version_id)
-        if(curItem) {
-          curItem.isChild = true;
-          item.children = [curItem]
-        };
-      })
-      console.log("dataNew============" ,dataNew)
-      setData(dataNew);
-      // setData(data);
+      // let dataNew = [...nameSet].map(name=>{
+      //   let list = data.filter(item=>item.version_name == name)
+      //   if(list.length == 1) {
+      //     return list[0]
+      //   }else if(list.filter(item=>!item.version_no).length > 0) {
+      //     return list.filter(item=>!item.version_no)[0]
+      //   }else {
+      //     return list.reduce((a, b)=> a.version_no > b.version_no ? b : a)
+      //   }
+      // })
+      // // let dataNew = data.filter(item=>!item.version_no);
+      // dataNew.forEach(item=>{
+      //   let curItem = data.find(node => node.version_name == item.version_name && node.version_id != item.version_id)
+      //   if(curItem) {
+      //     curItem.isChild = true;
+      //     item.children = [curItem]
+      //   };
+      // })
+      console.log("dataNew============" ,data)
+      // setData(dataNew);
+      setData(data);
     } catch (error) {
       console.log(error);
     }
@@ -157,8 +152,7 @@ function FlowModal(props) {
         render: item => (
           <span style={{ color: item.audit_status != 0 ? '#9b9b9b' : '' }}>
             {item.id == version.id && <CheckOutlined style={{ marginRight: 10 }} />}
-            {/* {item.version_name} */}
-            {item.version_no && item.isChild ? `${item.version_name}.${item.version_no}` : item.version_name}
+            {item.version_no && !item.isParent ? `${item.version_name}.${item.version_no}` : item.version_name}
           </span>
         ),
       },

src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js

@@ -547,7 +547,6 @@ function Detail(props) {
         } 
         return true;
       }
-      console.log('是否有权限提交流转',getIsSubmit())
       if(getIsSubmit()) menuList.push(<Menu.Item key="commitAudit">提交流转</Menu.Item>);
       
 

src/pages/PurchaseAdmin/PurchaseList/Detail/LuckySheet.js

@@ -116,12 +116,13 @@ class LuckySheet extends React.Component {
         //   }, 300);
         // },
       };
+      console.log(version)
       if(version.flow_id) {
         option.authority = {
           sheet: true,
           hintText: '当前处于审批节点，禁止编辑！'
         }
-      } else if(version.audit_status != 0) {
+      } else if(version.audit_status != 0 || version.status == 1) {
         option.authority = {
           sheet: true,
           hintText: '当前清单不可编辑！'

src/pages/PurchaseAdmin/PurchaseList/Detail/TimeNode.js

@@ -14,10 +14,10 @@ function TimeNode(props) {
     onApprove,
   } = props;
 
-  if (active !== 0) {
+  if (!list || list.FlowNodes?.length != 0) {
     return (
       <div className={styles.top}>
-        <Steps current={current}>
+        <Steps current={current} status={active == 0 ? 'error' : 'process'}>
           {list.FlowNodes.map(item => (
             <Step
               key={item.id}
@@ -27,7 +27,7 @@ function TimeNode(props) {
           ))}
         </Steps>
         <div className={styles.btns} style={{ marginLeft: 80 }}>
-          {isAuditor && (
+          {active == 0 ? <Button  type="primary" disabled>审批拒绝</Button> : isAuditor && active != 0 && (
             <>
               <Button type="primary" onClick={() => onApprove(true)}>
                 审批通过

src/services/boom.js

@@ -93,7 +93,6 @@ export async function queryBoomFlowList(params) {
 }
 //请求历史版本
 export async function queryVersionsTree(params){
-  console.log("============================", stringify(params))
   return request(`/api/v1/purchase/record/version/tree?${stringify(params)}`);
 }
 //查询业务节点的审核记录