|
@@ -3,7 +3,7 @@ import { startTransition, useMemo, useState } from 'react'
|
|
import { PageContainer } from '@ant-design/pro-layout'
|
|
import { PageContainer } from '@ant-design/pro-layout'
|
|
import { BusinessType, ExecutorSetType } from '@/enums/gc'
|
|
import { BusinessType, ExecutorSetType } from '@/enums/gc'
|
|
import useScripts from './hooks/useScripts'
|
|
import useScripts from './hooks/useScripts'
|
|
-import { Button } from 'antd'
|
|
|
|
|
|
+import { Button, Tag } from 'antd'
|
|
import ProTable, { ProColumnType } from '@ant-design/pro-table'
|
|
import ProTable, { ProColumnType } from '@ant-design/pro-table'
|
|
import LeftMenu from '../RuleCode/components/LeftMenu'
|
|
import LeftMenu from '../RuleCode/components/LeftMenu'
|
|
import { connect } from '@umijs/max'
|
|
import { connect } from '@umijs/max'
|
|
@@ -12,12 +12,12 @@ import { BusinessModelState } from '../model'
|
|
export const menuOptions = [{ label: '预算业务审批', value: BusinessType.BUDGET }]
|
|
export const menuOptions = [{ label: '预算业务审批', value: BusinessType.BUDGET }]
|
|
|
|
|
|
type ProcessProps = {
|
|
type ProcessProps = {
|
|
- processMap: {
|
|
|
|
|
|
+ executorMap: {
|
|
[key: string]: API.ExecutorItem[]
|
|
[key: string]: API.ExecutorItem[]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-const Process: React.FC<ProcessProps> = ({ processMap }) => {
|
|
|
|
|
|
+const Process: React.FC<ProcessProps> = ({ executorMap }) => {
|
|
const [state, setState] = useState({
|
|
const [state, setState] = useState({
|
|
activeKey: ''
|
|
activeKey: ''
|
|
})
|
|
})
|
|
@@ -27,8 +27,8 @@ const Process: React.FC<ProcessProps> = ({ processMap }) => {
|
|
|
|
|
|
const list = useMemo(() => {
|
|
const list = useMemo(() => {
|
|
if (!state.activeKey) return []
|
|
if (!state.activeKey) return []
|
|
- return processMap?.[state.activeKey] || []
|
|
|
|
- }, [state.activeKey, processMap])
|
|
|
|
|
|
+ return executorMap?.[state.activeKey] || []
|
|
|
|
+ }, [state.activeKey, executorMap?.[state.activeKey]])
|
|
|
|
|
|
const columns: ProColumnType<API.ExecutorItem>[] = [
|
|
const columns: ProColumnType<API.ExecutorItem>[] = [
|
|
{
|
|
{
|
|
@@ -49,14 +49,14 @@ const Process: React.FC<ProcessProps> = ({ processMap }) => {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- dataIndex: 'members',
|
|
|
|
|
|
+ dataIndex: 'membersName',
|
|
title: '成员',
|
|
title: '成员',
|
|
onHeaderCell: () => ({ style: { textAlign: 'center' } }),
|
|
onHeaderCell: () => ({ style: { textAlign: 'center' } }),
|
|
ellipsis: true,
|
|
ellipsis: true,
|
|
renderText: (_, record) => (
|
|
renderText: (_, record) => (
|
|
<div className="children:mx-1">
|
|
<div className="children:mx-1">
|
|
- {record?.members?.value?.map(item => (
|
|
|
|
- <span key={item?.ID}>{item?.name}</span>
|
|
|
|
|
|
+ {record?.membersName?.map(item => (
|
|
|
|
+ <Tag key={item}>{item}</Tag>
|
|
))}
|
|
))}
|
|
</div>
|
|
</div>
|
|
)
|
|
)
|
|
@@ -87,7 +87,7 @@ const Process: React.FC<ProcessProps> = ({ processMap }) => {
|
|
const [gatherID, businessType] = key.split('_')
|
|
const [gatherID, businessType] = key.split('_')
|
|
setState({ ...state, activeKey: key })
|
|
setState({ ...state, activeKey: key })
|
|
startTransition(() => {
|
|
startTransition(() => {
|
|
- !processMap?.[state.activeKey] && query({ gatherID, businessType, pageSize: 214000 })
|
|
|
|
|
|
+ !executorMap?.[state.activeKey] && query({ gatherID, businessType, pageSize: 214000 })
|
|
})
|
|
})
|
|
}
|
|
}
|
|
return (
|
|
return (
|
|
@@ -118,5 +118,5 @@ const Process: React.FC<ProcessProps> = ({ processMap }) => {
|
|
}
|
|
}
|
|
|
|
|
|
export default connect(({ business }: { business: BusinessModelState }) => ({
|
|
export default connect(({ business }: { business: BusinessModelState }) => ({
|
|
- processMap: business.processMap
|
|
|
|
|
|
+ executorMap: business.executorMap
|
|
}))(Process)
|
|
}))(Process)
|