ff

package.json

@@ -4,7 +4,7 @@
   "version": "0.1.0",
   "type": "module",
   "scripts": {
-    "start": "vite --force",
+    "start": "vite --force --port 8000",
     "start:debug": "vite --debug",
     "start:mock": "vite --mode mock",
     "start:production": "vite --mode production",
@@ -27,15 +27,12 @@
     ]
   },
   "dependencies": {
-    "@ant-design/charts": "^1.1.16",
-    "@ant-design/icons": "^5.0.1",
+    "@ant-design/charts": "^1.4.2",
+    "@ant-design/icons": "^5.2.6",
     "@ant-design/pro-form": "^2.18.6",
     "@ant-design/pro-layout": "^6.26.5",
     "@handsontable/react": "^12.1.2",
     "@types/qs": "^6.9.7",
-    "@websee/core": "^4.0.2",
-    "@websee/performance": "^4.0.2",
-    "@websee/recordscreen": "^4.0.2",
     "ahooks": "^3.7.5",
     "amis": "^1.9.1-beta.17",
     "antd": "^4.24.13",
@@ -89,7 +86,6 @@
     "react-style-proptype": "^3.2.2",
     "react-text-loop-next": "^0.0.3",
     "resize-observer-polyfill": "^1.5.1",
-    "rrule": "^2.7.2",
     "socket.io-client": "^4.7.2",
     "swap-array": "^1.0.0",
     "xlsx-js-style": "^1.2.0",
@@ -138,6 +134,7 @@
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-imagemin": "^0.6.1",
-    "vite-plugin-mock": "^2.9.6"
+    "vite-plugin-mock": "^2.9.6",
+    "vite-tsconfig-paths": "^4.2.1"
   }
 }

public/config/combiningMenus.json

@@ -8,115 +8,19 @@
     "closable": false
   },
   {
-    "path": "/groupStructure",
-    "name": "集团架构",
-    "element": "groupStructure",
+    "path": "/test",
+    "name": "测试",
+    "element": "Test",
     "type": "component",
-    "icon": "icon-jituanjiagou",
+    "icon": "icon-jibenxinxiweihu",
     "closable": false
   },
   {
-    "path": "/ReportSys",
-    "name": "报告系统",
-    "element": "reportSys",
-    "type": "component",
-    "closable": false,
-    "hideInMenu": true
-  },
-  {
-    "path": "/ReportSys/StatementData",
-    "element": "statementData",
-    "name": "报表项目基础数据",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "path": "/ReportSys/unFinancialStatements",
-    "element": "unFinancialStatements",
-    "name": "未审财务报表",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "TB汇总",
-    "path": "/ReportSys/trialSys/trialBalance",
-    "element": "trialBalance",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "TB-调整抵消",
-    "path": "/ReportSys/trialSys/AuditAdjust",
-    "element": "auditAdjust",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "TB-模拟调整",
-    "path": "/ReportSys/UnFinancialSys/accountAdjust",
-    "element": "accountAdjust",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "附注与分析",
-    "path": "/ReportSys/reportAnalysis",
-    "element": "reportAnalysis",
-    "type": "component",
-    "hideInMenu": true
-  },
-
-  {
-    "path": "/ReportSys/approvedFinance",
-    "name": "审定报表",
-    "element": "approvedFinance",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "财务报表核对",
-    "path": "/ReportSys/UnFinancialSys/financialStatementsCheck",
-    "element": "financialStatementsCheck",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "长投及关联交易—内部往来统计",
-    "path": "/ReportSys/trialSys/internalTran",
-    "element": "internalTran",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "报告生成",
-    "path": "/ReportSys/reportBuilder",
-    "element": "reportBuilder",
+    "path": "/groupStructure",
+    "name": "集团架构",
+    "element": "GroupStructure",
     "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "集团层统计",
-    "path": "/groupLevelStatistics",
-    "icon": "icon-jituancengtongji",
-    "children": [
-      {
-        "type": "component",
-        "name": "单体分录汇总",
-        "element": "entriesSummary",
-        "path": "/groupLevelStatistics/entriesSummary"
-      },
-      {
-        "type": "component",
-        "name": "往来明细表汇总",
-        "element": "detailsSummary",
-        "path": "/groupLevelStatistics/detailsSummary"
-      },
-      {
-        "type": "component",
-        "name": "函证统计",
-        "element": "correspondenceStatistics",
-        "path": "/groupLevelStatistics/correspondenceStatistics"
-      }
-    ]
+    "icon": "icon-jituanjiagou",
+    "closable": false
   }
 ]

src/components/Nav/index.tsx

@@ -2,7 +2,6 @@ import React, { useEffect, useMemo, lazy, useRef, useState } from 'react'
 import { Empty, Tabs } from 'antd'
 import type { TabsProps } from 'antd'
 import useTabStore from '@/store/tab'
