Ver Fonte

修改点击状态不请求问题

Renxy há 2 anos atrás
pai
commit
70cc2fa852

+ 6 - 1
src/components/Flow/node/rect/mapServe.tsx

@@ -147,6 +147,10 @@ const Component = (props: any) => {
     console.log(op);
   }, [roleList]);
 
+  // const handleFileNameClick = () => {
+  //   if (nodeConfig.bom_template) window.open(nodeConfig.bom_template);
+  // };
+
   return (
     <div className={`${PREFIX}-panel-body`}>
       <div className={`${PREFIX}-panel-group`}>
@@ -197,7 +201,8 @@ const Component = (props: any) => {
               onChange={url => onNodeConfigChange('bom_template', url)}
               beforeUpload={beforeUpload}
             />
-            <div>{fileName}</div>
+            {/* <div onClick={handleFileNameClick}>{fileName}</div> */}
+            <a href={nodeConfig.bom_template}>{fileName}</a>
           </>
         )}
         <div className="group">

+ 9 - 6
src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js

@@ -8,6 +8,7 @@ import { CheckOutlined } from '@ant-design/icons';
 import { queryRecordSheet, queryVserionByNode } from '@/services/boom';
 import { async } from '@antv/x6/lib/registry/marker/async';
 import VersionModal from './VersionModal';
+
 const { Step } = Steps;
 
 const { TextArea } = Input;
@@ -125,9 +126,11 @@ function FlowModal(props) {
   };
 
   const handleChangeClick = item => {
-    let type = item.flow_id ? 'detail/queryAuditRecord' : 'detail/queryAuditExcel';
+    let file = isOut ? 'newList' : 'detail';
+    let type = item.flow_id ? '/queryAuditRecord' : '/queryAuditExcel';
+    console.log(`${file}${type}`);
     dispatch({
-      type,
+      type: `${file}${type}`,
       payload: {
         excel_id: item.id,
         pageSize: 100,
@@ -297,7 +300,7 @@ const getColor = item => {
   return color;
 };
 
-// export default connect(({ xflow, detail }) => ({
-//   flowDetail: xflow.flowDetail,
-// }))(FlowModal);
-export default FlowModal;
+export default connect(({ loading }) => ({
+  loading,
+}))(FlowModal);
+// export default FlowModal;

+ 2 - 4
src/pages/PurchaseAdmin/PurchaseList/List/models/list.js

@@ -15,9 +15,7 @@ import {
   Logout,
   queryProject,
 } from '@/services/PurchaseList';
-import {
-  queryRole
-} from '@/services/SysAdmin';
+import { queryRole } from '@/services/SysAdmin';
 import { setCurrentUser } from '@/utils/authority';
 import { storeToken } from '@/utils/utils';
 import { routerRedux } from 'dva/router';
@@ -117,7 +115,7 @@ export default {
       }
     },
     *queryHistory({ payload, callback }, { call, put }) {
-      payload.pageSize = '9999'
+      payload.pageSize = '9999';
       const response = yield call(queryHistory, payload);
       if (response) {
         yield put({

+ 14 - 1
src/pages/PurchaseAdmin/PurchaseList/List/models/newList.js

@@ -1,7 +1,7 @@
 import { queryProjectRecord } from '@/services/boom';
 import { queryProject } from '@/services/PurchaseList';
 import { message } from 'antd';
-import { commitSheet, queryVersionsList } from '@/services/boom';
+import { commitSheet, queryVersionsList, queryAuditExcel, queryAuditRecord } from '@/services/boom';
 
 export default {
   namespace: 'newList',
@@ -73,6 +73,19 @@ export default {
         });
       }
     },
+
+    *queryAuditExcel({ payload, callback }, { call, put }) {
+      const response = yield call(queryAuditExcel, payload);
+      if (response) {
+        callback && callback(response.data?.all);
+      }
+    },
+    *queryAuditRecord({ payload, callback }, { call, put }) {
+      const response = yield call(queryAuditRecord, payload);
+      if (response) {
+        callback && callback(response.data?.all);
+      }
+    },
   },
 
   reducers: {