文件名修改

FormInsertDiy/ExportComponent/ActiveMenuComponent.js

@@ -14,8 +14,9 @@ import { connect } from 'dva';
 import router from 'umi/router';
 import { getIsQian_Nan } from '@/webPublic/zyd_public/utils/getSchoolType';
 import exportHandledInfo from '@/webPublic/FormInsertDiy/AffairPage/AuditPage/exportHandledInfo';
-import ApplyMerage from '@/webPublic/FormInsertDiy/ExportComponent/ApplyMerage';
-import AuditMerage from '@/webPublic/FormInsertDiy/ExportComponent/AuditMerage';
+import ApplyMerge from './ApplyMerge'; // merge
+import AuditMerge from './AuditMerge';
+import CheckRecordMerge from './CheckRecordMerge';
 
 export const CreateC = createContext({
 	routerConfig: {},
@@ -59,6 +60,9 @@ function ActiveMenuComponent({ routerConfig, ...otherProps }) {
 		case 'CheckRecord': // 查询类应用
 			Res = <CheckRecord workId={appId} />;
 			break;
+    case 'CheckRecordMerage': // 查询类应用聚合
+      Res = <CheckRecordMerge routerConfig={routerConfig}/>;
+      break;
 		case 'Apply': // 申请类
 			if (appId === '1549319936277479424') {
 				// 29573 当前位置： 违纪管理/违纪上报（辅导员）,100086 下面这个模块做个超链接 搞到这儿来
@@ -78,7 +82,7 @@ function ActiveMenuComponent({ routerConfig, ...otherProps }) {
 			Res = <Apply workId={appId} {...otherProps} />;
 			break;
     case 'ApplyMerage': // 申请页面聚合 多个流程的申请页面放在一起
-      Res = <ApplyMerage {...otherProps} routerConfig={routerConfig}/>;
+      Res = <ApplyMerge {...otherProps} routerConfig={routerConfig}/>;
       break;
 		case 'Audit': // 审批类
 			Res = <Audit workId={appId} {...otherProps} />;
@@ -104,7 +108,7 @@ function ActiveMenuComponent({ routerConfig, ...otherProps }) {
 			Res = <BatchAudit workId={appId} {...otherProps} />;
 			break;
     case 'AuditMerage': // 审核页面聚合 多个流程的审核页面放在一起
-      Res = <AuditMerage {...otherProps} routerConfig={routerConfig}/>;
+      Res = <AuditMerge {...otherProps} routerConfig={routerConfig}/>;
       break;
 		case 'Detail': // 详情
 			Res = <Detail {...otherProps} />;

FormInsertDiy/ExportComponent/ApplyMerage.js → FormInsertDiy/ExportComponent/ApplyMerge.js

@@ -4,7 +4,7 @@ const TabPane = Tabs.TabPane;
 import Apply from '@/webPublic/FormInsertDiy/AffairPage/ApplyPage';
 import { isJSON } from '@/webPublic/one_stop_public/copy'; // 申请
 
-export default function ApplyMerage(props) {
+export default function ApplyMerge(props) {
   let settingJson = isJSON(props.routerConfig?.settingJson) ? JSON.parse(props.routerConfig?.settingJson) : [];
   if(!settingJson || !Array.isArray(settingJson)){
     console.log('settingJson 不是一个数组 无法渲染!');

FormInsertDiy/ExportComponent/AuditMerage.js → FormInsertDiy/ExportComponent/AuditMerge.js

@@ -5,7 +5,7 @@ import BatchAudit from '@/webPublic/FormInsertDiy/AffairPage/AuditPage/BatchAudi
 import Audit from '@/webPublic/FormInsertDiy/AffairPage/AuditPage/index.js'; // 审批
 import { isJSON } from '@/webPublic/one_stop_public/copy'; // 申请
 
-export default function AuditMerage(props) {
+export default function AuditMerge(props) {
   let settingJson = isJSON(props.routerConfig?.settingJson) ? JSON.parse(props.routerConfig?.settingJson) : [];
   if(!Array.isArray(settingJson) || !settingJson.length){
     console.log('settingJson 不是一个数组 无法渲染!');

FormInsertDiy/ExportComponent/CheckRecordMerge.js

+import React, { useState, useEffect } from 'react';
+import { Tabs } from 'antd';
+import { isJSON } from '@/webPublic/one_stop_public/copy'; // 申请
+import CheckRecord from '@/webPublic/FormInsertDiy/ExportComponent/CheckRecord';
+
+const TabPane = Tabs.TabPane;
+
+export default function CheckRecordMerge(props) {
+  let settingJson = isJSON(props.routerConfig?.settingJson) ? JSON.parse(props.routerConfig?.settingJson) : [];
+  if(!Array.isArray(settingJson) || !settingJson.length){
+    console.log('settingJson 不是一个数组 无法渲染!');
+    return null;
+  }
+  console.log(settingJson);
+  const [activeKey, setActiveKey] = useState(settingJson[0].appId);
+  const changeActiveKey = (a) => {
+    setActiveKey(a);
+  };
+  useEffect(() => {
+  }, []);
+
+  if (!activeKey) {
+    return null;
+  }
+  console.log(settingJson);
+  return (
+    <Tabs activeKey={activeKey}
+          hideAdd={true}
+          style={{backgroundColor:'#fff'}}
+          onChange={changeActiveKey}
+    >
+      {
+        settingJson.map((g) => {
+          const Component = CheckRecord;
+          return (<TabPane tab={g.name} key={g.appId}>
+            {
+              activeKey === g.appId ?
+                <Component workId={g.appId}
+                           {...props}
+                /> : null
+            }
+          </TabPane>);
+        })
+      }
+    </Tabs>
+  );
+}