-import { useNavigate } from 'react-router-dom'
 import { routeMap } from '@/router'
 import { NotFound } from '@/router/routes'
 
@@ -57,17 +56,25 @@ const Nav: React.FC = props => {
 
   const tabPanes: TabsProps['items'] = useMemo(() => {
     return items.map(item => {
-      let element = item.element as string
-      element = element.slice(0, 1).toUpperCase() + element.slice(1)
-      const Element = routeMap[element]
+      let children = <></>
+      if (React.isValidElement(item.element)) {
+        console.log('1111')
+        children = item.element
+      } else {
+        console.log('2222')
+        let element = item.element as string
+        element = element.slice(0, 1).toUpperCase() + element.slice(1)
+        const Element = routeMap[element]
+        console.log(
+          "🚀 ~ file: index.tsx:66 ~ consttabPanes:TabsProps['items']=useMemo ~ Element:",
+          Element,
+        )
+        children = <>导航页</>
+      }
       const pane = {
         key: item.key,
         label: item.label,
-        children: React.isValidElement(<Element></Element>) ? (
-          <Element></Element>
-        ) : (
-          <NotFound></NotFound>
-        ),
+        children,
       }
       return pane
     })

src/layout/index.tsx

@@ -241,7 +241,7 @@ const LayoutPage: React.FC = () => {
       menuDataRender={() => loopMenuItem(menuList)}
     >
       <Nav></Nav>
-      {/* <Outlet /> */}
+      <Outlet />
     </ProLayout>
   )
 }

src/main.tsx

 import React, { Suspense } from 'react'
 import ReactDOM from 'react-dom/client'
 import { HashRouter } from 'react-router-dom'
-import 'devextreme/dist/css/dx.light.css'
+// import 'devextreme/dist/css/dx.light.css'
 import App from './App'
 import SuspenceFallbackLoading from '@/layout/suspenceFallback'
 import Initial from './initial'

src/pages/GroupStructure/service.ts

@@ -15,6 +15,7 @@ import type {
 const baseRequest = async (url: any, params: any) => {
   try {
     const res = await cloudGetApiData(url, params);
+    console.log("🚀 ~ file: service.ts:18 ~ baseRequest ~ res:", res)
     if (res.ok) {
       return Promise.resolve({
         data: res.data,
@@ -37,6 +38,7 @@ export default {
     return await baseRequest(`cs/data.importPartFromCloud`, params);
   },
   getGroupPartTreeList: async (params: GetGroupPartTreeListParams) => {
+    console.log("🚀 ~ file: service.ts:41 ~ getGroupPartTreeList: ~ params:", params)
     return await baseRequest(`cs/data.getGroupPartTreeList`, params);
   },
   // 删除一个单位
@@ -68,8 +70,8 @@ export default {
   },
   /**
    * 获取需要导入单位数量
-   * @param params 
-   * @returns 
+   * @param params
+   * @returns
    */
   getNeedImportCnt :async (params: ICloudParams)=>{
     return await baseRequest(`cs/data.getNeedImportCnt`, params);

src/pages/accountAdjust/components/AdjustGrid/components/AdjustEntry/components/AgingaccountPopup/SimpleDatas.tsx

-import { CheckBox } from "devextreme-react";
-import React from "react";
-import { CpasIcon } from '~/public/cpas-ui';
+import { CheckBox } from 'devextreme-react'
+import React from 'react'
+import { CpasIcon } from 'cpas-ui'
 
 export const bottomColumns = [
   {
-    dataField: "Caption",
-    dataType: "string",
-    caption: "报表项目",
+    dataField: 'Caption',
+    dataType: 'string',
+    caption: '报表项目',
     width: 200,
-    alignment: "left",
-    allowResizing: true
+    alignment: 'left',
+    allowResizing: true,
   },
   {
-    dataField: "code",
-    dataType: "string",
-    caption: "科目编号",
+    dataField: 'code',
+    dataType: 'string',
+    caption: '科目编号',
     width: 200,
-    alignment: "left",
-    allowResizing: true
+    alignment: 'left',
+    allowResizing: true,
   },
 ]
-
-
-

src/pages/accountAdjust/components/AdjustGrid/components/AdjustEntry/components/SetClassiFication/index.tsx

@@ -6,19 +6,19 @@ import DevTreeRight from './DevTree/index'
 import SetReclassiFiedItem from './SetReclassiFiedItem'
 import { getSubjectList, getSubjectType } from '@/pages/reportFinancial/service'
 import { AdjustingEntryKMMapSave, getKMMapDataList, updateMap } from './service'
-import { DevToolBar, CpasIcon, DevGrid, LayoutB, SortableDevGrid, DevPopup } from '~/public/cpas-ui'
+import { DevToolBar, CpasIcon, DevGrid, LayoutB, SortableDevGrid, DevPopup } from 'cpas-ui'
 import React, {
   useCallback,
   useEffect,
   useImperativeHandle,
   useMemo,
   useRef,
-  useState
+  useState,
 } from 'react'
 import AntTabs, {
   HocVerticalLeftStyleTab,
-  HocVerticalRightStyleTab
-} from '~/public/cpas-ui/components-ui/ant-components/AntTab'
+  HocVerticalRightStyleTab,
+} from 'cpas-ui/components-ui/ant-components/AntTab'
 import { adjustingEntryInit, KMMapanalysisMap } from '../ClassiFication/service'
 
 const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
@@ -31,7 +31,7 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
     display: 'flex',
     alignItems: 'center',
     justifyContent: 'center',
-    marginRight: '10px'
+    marginRight: '10px',
   }
 
   const diaParams = useRef<any>()
@@ -55,7 +55,7 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
     const r = await getKMMapDataList({
       dbname,
       billID: BillID,
-      Data_ID: DataId
+      Data_ID: DataId,
     })
     if (r) devGridRef.current.instance.endCustomLoading()
     SetData(r)
@@ -66,7 +66,7 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
     const { DataId } = params
     const res = await getSubjectType({
       dbname,
-      Data_ID: DataId
+      Data_ID: DataId,
     })
     if (res) {
       res.unshift({ code: '0', type: '全部' })
@@ -81,7 +81,7 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
     const res = await getSubjectList({
       dbname,
       Data_ID: DataId,
-      isHasFZZ: true
+      isHasFZZ: true,
     })
     setAccountFilterData(res)
     setAccountList(res)
@@ -95,7 +95,7 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
       getKMMapDataLists(params)
       getSubjectTypeData(params)
       getSubjectListDatas(params)
-    }
+    },
   }))
 
   // 点击关闭按钮逻辑
@@ -112,7 +112,7 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
       width: 100,
       alignment: 'left',
       allowEditing: false,
-      allowUpdating: false
+      allowUpdating: false,
     },
     {
       dataField: 'KMMC',
@@ -121,7 +121,7 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
       width: 150,
       alignment: 'left',
       allowEditing: false,
-      allowUpdating: false
+      allowUpdating: false,
     },
     {
       dataField: 'CFLNo',
@@ -130,7 +130,7 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
       width: 100,
       alignment: 'center',
       allowEditing: false,
-      allowUpdating: false
+      allowUpdating: false,
     },
     {
       dataField: 'CFLName',
@@ -155,22 +155,22 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
                       devGridRef.current.instance.cellValue(
                         displayName.current.rowIndex,
                         'CFLName',
-                        ''
+                        '',
                       )
                       devGridRef.current.instance.cellValue(
                         displayName.current.rowIndex,
                         'CFLNo',
-                        ''
+                        '',
                       )
-                    }
+                    },
                   })
                 }}
               />
             </span>
           </div>
         )
