Página Principal Explorar Ajuda
Registe-se Iniciar Sessão
xujunjie
/
WorkloadWeb
1
0
Fork 0
Ficheiros Problemas 0 Pull Requests 0 Wiki
Ver Fonte

修改bom

Renxy há 2 anos atrás
pai
a45cbe1fb3
commit
31ac08cd03
3 ficheiros alterados com 8 adições e 8 exclusões
Visão Dividida Mostrar Estatísticas Diff
  1. 4 4
      public/luckysheet.html
  2. 3 3
      src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
  3. 1 1
      src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js

+ 4 - 4
public/luckysheet.html
Ver Ficheiro 

@@ -8,20 +8,20 @@
 
   <title>Document</title>
 
 
   <!-- 线上发布使用路径 -->
 
-  <!-- <link rel="stylesheet" href="/bom/Luckysheet/plugins/css/pluginsCss.css" />
 
+  <link rel="stylesheet" href="/bom/Luckysheet/plugins/css/pluginsCss.css" />
 
   <link rel="stylesheet" href="/bom/Luckysheet/plugins/plugins.css" />
 
   <link rel="stylesheet" href="/bom/Luckysheet/css/luckysheet.css" />
 
   <link rel="stylesheet" href="/bom/Luckysheet/assets/iconfont/iconfont.css" />
 
   <script src="/bom/Luckysheet/plugins/js/plugin.js"></script>
 
-  <script src="/bom/Luckysheet/luckysheet.umd.js"></script> -->
 
+  <script src="/bom/Luckysheet/luckysheet.umd.js"></script>
 
 
   <!-- 本地开发使用路径 -->
 
-  <link rel='stylesheet' href='http://localhost:3000/plugins/css/pluginsCss.css' />
 
+  <!-- <link rel='stylesheet' href='http://localhost:3000/plugins/css/pluginsCss.css' />
 
   <link rel='stylesheet' href='http://localhost:3000/plugins/plugins.css' />
 
   <link rel='stylesheet' href='http://localhost:3000/css/luckysheet.css' />
 
   <link rel='stylesheet' href='http://localhost:3000/assets/iconfont/iconfont.css' />
 
   <script src="http://localhost:3000/plugins/js/plugin.js"></script>
 
-  <script src="http://localhost:3000/luckysheet.umd.js"></script>
 
+  <script src="http://localhost:3000/luckysheet.umd.js"></script> -->
 
 </head>
 
 
 <body>

+ 3 - 3
src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
Ver Ficheiro 

@@ -128,7 +128,7 @@ function FlowModal(props) {
 
   const handleChangeClick = item => {
 
     let file = isOut ? 'newList' : 'detail';
 
     let type = item.flow_id ? '/queryAuditRecord' : '/queryAuditExcel';
 
-    console.log(`${file}${type}`);
 
+    console.log(`${file}${type}`, item);
 
     dispatch({
 
       type: `${file}${type}`,
 
       payload: {
 
@@ -159,7 +159,7 @@ function FlowModal(props) {
 
         title: '状态',
 
         width: '30%',
 
         render: item => {
 
-          if (item.isParent) return;
 
+          // if (!item.flow_id && item.isParent) return;
 
           let style = { color: getColor(item) };
 
           let txt = '';
 
           switch (item.audit_status) {
 
@@ -191,7 +191,7 @@ function FlowModal(props) {
 
         title: '操作',
 
         width: '20%',
 
         render: item =>
 
-          !item.isParent &&
 
+          (item.flow_id || !item.isParent) &&
 
           item.id != version.id && (
 
             <a
 
               onClick={() => {

+ 1 - 1
src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js
Ver Ficheiro 

@@ -561,7 +561,7 @@ function Detail(props) {
 
         const nodeId = version.template_node_id;
 
         if (!flowDetail?.nodes || !nodeId) return;
 
         const node = flowDetail.nodes.find(item => item.Id == nodeId);
 
-        if (node.name == 'custom-circle') return;
 
+        if (!node || node.name == 'custom-circle') return;
 
         if (node?.role_list) {
 
           return node.role_list
 
             .split(',')