Browse Source

修改提交流转时自动填充审批节点逻辑

Renxy 1 year ago
parent
commit
93b5fe74c0
1 changed files with 14 additions and 9 deletions
  1. 14 9
      src/pages/Detail/CommitAuditModal.js

+ 14 - 9
src/pages/Detail/CommitAuditModal.js

@@ -88,7 +88,8 @@ function CommitAuditModal(props) {
     const currentId = flowDetail.nodes.find?.(item => item.Id == Id)?.node_id;
     const data = treeData(currentId);
     console.log('===============审批节点======', data);
-    if (data.length <= 0) {
+    const nextNodes = getNextNodes(currentId, 'custom-rect');
+    if (data.length <= 0 || nextNodes.length > 0) {
       setAuditId(currentId);
     } else {
       let defaultValues = {};
@@ -213,6 +214,10 @@ function CommitAuditModal(props) {
     //     return edge.source.cell == currentId && line && line[0] == '0';
     //   })
     //   .map(item => item.target.cell);
+    console.log(
+      '---------',
+      edges.filter(edge => edge.source.cell == currentId)
+    );
     let targetIds = edges
       .filter(edge => edge.source.cell == currentId)
       .map(item => item.target.cell);
@@ -507,10 +512,10 @@ function CommitAuditModal(props) {
         cur_template_id: version.template_id,
         next_template_id: version.template_id,
       };
-      // if (serviceNode.node_type_psr == 3 || serviceNode.node_type_psr == 4) {
-      // params.data = await uploadExcelByUrl(serviceNode.node_type_psr, version.id);
-      // }
-      params.data = await uploadExcelByUrl(3, version.id);
+      if (serviceNode.node_type_psr == 3 || serviceNode.node_type_psr == 4) {
+        params.data = await uploadExcelByUrl(serviceNode.node_type_psr, version.id);
+      }
+      // params.data = await uploadExcelByUrl(3, version.id);
       console.log(params);
 
       if (result.length <= 0) {
@@ -696,9 +701,9 @@ function getDataValue(item) {
 }
 const uploadExcelByUrl = (nodeType, versionId) => {
   const TEMPLATE_URL =
-    'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/bom/635/%E5%90%88%E5%90%8C%E6%96%87%E4%BB%B6/%E6%8A%95%E6%A0%87%E6%A8%A1%E6%9D%BF.xlsx';
+    'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/doc/contract/2023-06-29/ed0d5dcd-6ce0-40df-9d17-a1f69245dbb9.xlsx';
   const TEMPLATE_URL2 =
-    'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/public/bom/psr.xlsx';
+    'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/doc/contract/2023-06-29/431733cd-0abc-4a68-a439-d24c466e9845.xlsx';
 
   return new Promise((reslove, reject) => {
     LuckyExcel.transformExcelToLuckyByUrl(
@@ -708,12 +713,12 @@ const uploadExcelByUrl = (nodeType, versionId) => {
         let [record] = await getExcel(versionId);
 
         let len = exportJson.sheets.length;
-        record.order = len - 1;
+        record.order = len;
         record.index = String(len);
         record.status = '0';
         record.name = '投标成本';
         var res = [...exportJson.sheets, record];
-        console.log(res)
+        console.log(res);
         reslove(JSON.stringify(res));
       }
     );