-      }
-    }
+      },
+    },
     // {
     //     // dataField: "",
     //     // dataType: "string",
@@ -211,7 +211,7 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
         }
       })
     },
-    [ficationTabsData, AccountList]
+    [ficationTabsData, AccountList],
   )
 
   function leftContainer() {
@@ -237,16 +237,16 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
               filterPanel={{ visible: false }}
               filterRow={{ visible: false }}
               paging={{
-                enabled: false
+                enabled: false,
               }}
               editing={{
                 allowAdding: false,
                 allowUpdating: true,
                 allowDeleting: false,
-                mode: 'cell'
+                mode: 'cell',
               }}
               selection={{
-                allowSelectAll: false
+                allowSelectAll: false,
               }}
               // onSaved={SavedData}
               onCellClick={(res: any) => {
@@ -275,12 +275,12 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
         devGridRef.current.instance.cellValue(
           displayName.current.rowIndex,
           'CFLName',
-          e.level === 66 ? e.YSKMMC : e.name
+          e.level === 66 ? e.YSKMMC : e.name,
         )
         devGridRef.current.instance.cellValue(
           displayName.current.rowIndex,
           'CFLNo',
-          e.level === 66 ? e.YSKMBH : e.code
+          e.level === 66 ? e.YSKMBH : e.code,
         )
         await updateMap({
           dbname, //1
@@ -297,7 +297,7 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
           YSHSXMMC: '',
           itemNames3: e.itemNames3, //.
           YSKMMC: e.YSKMMC, //.
-          PKMBH: e.PKMBH //.
+          PKMBH: e.PKMBH, //.
         })
       }
       return {}
@@ -329,7 +329,7 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
       YSHSXMMC: e.YSHSXMMC,
       itemNames3: e.itemNames3, //.
       YSKMMC: e.YSKMMC, //.
-      PKMBH: e.PKMBH //.
+      PKMBH: e.PKMBH, //.
     })
   }
   function rightContainer() {
@@ -384,7 +384,7 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
       dbname,
       billID: diaParams.current.BillID,
       Data_ID: diaParams.current.DataId,
-      editUser: username
+      editUser: username,
     })
     if (r) {
       diaParams.current.okClick()
@@ -425,7 +425,7 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
                     await KMMapanalysisMap({
                       dbname,
                       billID: diaParams.current.BillID,
-                      Data_ID: diaParams.current.DataId
+                      Data_ID: diaParams.current.DataId,
                     })
                     getKMMapDataLists(diaParams.current)
                     // await AdjustingEntryKMMapSave({
@@ -434,10 +434,10 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
                     //     Data_ID: diaParams.current.DataId,
                     //     editUser: username
                     // })
-                  }
+                  },
                 })
