合并代码
This commit is contained in:
@ -11,6 +11,7 @@ import RecordModal from './components/RecordModal';
|
||||
import ResultModal from './components/ResultModal';
|
||||
//发起准入 弹窗
|
||||
import CreateModal from './components/CreateModal';
|
||||
import CategorySelector from '@/components/CategorySelector';
|
||||
|
||||
import { getPage, startApprove } from './services'
|
||||
|
||||
@ -36,7 +37,7 @@ const AccessManagement: React.FC = () => {
|
||||
//列表加载
|
||||
const [loading, setLoading] = useState(false);
|
||||
// 列表方法
|
||||
const getList = async (values: any = {},pageNo: number = 1, pageSize: number = 10) => {
|
||||
const getList = async (values: any = {}, pageNo: number = 1, pageSize: number = 10) => {
|
||||
setLoading(true);
|
||||
try {
|
||||
const { code, data } = await getPage({ ...values, pageNo, pageSize });
|
||||
@ -81,7 +82,7 @@ const AccessManagement: React.FC = () => {
|
||||
{
|
||||
title: '序号',
|
||||
dataIndex: 'index',
|
||||
render: (_: any, __: any, index: number) => index + 1,
|
||||
render: (_: any, __: any, idx: number) => (((pagination.current ?? 1) - 1) * (pagination.pageSize ?? 10)) + idx + 1,
|
||||
},
|
||||
{ title: '准入工作', dataIndex: 'accessWorkName' },
|
||||
{ title: '准入单位', dataIndex: 'deptId' },
|
||||
@ -95,17 +96,17 @@ const AccessManagement: React.FC = () => {
|
||||
render: (_: any, record: any) => (
|
||||
<Space>
|
||||
<a onClick={() => openModal('view', record)}>查看</a>
|
||||
{ (record.reviewStatus === '3' && !record.approveStatusText) && (
|
||||
<a onClick={() => handleApproval(record.id)}>
|
||||
{(record.reviewStatus === '3' && !record.approveStatusText) && (
|
||||
<a onClick={() => handleApproval(record.id)}>
|
||||
发起审批
|
||||
</a>
|
||||
</a>
|
||||
)}
|
||||
{ record.reviewStatus === '3' && (
|
||||
{record.reviewStatus === '3' && (
|
||||
<>
|
||||
<a onClick={() => openModal('result', record)}>评审结果</a>
|
||||
</>
|
||||
)}
|
||||
|
||||
|
||||
</Space>
|
||||
),
|
||||
},
|
||||
@ -115,27 +116,24 @@ const AccessManagement: React.FC = () => {
|
||||
<>
|
||||
<Form layout="inline" form={form} onFinish={getList}>
|
||||
<Form.Item name="accessType" label="准入方式">
|
||||
<Select style={{ width: 150 }} placeholder="请选择">
|
||||
<Option value="线上">线上</Option>
|
||||
<Option value="线下">线下</Option>
|
||||
<Select style={{ width: 150 }} placeholder="请选择准入方式" allowClear >
|
||||
<Option value="online">线上准入</Option>
|
||||
<Option value="offline">线下准入</Option>
|
||||
</Select>
|
||||
</Form.Item>
|
||||
<Form.Item name="deptId" label="准入单位">
|
||||
<Select style={{ width: 150 }} placeholder="请选择">
|
||||
<Option value="单位A">单位A</Option>
|
||||
<Option value="单位B">单位B</Option>
|
||||
<Select style={{ width: 150 }} placeholder="请选择" allowClear>
|
||||
</Select>
|
||||
</Form.Item>
|
||||
<Form.Item name="categoryId" label="准入品类">
|
||||
<Select style={{ width: 150 }} placeholder="请选择">
|
||||
<Option value="品类1">品类1</Option>
|
||||
<Option value="品类2">品类2</Option>
|
||||
</Select>
|
||||
<CategorySelector multiple={false} style={{ width: 150 }} />
|
||||
</Form.Item>
|
||||
<Form.Item name="approveStatus" label="状态">
|
||||
<Select style={{ width: 150 }} placeholder="请选择">
|
||||
<Option value="草稿">草稿</Option>
|
||||
<Option value="已提交">已提交</Option>
|
||||
<Select style={{ width: 150 }} placeholder="请选择状态" allowClear>
|
||||
<Option value="0">未开始</Option>
|
||||
<Option value="1">进行中</Option>
|
||||
<Option value="2">结果汇总中</Option>
|
||||
<Option value="3">已完成</Option>
|
||||
</Select>
|
||||
</Form.Item>
|
||||
<Form.Item>
|
||||
|
Reference in New Issue
Block a user