Renxy 2 жил өмнө
parent
commit
ca6cc9af4a

+ 18 - 15
src/pages/Detail/FlowModal.js

@@ -14,6 +14,7 @@ import {
   Popover,
   Popover,
   Cascader,
   Cascader,
   AutoComplete,
   AutoComplete,
+  Spin,
 } from 'antd';
 } from 'antd';
 import Flow from '@/components/Flow/index';
 import Flow from '@/components/Flow/index';
 import { connect } from 'dva';
 import { connect } from 'dva';
@@ -407,7 +408,7 @@ function FlowModal(props) {
   return (
   return (
     <>
     <>
       <Modal
       <Modal
-        confirmLoading={loading}
+        // confirmLoading={loading}
         destroyOnClose
         destroyOnClose
         title="流程图"
         title="流程图"
         visible={visible}
         visible={visible}
@@ -486,20 +487,22 @@ function FlowModal(props) {
                 // }}
                 // }}
               />
               />
             </div>
             </div>
-            {stepsData.map((item, idx) => (
-              <div key={`${item.name}_${idx}`} style={{ marginBottom: '20px' }}>
-                <div style={{ marginBottom: '4px' }}>{item.name}</div>
-                <Steps size="small" current={item.current} status={item.status}>
-                  {item.list.map(node => (
-                    <Step
-                      key={`${node.id}_${node.node}`}
-                      title={node.node}
-                      description={`审批人:${node.AuditorUser?.CName || '-'}`}
-                    />
-                  ))}
-                </Steps>
-              </div>
-            ))}
+            <Spin spinning={loading.global}>
+              {stepsData.map((item, idx) => (
+                <div key={`${item.name}_${idx}`} style={{ marginBottom: '20px' }}>
+                  <div style={{ marginBottom: '4px' }}>{item.name}</div>
+                  <Steps size="small" current={item.current} status={item.status}>
+                    {item.list.map(node => (
+                      <Step
+                        key={`${node.id}_${node.node}`}
+                        title={node.node}
+                        description={`审批人:${node.AuditorUser?.CName || '-'}`}
+                      />
+                    ))}
+                  </Steps>
+                </div>
+              ))}
+            </Spin>
           </Col>
           </Col>
         </Row>
         </Row>
       </Modal>
       </Modal>