-              }
-            }
+              },
+            },
           },
           {
             widget: 'dxButton',
@@ -448,8 +448,8 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
               onClick: () => {
                 setVisible(false)
                 displayName.current = ''
-              }
-            }
+              },
+            },
           },
           {
             widget: 'dxButton',
@@ -458,9 +458,9 @@ const SetClassiFication: React.FC<any> = React.forwardRef((props: any, ref) => {
             options: {
               text: intl('pub.ok', '确定'),
               type: 'default',
-              onClick: () => OK()
-            }
-          }
+              onClick: () => OK(),
+            },
+          },
         ]}
       >
         <div style={{ width: '100%', height: '100%', display: 'flex' }}>

src/pages/accountAdjust/index.tsx

-
-import { Popup, SelectBox } from "devextreme-react";
-import React, { useMemo, useRef, useState } from "react";
-import AdjustGrid from "./components/AdjustGrid";
-import AdjustToolBar from "./components/AdjustToolBar";
-import { LoadPanel } from "devextreme-react";
-import { useModel } from "umi";
-// import { CpasTable } from '~/public/cpas-ui';
+import { Popup, SelectBox } from 'devextreme-react'
+import React, { useMemo, useRef, useState } from 'react'
+import AdjustGrid from './components/AdjustGrid'
+import AdjustToolBar from './components/AdjustToolBar'
+import { LoadPanel } from 'devextreme-react'
+import { useModel } from 'umi'
+// import { CpasTable } from 'cpas-ui';
 
 const AccountAdjust = () => {
-
   const [toolBarData, setToolBarData] = useState<any>({
-    TZQJ: '1', isTZ: "0",
-    Data_ID: "",
-    PopupName: ""
-  });
-  const { isShowGloablLoad } = useModel('useAdjustModel');
+    TZQJ: '1',
+    isTZ: '0',
+    Data_ID: '',
+    PopupName: '',
+  })
+  const { isShowGloablLoad } = useModel('useAdjustModel')
 
   function setSelectedItem(newValue: any) {
     setToolBarData((oldData: any) => {
-      const newData = { ...oldData, ...newValue };
-      return newData;
-    });
+      const newData = { ...oldData, ...newValue }
+      return newData
+    })
   }
 
   return (
-    <div style={{ width: "100%", height: "calc(100% - 20px)" }}>
-      <div style={{ width: "100%", height: "36px", }}>
+    <div style={{ width: '100%', height: 'calc(100% - 20px)' }}>
+      <div style={{ width: '100%', height: '36px' }}>
         <AdjustToolBar setSelectedItem={setSelectedItem} whereFrom="账表调整" />
       </div>
-      <div style={{ width: "100%", height: "calc(100% - 36px)", marginTop: "10px" }}>
-        {
-          useMemo(() => {
-            return <AdjustGrid toolBarData={toolBarData} whereFrom="账表调整" />
-          }, [toolBarData])
-        }
+      <div style={{ width: '100%', height: 'calc(100% - 36px)', marginTop: '10px' }}>
+        {useMemo(() => {
+          return <AdjustGrid toolBarData={toolBarData} whereFrom="账表调整" />
+        }, [toolBarData])}
       </div>
-      <LoadPanel
-        visible={isShowGloablLoad}
-        showIndicator={true}
-        showPane={true}
-      />
-    </div >
+      <LoadPanel visible={isShowGloablLoad} showIndicator={true} showPane={true} />
+    </div>
   )
 }
-export default AccountAdjust;
+export default AccountAdjust
\ No newline at end of file

src/pages/test/index.tsx

+import React, { useState, useContext, useEffect, useCallback, useMemo } from 'react'
+// import DxButton from 'devextreme/ui/button'
+// import DxCheckbox from 'devextreme/ui/check_box'
+import DxButton from 'devextreme-react/button'
+
+const Test: React.FC = () => {
+  return (
+    <div>
+      <DxButton text={'测试按钮'} type="danger"></DxButton>
+      {/* <DxCheckbox></DxCheckbox> */}
+    </div>
+  )
+}
+
+export default Test