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

src/pages/Detail/CommitAuditModal.js

@@ -646,6 +646,7 @@ function CommitAuditModal(props) {
   // };
 
   const onFinish = async () => {
+    if(loading) return;
     const isOk = Object.values(approvalProcess).every(item => {
       return item.every(cur => {
         if (cur[0].type == 'role') return cur[0].nowValue;

src/pages/Detail/Index.js

@@ -18,6 +18,7 @@ import MergeModal from './MergeModal';
 import { GetTokenFromUrl, getToken } from '@/utils/utils';
 import {
   getAuditDetail,
+  getVersionDetail,
   queryDelSheetRecord,
   queryDetail,
   queryDingInstanceExecute,
@@ -401,7 +402,7 @@ function Detail(props) {
       localStorage.excelId = version.id;
       localStorage.excelItem = JSON.stringify(version);
     } else {
-      version = await getAuditDetail({ userId: currentUser.ID, excelID });
+      version = await getVersionDetail({ excelID });
       if (!version) {
         const excelId = localStorage.excelItem
           ? JSON.parse(localStorage.excelItem)

src/pages/Detail/LuckySheet.js

@@ -140,7 +140,9 @@ class LuckySheet extends React.Component {
           }, 100);
         },
         workbookCreateAfter: options => {
-          this.luckysheet.refreshFormula();
+          setTimeout(() => {
+            this.luckysheet.refreshFormula();
+          }, 800);
         },
       },
     };
@@ -650,7 +652,11 @@ class LuckySheet extends React.Component {
       luckysheet.setCellValue(9, 2, result, {
         order,
       });
+      console.log(result)
+      luckysheet.refreshFormula()
+      message.success("计算成功")
     } catch (error) {
+      message.error("计算失败")
       console.log(error);
     }
   }

src/pages/Detail/TimeNode.js

@@ -27,12 +27,12 @@ function TimeNode(props) {
   const { current, list, active } = flow;
   const nodeId = version.template_node_id;
 
-  const showBackBtn = useMemo(() => {
-    if (!nodeId || flowDetail.nodes.length == 0) return false;
-    const node = flowDetail.nodes.find(item => item.Id == nodeId);
-    if (node.label == '三级审批1') return true;
-    return false;
-  }, [nodeId, flowDetail]);
+  // const showBackBtn = useMemo(() => {
+  //   if (!nodeId || flowDetail.nodes.length == 0) return false;
+  //   const node = flowDetail.nodes.find(item => item.Id == nodeId);
+  //   if (node.label == '三级审批1') return true;
+  //   return false;
+  // }, [nodeId, flowDetail]);
 
   function calculateHoursDifference(date1, date2) {
     const timestamp1 = date1.getTime(); // 获取第一个Date对象的时间戳（以毫秒为单位）

src/pages/Flow/FlowDetail.json

@@ -530,54 +530,6 @@
       "flow_id": 48,
       "node_type_psr": 2,
       "count": 0
-    },
-    {
-      "id": "node-d825c5a0-6077-4d64-a63c-5b3cde59211b",
-      "renderKey": "custom-rect",
-      "name": "custom-rect",
-      "label": "现金流",
-      "width": 120,
-      "height": 50,
-      "ports": {
-        "items": [
-          { "group": "top", "id": "3816dfce-c9a4-4655-9ecb-ecdc6f05fe53" },
-          { "group": "right", "id": "eab92693-4051-449f-b76c-b90587d47f70" },
-          { "group": "bottom", "id": "bb9edb5b-212e-491f-ac79-2bd9096739aa" },
-          { "group": "left", "id": "f65c9954-8273-4f77-9cae-a37cbafe147e" }
-        ]
-      },
-      "isCustom": true,
-      "parentKey": "custom",
-      "x": -789,
-      "y": 129,
-      "zIndex": 10,
-      "flow_id": 0,
-      "node_type_psr": 0,
-      "count": 0
-    },
-    {
-      "id": "node-050b15a7-5bc8-4091-bcc3-d48013eacadd",
-      "renderKey": "custom-rect",
-      "name": "custom-rect",
-      "label": "过程/终版PSR",
-      "width": 120,
-      "height": 50,
-      "ports": {
-        "items": [
-          { "group": "top", "id": "c52f65b7-3fb9-4e68-b039-05ab37414983" },
-          { "group": "right", "id": "fbba2fdc-f26d-488f-aaaf-f7ead51460a9" },
-          { "group": "bottom", "id": "37d3ccbf-3b3d-4e65-bd5a-cdafc81685b8" },
-          { "group": "left", "id": "8751b4b6-25ff-4843-9db0-a6ae4b7258e4" }
-        ]
-      },
-      "isCustom": true,
-      "parentKey": "custom",
-      "x": -789,
-      "y": 232,
-      "zIndex": 10,
-      "flow_id": 0,
-      "node_type_psr": 0,
-      "count": 0
     }
   ],
   "edges": [
@@ -770,27 +722,6 @@
       "target": { "cell": "b57b57c8", "port": "17ff5fe6" },
       "attr": "{\"line\":{\"stroke\":\"#A2B1C3\",\"targetMarker\":{\"name\":\"block\",\"width\":12,\"height\":8},\"strokeDasharray\":[0,0],\"strokeWidth\":1}}"
     },
-    {
-      "id": "5216c5dc:188c9b68-node-d825c5a0-6077-4d64-a63c-5b3cde59211b:3816dfce-c9a4-4655-9ecb-ecdc6f05fe53",
-      "source": { "cell": "5216c5dc", "port": "188c9b68" },
-      "target": {
-        "cell": "node-d825c5a0-6077-4d64-a63c-5b3cde59211b",
-        "port": "3816dfce-c9a4-4655-9ecb-ecdc6f05fe53"
-      },
-      "attr": "{\"line\":{\"stroke\":\"#A2B1C3\",\"targetMarker\":{\"name\":\"block\",\"width\":12,\"height\":8},\"strokeDasharray\":[0,0],\"strokeWidth\":1}}"
-    },
-    {
-      "id": "node-d825c5a0-6077-4d64-a63c-5b3cde59211b:bb9edb5b-212e-491f-ac79-2bd9096739aa-node-050b15a7-5bc8-4091-bcc3-d48013eacadd:c52f65b7-3fb9-4e68-b039-05ab37414983",
-      "source": {
-        "cell": "node-d825c5a0-6077-4d64-a63c-5b3cde59211b",
-        "port": "bb9edb5b-212e-491f-ac79-2bd9096739aa"
-      },
-      "target": {
-        "cell": "node-050b15a7-5bc8-4091-bcc3-d48013eacadd",
-        "port": "c52f65b7-3fb9-4e68-b039-05ab37414983"
-      },
-      "attr": "{\"line\":{\"stroke\":\"#A2B1C3\",\"targetMarker\":{\"name\":\"block\",\"width\":12,\"height\":8},\"strokeDasharray\":[0,0],\"strokeWidth\":1}}"
-    },
     {
       "id": "c28a18d3:a06aba2c-3631eae9:0f06668a",
       "source": { "cell": "c28a18d3", "port": "a06aba2c" },

src/services/boom.js

@@ -505,3 +505,9 @@ export async function getAuditDetail(params) {
   );
   return res.data;
 }
+export async function getVersionDetail(params) {
+  const res = await request(
+    `/api/v1/purchase/bom/get-excel-detail?excel_id=${params.excelID}`
+  );
+  return res.data;
+}

src/utils/uploadExcelByUrl.js

@@ -6,7 +6,8 @@ window.moment = moment
 
 const uploadExcelByUrl = (nodeType, versionId, project) => {
   const TEMPLATE_URL =
-    'https://gt-digitization.oss-cn-hangzhou.aliyuncs.com/public/bom/psr0913.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';
 
   return new Promise((resolve, reject) => {
     LuckyExcel.transformExcelToLuckyByUrl(