菜单与 审核按钮,登录新用户修改密码
This commit is contained in:
@ -10,7 +10,7 @@ import CategorySelector from '@/components/CategorySelector';
|
||||
import AdmissionTypeSelect from '@/components/CommonSelect/AdmissionTypeSelect';
|
||||
import AccessDepartmentSelect from "@/components/AccessDepartmentSelect"
|
||||
//接口
|
||||
import { getPage, startApprove } from './services'
|
||||
import { getPage, startApprove, supplierChangeApprove } from './services'
|
||||
import { getDictList } from '@/servers/api/dicts'
|
||||
//统一列表分页
|
||||
import tableProps from '@/utils/tableProps'
|
||||
@ -120,6 +120,15 @@ const SupplierCategoryEntry: React.FC = () => {
|
||||
发起审批
|
||||
</a>
|
||||
)}
|
||||
{record.approveStatus === '0' && (
|
||||
<Button type="link" onClick={() => {
|
||||
supplierChangeApprove({ id: record.id, approveStatus: '1' }).then(() => {
|
||||
handleReset()
|
||||
})
|
||||
}}>
|
||||
审批
|
||||
</Button>
|
||||
)}
|
||||
</Space>
|
||||
),
|
||||
},
|
||||
@ -131,7 +140,7 @@ const SupplierCategoryEntry: React.FC = () => {
|
||||
<div className="filter-action-row">
|
||||
<Form layout="inline" form={form} className="filter-form" onFinish={getList}>
|
||||
<Form.Item name="accessType" label="准入方式">
|
||||
<AdmissionTypeSelect/>
|
||||
<AdmissionTypeSelect />
|
||||
</Form.Item>
|
||||
<Form.Item name="orgId" label="准入单位">
|
||||
<AccessDepartmentSelect placeholder={'请选择准入单位'} />
|
||||
|
@ -62,3 +62,6 @@ export const add = (data: addInterface) => request.post('/coscoAccessWorkCategor
|
||||
* 品类选择查询树
|
||||
*/
|
||||
export const categoryTree = () => request.get('/cosco/category/categoryTree');
|
||||
|
||||
|
||||
export const supplierChangeApprove = (data: { id:string; approveStatus:string }) => request.post('/synchronous/receiveCategoryApprove', { data });
|
@ -13,7 +13,7 @@ import AdmissionTypeSelect from '@/components/CommonSelect/AdmissionTypeSelect';
|
||||
import AccessStatusSelect from '@/components/CommonSelect/AccessStatusSelect';
|
||||
import AccessDepartmentSelect from "@/components/AccessDepartmentSelect"
|
||||
//接口
|
||||
import { getPage, startApprove } from './services'
|
||||
import { getPage, startApprove, supplierChangeApprove } from './services'
|
||||
//统一列表分页
|
||||
import tableProps from '@/utils/tableProps'
|
||||
|
||||
@ -112,7 +112,7 @@ const AccessManagement: React.FC = () => {
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
width: 200,
|
||||
width: 220,
|
||||
fixed: 'right',
|
||||
render: (_: any, record: any) => (
|
||||
<Space>
|
||||
@ -127,6 +127,15 @@ const AccessManagement: React.FC = () => {
|
||||
<a onClick={() => openModal('result', record)}>评审结果</a>
|
||||
</>
|
||||
)}
|
||||
{record.approveStatus === '0' && (
|
||||
<Button type="link" onClick={() => {
|
||||
supplierChangeApprove({ id: record.id, approveStatus: '1' }).then(() => {
|
||||
handleReset()
|
||||
})
|
||||
}}>
|
||||
审批
|
||||
</Button>
|
||||
)}
|
||||
|
||||
</Space>
|
||||
),
|
||||
@ -173,7 +182,7 @@ const AccessManagement: React.FC = () => {
|
||||
dataSource={data}
|
||||
columns={columns}
|
||||
loading={loading}
|
||||
pagination={{...tableProps.pagination, total: pagination.total }}
|
||||
pagination={{ ...tableProps.pagination, total: pagination.total }}
|
||||
onChange={(pagination) => {
|
||||
const values = form.getFieldsValue();
|
||||
getList(values, pagination.current!, pagination.pageSize!)
|
||||
|
@ -123,4 +123,4 @@ export const startApprove = (params: startApproveData) => request.get(`/coscoAcc
|
||||
*/
|
||||
export const reviewInfoData = (params: startApproveData) => request.get(`/coscoAccessWork/reviewInfoData`, { params });
|
||||
|
||||
|
||||
export const supplierChangeApprove = (data: { id:string; approveStatus:string }) => request.post('/synchronous/receiveApprove', { data });
|
@ -5,7 +5,7 @@ import { SearchOutlined, DeleteOutlined } from '@ant-design/icons';
|
||||
import DetailView from './components/DetailView';
|
||||
import RegionTypeSelect from '@/components/CommonSelect/RegionTypeSelect'
|
||||
//接口
|
||||
import { getPage } from './services';
|
||||
import { getPage, supplierChangeApprove } from './services';
|
||||
import type { ColumnsType } from 'antd/es/table';
|
||||
//字典
|
||||
import { getDictList } from '@/servers/api/dicts'
|
||||
@ -189,9 +189,22 @@ const SupplierChangeReviewManage: React.FC<Props> = ({ dispatch }) => {
|
||||
width: 160,
|
||||
fixed: 'right',
|
||||
render: (_: any, record: any) => (
|
||||
<Button type="link" onClick={() => handleDetail(record)}>
|
||||
审批记录
|
||||
</Button>
|
||||
<>
|
||||
<Button type="link" onClick={() => handleDetail(record)}>
|
||||
审批记录
|
||||
</Button>
|
||||
{/* 测试使用,需删除 */}
|
||||
{ record.approveStatus === '0' && (
|
||||
<Button type="link" onClick={() => {
|
||||
supplierChangeApprove({ id:record.id, approveStatus: '1' }).then(() => {
|
||||
handleReset()
|
||||
})
|
||||
}}>
|
||||
审批
|
||||
</Button>
|
||||
)}
|
||||
</>
|
||||
|
||||
),
|
||||
},
|
||||
];
|
||||
|
@ -21,4 +21,4 @@ export const supplierChangeApplyById = (id: string) => request.get(`/coscoSuppli
|
||||
|
||||
|
||||
|
||||
|
||||
export const supplierChangeApprove = (data: { id:string; approveStatus:string }) => request.post('/synchronous/supplierChangeApprove', { data });
|
||||
|
@ -8,7 +8,7 @@ import ViewBlacklistModal from './components/ViewBlacklistModal';
|
||||
import AccessDepartmentSelect from "@/components/AccessDepartmentSelect"
|
||||
//接口
|
||||
import { getDictList } from '@/servers/api/dicts'
|
||||
import { getPage } from './services'
|
||||
import { getPage, supplierChangeApprove } from './services'
|
||||
//统一列表分页
|
||||
import tableProps from '@/utils/tableProps'
|
||||
import moment from 'moment';
|
||||
@ -102,10 +102,11 @@ const supplierExitAudit: React.FC = () => {
|
||||
title: "操作",
|
||||
key: "option",
|
||||
align: "center",
|
||||
width: 100,
|
||||
width: 140,
|
||||
fixed: 'right',
|
||||
render: (record: any) => (
|
||||
<a
|
||||
<>
|
||||
<a
|
||||
onClick={() => {
|
||||
setSelectedRecordId(record.id);
|
||||
setViewVisible(true);
|
||||
@ -113,6 +114,17 @@ const supplierExitAudit: React.FC = () => {
|
||||
>
|
||||
查看
|
||||
</a>
|
||||
{record.approveStatus === '0' && (
|
||||
<Button type="link" onClick={() => {
|
||||
supplierChangeApprove({ id: record.id, approveStatus: '1' }).then(() => {
|
||||
handleReset()
|
||||
})
|
||||
}}>
|
||||
审批
|
||||
</Button>
|
||||
)}
|
||||
</>
|
||||
|
||||
),
|
||||
},
|
||||
];
|
||||
|
@ -84,4 +84,4 @@ export const coscoSupplierexit = (id: string) => request.get(`/coscoSupplierexit
|
||||
|
||||
|
||||
|
||||
|
||||
export const supplierChangeApprove = (data: { id:string; approveStatus:string }) => request.post('/synchronous/supplierCategoryTcApprove', { data });
|
||||
|
Reference in New Issue
Block a user