审批单位与黑名单菜单问题
This commit is contained in:
@ -6,6 +6,6 @@ export default defineConfig({
|
|||||||
UPLOAD_URL: '/upload',
|
UPLOAD_URL: '/upload',
|
||||||
REQUEST_BASE: '/api',
|
REQUEST_BASE: '/api',
|
||||||
// 下载文件时用到,直接window.open 拼上接口地址+参数
|
// 下载文件时用到,直接window.open 拼上接口地址+参数
|
||||||
SERVER_BASE: 'http://10.0.0.10:18012',
|
SERVER_BASE: 'http://10.0.0.125:18012',
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
@ -23,10 +23,20 @@ export default {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
prod: {
|
prod: {
|
||||||
|
'/api/v1/*': {
|
||||||
|
target: 'http://10.0.0.125:18030',//
|
||||||
|
changeOrigin: true,
|
||||||
|
pathRewrite: { '^/api/v1': '/v1' },
|
||||||
|
},
|
||||||
'/api/*': {
|
'/api/*': {
|
||||||
target: 'http://uscm.unicom.local:18022',//
|
target: 'http://10.0.0.125:18012',//
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
pathRewrite: { '^': '' },
|
pathRewrite: { '^': '' },
|
||||||
},
|
},
|
||||||
|
'/upload/*': {
|
||||||
|
target: 'http://10.0.0.125:18012',//
|
||||||
|
changeOrigin: true,
|
||||||
|
pathRewrite: { '^/upload': '' },
|
||||||
|
},
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -78,8 +78,8 @@ export default {
|
|||||||
'menu.supplierBlacklist': '供应商黑名单管理',
|
'menu.supplierBlacklist': '供应商黑名单管理',
|
||||||
'menu.blacklistManage': '供应商黑名单管理',
|
'menu.blacklistManage': '供应商黑名单管理',
|
||||||
'menu.blacklistAudit': '供应商黑名单审批管理',
|
'menu.blacklistAudit': '供应商黑名单审批管理',
|
||||||
'menu.supplierExit': '供应商黑名单管理',
|
'menu.supplierExit': '供应商退出管理',
|
||||||
'menu.supplierExitManage': '供应商黑名单管理',
|
'menu.supplierExitManage': '供应商退出管理',
|
||||||
'menu.supplierExitAudit': '供应商黑名单审批管理',
|
'menu.supplierExitAudit': '供应商退出审批管理',
|
||||||
'menu.supplierMessage': '消息通知',
|
'menu.supplierMessage': '消息通知',
|
||||||
};
|
};
|
||||||
|
@ -7,6 +7,7 @@ import { SearchOutlined, DeleteOutlined } from '@ant-design/icons';
|
|||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
//查看组件
|
//查看组件
|
||||||
import DetailView from './components/DetailView';
|
import DetailView from './components/DetailView';
|
||||||
|
import AccessDepartmentSelect from "@/components/AccessDepartmentSelect"
|
||||||
//字典与接口
|
//字典与接口
|
||||||
import { getSupplierChangePage } from './services';
|
import { getSupplierChangePage } from './services';
|
||||||
import { getDictList } from '@/servers/api/dicts'
|
import { getDictList } from '@/servers/api/dicts'
|
||||||
@ -165,11 +166,7 @@ const CooperateEnterprise: React.FC = () => {
|
|||||||
<Input style={{ width: 160 }} placeholder="请输入变更内容" allowClear maxLength={50} />
|
<Input style={{ width: 160 }} placeholder="请输入变更内容" allowClear maxLength={50} />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item name="deptNames" label="审批单位">
|
<Form.Item name="deptNames" label="审批单位">
|
||||||
<Select style={{ width: 160 }} placeholder="请选择审批单位" allowClear>
|
<AccessDepartmentSelect placeholder={'请选择审批单位'} />
|
||||||
<Select.Option value="品类1">品类1</Select.Option>
|
|
||||||
<Select.Option value="品类2">品类2</Select.Option>
|
|
||||||
<Select.Option value="品类3">品类3</Select.Option>
|
|
||||||
</Select>
|
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item name="createTime" label="提交时间">
|
<Form.Item name="createTime" label="提交时间">
|
||||||
<DatePicker.RangePicker placeholder={['开始时间', '结束时间']} allowClear />
|
<DatePicker.RangePicker placeholder={['开始时间', '结束时间']} allowClear />
|
||||||
|
@ -146,7 +146,7 @@ const CreateBlacklistModal: React.FC<CreateBlacklistModalProps> = ({
|
|||||||
<div style={{ marginTop: 24 }}>
|
<div style={{ marginTop: 24 }}>
|
||||||
<Form
|
<Form
|
||||||
form={form}
|
form={form}
|
||||||
labelCol={{ flex: '100px' }} // label 固定宽度(也可写 'none')
|
labelCol={{ flex: '140px' }} // label 固定宽度(也可写 'none')
|
||||||
wrapperCol={{ flex: 1 }} // 输入框区域自适应剩余空间
|
wrapperCol={{ flex: 1 }} // 输入框区域自适应剩余空间
|
||||||
layout="horizontal"
|
layout="horizontal"
|
||||||
>
|
>
|
||||||
@ -166,11 +166,11 @@ const CreateBlacklistModal: React.FC<CreateBlacklistModalProps> = ({
|
|||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label="退出原因"
|
label="退出黑名单原因"
|
||||||
name="blacklistReason"
|
name="blacklistReason"
|
||||||
rules={[{ required: true, message: '请输入退出原因' }]}
|
rules={[{ required: true, message: '请输入退出黑名单原因' }]}
|
||||||
>
|
>
|
||||||
<Input.TextArea placeholder="请输入退出原因" rows={4} />
|
<Input.TextArea placeholder="请输入退出黑名单原因" rows={4} />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</Form>
|
</Form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -109,7 +109,7 @@ const ViewBlacklistModal: React.FC<ViewBlacklistModalProps> = ({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Modal
|
<Modal
|
||||||
title="供应商退出详情"
|
title="供应商黑名单详情"
|
||||||
visible={visible}
|
visible={visible}
|
||||||
onCancel={onCancel}
|
onCancel={onCancel}
|
||||||
width={900}
|
width={900}
|
||||||
@ -120,14 +120,14 @@ const ViewBlacklistModal: React.FC<ViewBlacklistModalProps> = ({
|
|||||||
<Spin spinning={loading}>
|
<Spin spinning={loading}>
|
||||||
{detail && (
|
{detail && (
|
||||||
<Descriptions
|
<Descriptions
|
||||||
title="退出信息"
|
title="黑名单信息"
|
||||||
column={1}
|
column={1}
|
||||||
labelStyle={{ width: 120 }}
|
labelStyle={{ width: 160 }}
|
||||||
bordered
|
bordered
|
||||||
style={{ marginBottom: 24 }}
|
style={{ marginBottom: 24 }}
|
||||||
>
|
>
|
||||||
<Descriptions.Item label="时限类型" >{timelimitMap[detail.timelimitType] || '' }</Descriptions.Item>
|
<Descriptions.Item label="时限类型" >{timelimitMap[detail.timelimitType] || '' }</Descriptions.Item>
|
||||||
<Descriptions.Item label="退出原因" >{detail.blacklistReason}</Descriptions.Item>
|
<Descriptions.Item label="退出黑名单原因" >{detail.blacklistReason}</Descriptions.Item>
|
||||||
</Descriptions>
|
</Descriptions>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
@ -109,7 +109,7 @@ const CreateBlacklistModal: React.FC<CreateBlacklistModalProps> = ({
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Modal
|
<Modal
|
||||||
title="供应商黑名单"
|
title="供应商退出"
|
||||||
visible={visible}
|
visible={visible}
|
||||||
onCancel={onCancel}
|
onCancel={onCancel}
|
||||||
width={900}
|
width={900}
|
||||||
@ -157,11 +157,11 @@ const CreateBlacklistModal: React.FC<CreateBlacklistModalProps> = ({
|
|||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label="加入黑名单原因"
|
label="退出原因"
|
||||||
name="exitReason"
|
name="exitReason"
|
||||||
rules={[{ required: true, message: '请输入加入黑名单原因' }]}
|
rules={[{ required: true, message: '请输入退出原因' }]}
|
||||||
>
|
>
|
||||||
<Input.TextArea placeholder="请输入黑名单原因" rows={4} />
|
<Input.TextArea placeholder="请输入退出原因" rows={4} />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</Form>
|
</Form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -93,13 +93,13 @@ const ViewBlacklistModal: React.FC<ViewBlacklistModalProps> = ({
|
|||||||
},
|
},
|
||||||
{ title: "发起单位", dataIndex: "orgName", align: "center", ellipsis: true, width: 160 },
|
{ title: "发起单位", dataIndex: "orgName", align: "center", ellipsis: true, width: 160 },
|
||||||
{ title: "发起部门", dataIndex: "deptName", align: "center", ellipsis: true, width: 160 },
|
{ title: "发起部门", dataIndex: "deptName", align: "center", ellipsis: true, width: 160 },
|
||||||
// { title: "黑名单品类", dataIndex: "categoryName", align: "center", ellipsis: true, width: 160 },
|
{ title: "退出品类", dataIndex: "categoryName", align: "center", ellipsis: true, width: 160 },
|
||||||
{ title: "加入黑名单时间", dataIndex: "createTime", align: "center", width: 180 },
|
{ title: "退出时间", dataIndex: "createTime", align: "center", width: 180 },
|
||||||
];
|
];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Modal
|
<Modal
|
||||||
title="供应商黑名单详情"
|
title="供应商退出详情"
|
||||||
visible={visible}
|
visible={visible}
|
||||||
onCancel={onCancel}
|
onCancel={onCancel}
|
||||||
width='80%'
|
width='80%'
|
||||||
@ -115,7 +115,7 @@ const ViewBlacklistModal: React.FC<ViewBlacklistModalProps> = ({
|
|||||||
<Form.Item name="deptId" label="发起单位">
|
<Form.Item name="deptId" label="发起单位">
|
||||||
<AccessDepartmentSelect placeholder={'请选择发起单位'} />
|
<AccessDepartmentSelect placeholder={'请选择发起单位'} />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item name="time" label="加入黑名单时间">
|
<Form.Item name="time" label="退出时间">
|
||||||
<DatePicker.RangePicker style={{ width: 220 }} allowClear />
|
<DatePicker.RangePicker style={{ width: 220 }} allowClear />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item>
|
<Form.Item>
|
||||||
|
@ -124,7 +124,7 @@ const CreateBlacklistModal: React.FC<CreateBlacklistModalProps> = ({
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Modal
|
<Modal
|
||||||
title="供应商黑名单"
|
title="供应商退出"
|
||||||
visible={visible}
|
visible={visible}
|
||||||
onCancel={onCancel}
|
onCancel={onCancel}
|
||||||
width={900}
|
width={900}
|
||||||
@ -147,7 +147,7 @@ const CreateBlacklistModal: React.FC<CreateBlacklistModalProps> = ({
|
|||||||
<div style={{ marginTop: 24 }}>
|
<div style={{ marginTop: 24 }}>
|
||||||
<Form
|
<Form
|
||||||
form={form}
|
form={form}
|
||||||
labelCol={{ flex: '140px' }}
|
labelCol={{ flex: '100px' }}
|
||||||
wrapperCol={{ flex: 1 }}
|
wrapperCol={{ flex: 1 }}
|
||||||
layout="horizontal"
|
layout="horizontal"
|
||||||
>
|
>
|
||||||
@ -168,11 +168,11 @@ const CreateBlacklistModal: React.FC<CreateBlacklistModalProps> = ({
|
|||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label="加入黑名单原因"
|
label="退出原因"
|
||||||
name="exitReason"
|
name="exitReason"
|
||||||
rules={[{ required: true, message: '请输入黑名单原因' }]}
|
rules={[{ required: true, message: '请输入退出原因' }]}
|
||||||
>
|
>
|
||||||
<Input.TextArea placeholder="请输入加入黑名单原因" rows={4} />
|
<Input.TextArea placeholder="请输入退出原因" rows={4} />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</Form>
|
</Form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -93,13 +93,13 @@ const ViewBlacklistModal: React.FC<ViewBlacklistModalProps> = ({
|
|||||||
},
|
},
|
||||||
{ title: "发起单位", dataIndex: "orgName", align: "center", ellipsis: true, width: 160 },
|
{ title: "发起单位", dataIndex: "orgName", align: "center", ellipsis: true, width: 160 },
|
||||||
{ title: "发起部门", dataIndex: "deptName", align: "center", ellipsis: true, width: 160 },
|
{ title: "发起部门", dataIndex: "deptName", align: "center", ellipsis: true, width: 160 },
|
||||||
// { title: "黑名单品类", dataIndex: "categoryName", align: "center", ellipsis: true, width: 160 },
|
{ title: "退出品类", dataIndex: "categoryName", align: "center", ellipsis: true, width: 160 },
|
||||||
{ title: "加入黑名单时间", dataIndex: "createTime", align: "center", width: 180 },
|
{ title: "退出时间", dataIndex: "createTime", align: "center", width: 180 },
|
||||||
];
|
];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Modal
|
<Modal
|
||||||
title="供应商黑名单详情"
|
title="供应商退出详情"
|
||||||
visible={visible}
|
visible={visible}
|
||||||
onCancel={onCancel}
|
onCancel={onCancel}
|
||||||
width='80%'
|
width='80%'
|
||||||
@ -115,7 +115,7 @@ const ViewBlacklistModal: React.FC<ViewBlacklistModalProps> = ({
|
|||||||
<Form.Item name="deptId" label="发起单位">
|
<Form.Item name="deptId" label="发起单位">
|
||||||
<AccessDepartmentSelect placeholder={'请选择发起单位'} />
|
<AccessDepartmentSelect placeholder={'请选择发起单位'} />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item name="time" label="加入黑名单时间">
|
<Form.Item name="time" label="退出时间">
|
||||||
<DatePicker.RangePicker style={{ width: 220 }} allowClear />
|
<DatePicker.RangePicker style={{ width: 220 }} allowClear />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item>
|
<Form.Item>
|
||||||
|
Reference in New Issue
Block a user