代码合并

This commit is contained in:
孙景学
2025-06-24 11:08:51 +08:00
parent c1267c8228
commit 0375e369de
20 changed files with 288 additions and 91 deletions

View File

@ -220,7 +220,212 @@ export default [
component: '@/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResult',
}
]
}
},
{
path: '/backend',
name: 'backend',
icon: 'smile',
component: '@/layouts/MainLayout',
routes: [
{
path: '/backend/workbenches',
name: 'workbenches',
icon: 'smile',
component: '@/pages/supplier/backend/workbenches/index',
},
{
path: '/backend/cooperateEnterprise',
name: 'cooperateEnterprise',
icon: 'smile',
component: '@/pages/supplier/backend/cooperateEnterprise/index',
},
{
path: '/backend/changeProgressInquiry',
name: 'changeProgressInquiry',
icon: 'smile',
component: '@/pages/supplier/backend/changeProgressInquiry/index',
},
{
path: '/backend/supplierNews',
name: 'supplierNews',
icon: 'smile',
component: '@/pages/supplier/backend/supplierNews/index',
},
],
},
{
path: '/informationRetrieval',
name: 'informationRetrieval',
icon: 'smile',
component: '@/layouts/MainLayout',
routes: [
{
path: '/informationRetrieval/registrationQuery',
name: 'registrationQuery',
icon: 'smile',
component: '@/pages/supplier/informationRetrieval/registrationQuery/index',
},
{
path: '/informationRetrieval/groupQualifiedSupplierQuery',
name: 'groupQualifiedSupplierQuery',
icon: 'smile',
component: '@/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/index',
},
{
path: '/informationRetrieval/mySupplierInquiry',
name: 'mySupplierInquiry',
icon: 'smile',
component: '@/pages/supplier/informationRetrieval/mySupplierInquiry/index',
},
]
},
{
path: '/informationManagement',
name: 'informationManagement',
icon: 'smile',
component: '@/layouts/MainLayout',
routes: [
{
path: '/informationManagement/SupplierRegisterAgent',
name: 'SupplierRegisterAgent',
icon: 'smile',
component: '@/pages/supplier/informationManagement/SupplierRegisterAgent/index',
},
{
path: '/informationManagement/SupplierChangeManage',
name: 'SupplierChangeManage',
icon: 'smile',
component: '@/pages/supplier/informationManagement/SupplierChangeManage/index',
},
{
path: '/informationManagement/SupplierChangeReviewManage',
name: 'SupplierChangeReviewManage',
icon: 'smile',
component: '@/pages/supplier/informationManagement/SupplierChangeReviewManage/index',
},
]
},
{
path: '/admission',
name: 'admission',
icon: 'smile',
component: '@/layouts/MainLayout',
routes: [
{
path: '/admission/admissionManagement',
name: 'admissionManagement',
icon: 'smile',
component: '@/pages/supplier/admission/admissionManagement/index',
},
{
path: '/admission/admissionReviewManagement',
name: 'admissionReviewManagement',
icon: 'smile',
component: '@/pages/supplier/admission/admissionReviewManagement/index',
},
{
path: '/admission/SupplierEntryReview',
name: 'SupplierEntryReview',
icon: 'smile',
component: '@/pages/supplier/admission/SupplierEntryReview/index',
},
{
path: '/admission/SupplierCategoryEntry',
name: 'SupplierCategoryEntry',
icon: 'smile',
component: '@/pages/supplier/admission/SupplierCategoryEntry/index',
},
{
path: '/admission/SupplierCategoryEntryReview',
name: 'SupplierCategoryEntryReview',
icon: 'smile',
component: '@/pages/supplier/admission/SupplierCategoryEntryReview/index',
},
]
},
{
path: '/category',
name: 'category',
icon: 'smile',
component: '@/layouts/MainLayout',
routes: [
{
path: '/category/category-manage',
name: 'categoryManage',
icon: 'smile',
component: '@/pages/supplier/category/CategoryManage/index',
},
{
path: '/category/category-library-manage',
name: 'categoryLibraryManage',
icon: 'smile',
component: '@/pages/supplier/category/CategoryLibraryManage/index',
},
{
path: '/category/category-library-review',
name: 'categoryLibraryReview',
icon: 'smile',
component: '@/pages/supplier/category/CategoryLibraryReview/index',
},
{
path: '/category/supplier-entry-manage',
name: 'supplierEntryManage',
icon: 'smile',
component: '@/pages/supplier/category/SupplierEntryManage/index',
},
{
path: '/category/supplier-entry-review',
name: 'supplierEntryReview',
icon: 'smile',
component: '@/pages/supplier/category/SupplierEntryReview/index',
},
]
},
{
path: '/supplierBlacklist',
name: 'supplierBlacklist',
icon: 'smile',
component: '@/layouts/MainLayout',
routes: [
{
path: '/supplierBlacklist/manage',
name: 'blacklistManage',
icon: 'smile',
component: '@/pages/supplier/supplierBlacklist/blacklistManage/index',
},
{
path: '/supplierBlacklist/audit',
name: 'blacklistAudit',
icon: 'smile',
component: '@/pages/supplier/supplierBlacklist/blacklistAudit/index',
},
],
},
{
path: '/supplierExit',
icon: 'smile',
name: 'supplierExit',
routes: [
{
path: '/supplierExit/manage',
name: 'supplierExitManage',
icon: 'smile',
component: '@/pages/supplier/supplierExit/supplierExitManage/index',
},
{
path: '/supplierExit/audit',
name: 'supplierExitAudit',
icon: 'smile',
component: '@/pages/supplier/supplierExit/supplierExitAudit/index',
},
],
},
{
path: '/supplierMessage',
icon: 'smile',
name: 'supplierMessage',
component: '@/pages/supplier/supplierMessage/index',
},
]
},

View File

@ -27,35 +27,35 @@ export default {
'menu.admit': 'admit',
'menu.dict': 'dict',
'menu.backend': 'Supplier backend',
'menu.backend.workbenches': 'workbenches',
'menu.backend.cooperateEnterprise': 'Enterprise Category List',
'menu.backend.changeProgressInquiry': 'Change progress inquiry',
'menu.backend.supplierNews': 'Supplier News',
'menu.workbenches': 'workbenches',
'menu.cooperateEnterprise': 'Enterprise Category List',
'menu.changeProgressInquiry': 'Change progress inquiry',
'menu.supplierNews': 'Supplier News',
'menu.informationRetrieval': 'Supplier Information Retrieval',
'menu.informationRetrieval.registrationQuery': 'Registered supplier inquiry',
'menu.informationRetrieval.groupQualifiedSupplierQuery': 'Group Qualified Supplier Query',
'menu.informationRetrieval.mySupplierInquiry': 'My supplier inquiry',
'menu.registrationQuery': 'Registered supplier inquiry',
'menu.groupQualifiedSupplierQuery': 'Group Qualified Supplier Query',
'menu.mySupplierInquiry': 'My supplier inquiry',
'menu.admission': '供应商准入',
'menu.admission.admissionManagement': '供应商准入管理',
'menu.admission.admissionReviewManagement': '供应商准入评审管理',
'menu.admission.SupplierEntryReview': '供应商准入审核管理',
'menu.admission.SupplierCategoryEntry': '供应商品类准入管理',
'menu.admission.SupplierCategoryEntryReview': '供应商品类准入审核管理',
'menu.admissionManagement': '供应商准入管理',
'menu.admissionReviewManagement': '供应商准入评审管理',
'menu.SupplierEntryReview': '供应商准入审核管理',
'menu.SupplierCategoryEntry': '供应商品类准入管理',
'menu.SupplierCategoryEntryReview': '供应商品类准入审核管理',
'menu.informationManagement': '供应商信息管理',
'menu.informationManagement.SupplierRegisterAgent': '供应商注册代录',
'menu.informationManagement.SupplierChangeManage': '供应商变更管理',
'menu.informationManagement.SupplierChangeReviewManage': '供应商变更审核管理',
'menu.SupplierRegisterAgent': '供应商注册代录',
'menu.SupplierChangeManage': '供应商变更管理',
'menu.SupplierChangeReviewManage': '供应商变更审核管理',
'menu.category': 'Supplier Category Library',
'menu.category.categoryManage': 'Category Management',
'menu.category.categoryLibraryManage': 'Category Library Management',
'menu.category.categoryLibraryReview': 'Category Library Review',
'menu.category.supplierEntryManage': 'Supplier Entry Management',
'menu.category.supplierEntryReview': 'Supplier Entry Review',
'menu.categoryManage': 'Category Management',
'menu.categoryLibraryManage': 'Category Library Management',
'menu.categoryLibraryReview': 'Category Library Review',
'menu.supplierEntryManage': 'Supplier Entry Management',
'menu.supplierEntryReview': 'Supplier Entry Review',
'menu.supplierBlacklist': 'Supplier Black/Grey List Management',
'menu.supplierBlacklist.blacklistManage': 'Supplier Black/Grey List',
'menu.supplierBlacklist.blacklistAudit': 'Supplier Black/Grey List Audit',
'menu.blacklistManage': 'Supplier Black/Grey List',
'menu.blacklistAudit': 'Supplier Black/Grey List Audit',
'menu.supplierExit': 'Supplier Exit Management',
'menu.supplierExit.supplierExitManage': 'Supplier Exit',
'menu.supplierExit.supplierExitAudit': 'Supplier Exit Audit',
'menu.supplierExitManage': 'Supplier Exit',
'menu.supplierExitAudit': 'Supplier Exit Audit',
'menu.supplierMessage': 'Message Notification',
};

View File

@ -1,10 +1,10 @@
export default {
'page.workbench.title': 'Workbench',
'page.workbench.company': 'Company Info',
'page.workbench.personal': 'Personal Info',
'page.workbench.password': 'Change Password',
'page.workbench.title': 'Workbench',
'page.workbench.company': 'Company Info',
'page.workbench.personal': 'Personal Info',
'page.workbench.password': 'Change Password',
'page.workbench.base': 'Basic Information',
'page.workbench.base': 'Basic Information',
'page.workbench.qualification': 'Qualification Information',
'page.workbench.invoice': 'Invoice Information',
'page.workbench.bank': 'Bank Account Information',
@ -69,5 +69,4 @@ export default {
'page.changePassword.error.passwordMismatch': 'The two new passwords do not match',
'page.changePassword.success': 'Password changed successfully',
'page.changePassword.button.submit': 'Submit',
};
};

View File

@ -28,35 +28,35 @@ export default {
'menu.admit': '供应商准入审批',
'menu.dict': '字典',
'menu.backend': '供应商后台',
'menu.backend.workbenches': '工作台',
'menu.backend.cooperateEnterprise': '企业品类名录',
'menu.backend.changeProgressInquiry': '变更进度查询',
'menu.backend.supplierNews': '供应商消息',
'menu.workbenches': '工作台',
'menu.cooperateEnterprise': '企业品类名录',
'menu.changeProgressInquiry': '变更进度查询',
'menu.supplierNews': '供应商消息',
'menu.informationRetrieval': '供应商信息检索',
'menu.informationRetrieval.registrationQuery': '注册供应商查询',
'menu.informationRetrieval.groupQualifiedSupplierQuery': '集团合格供应商查询',
'menu.informationRetrieval.mySupplierInquiry': '我的供应商查询',
'menu.registrationQuery': '注册供应商查询',
'menu.groupQualifiedSupplierQuery': '集团合格供应商查询',
'menu.mySupplierInquiry': '我的供应商查询',
'menu.admission': '供应商准入',
'menu.admission.admissionManagement': '供应商准入管理',
'menu.admission.admissionReviewManagement': '供应商准入评审管理',
'menu.admission.SupplierEntryReview': '供应商准入审核管理',
'menu.admission.SupplierCategoryEntry': '供应商品类准入管理',
'menu.admission.SupplierCategoryEntryReview': '供应商品类准入审核管理',
'menu.admissionManagement': '供应商准入管理',
'menu.admissionReviewManagement': '供应商准入评审管理',
'menu.SupplierEntryReview': '供应商准入审核管理',
'menu.SupplierCategoryEntry': '供应商品类准入管理',
'menu.SupplierCategoryEntryReview': '供应商品类准入审核管理',
'menu.informationManagement': '供应商信息管理',
'menu.informationManagement.SupplierRegisterAgent': '供应商注册代录',
'menu.informationManagement.SupplierChangeManage': '供应商变更管理',
'menu.informationManagement.SupplierChangeReviewManage': '供应商变更审核管理',
'menu.SupplierRegisterAgent': '供应商注册代录',
'menu.SupplierChangeManage': '供应商变更管理',
'menu.SupplierChangeReviewManage': '供应商变更审核管理',
'menu.category': '供应商品类库',
'menu.category.categoryManage': '品类管理',
'menu.category.categoryLibraryManage': '品类库管理',
'menu.category.categoryLibraryReview': '品类库建库审核管理',
'menu.category.supplierEntryManage': '供应商入库管理',
'menu.category.supplierEntryReview': '供应商入库审核管理',
'menu.categoryManage': '品类管理',
'menu.categoryLibraryManage': '品类库管理',
'menu.categoryLibraryReview': '品类库建库审核管理',
'menu.supplierEntryManage': '供应商入库管理',
'menu.supplierEntryReview': '供应商入库审核管理',
'menu.supplierBlacklist': '供应商黑灰名单管理',
'menu.supplierBlacklist.blacklistManage': '供应商黑灰名单管理',
'menu.supplierBlacklist.blacklistAudit': '供应商黑灰名单审核管理',
'menu.blacklistManage': '供应商黑灰名单管理',
'menu.blacklistAudit': '供应商黑灰名单审核管理',
'menu.supplierExit': '供应商退出管理',
'menu.supplierExit.supplierExitManage': '供应商退出管理',
'menu.supplierExit.supplierExitAudit': '供应商退出审核管理',
'menu.supplierExitManage': '供应商退出管理',
'menu.supplierExitAudit': '供应商退出审核管理',
'menu.supplierMessage': '消息通知',
};

View File

@ -1,10 +1,10 @@
export default {
'page.workbench.title': '工作台',
'page.workbench.company': '公司信息',
'page.workbench.personal': '个人信息',
'page.workbench.password': '修改密码',
'page.workbench.title': '工作台',
'page.workbench.company': '公司信息',
'page.workbench.personal': '个人信息',
'page.workbench.password': '修改密码',
'page.workbench.base': '基本信息',
'page.workbench.base': '基本信息',
'page.workbench.qualification': '资质信息',
'page.workbench.invoice': '开票信息',
'page.workbench.bank': '银行账户信息',

View File

@ -1,6 +1,5 @@
import React from 'react';
import { Modal, Descriptions, Table, Button } from 'antd';
import { connect } from 'umi';
const ApproveModal: React.FC<{
@ -114,4 +113,4 @@ const ApproveModal: React.FC<{
);
};
export default connect()(ApproveModal);
export default ApproveModal;

View File

@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
import { connect, useIntl } from 'umi';
import { useIntl } from 'umi';
import { Form, Button, Table, Select, Space, Input } from 'antd';
import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
import { SearchOutlined } from '@ant-design/icons';
@ -163,4 +163,4 @@ const CooperateEnterprise: React.FC = () => {
);
};
export default connect()(CooperateEnterprise);
export default CooperateEnterprise;

View File

@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
import { connect, useIntl } from 'umi';
import { useIntl } from 'umi';
import { Form, Button, Table, Select, DatePicker, Input } from 'antd';
import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
import { SearchOutlined } from '@ant-design/icons';
@ -177,4 +177,4 @@ const CooperateEnterprise: React.FC = () => {
);
};
export default connect()(CooperateEnterprise);
export default CooperateEnterprise;

View File

@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
import { connect, useIntl } from 'umi';
import { useIntl } from 'umi';
import { Form, Button, Table, Select, DatePicker, TreeSelect } from 'antd';
import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
import { SearchOutlined } from '@ant-design/icons';
@ -158,4 +158,4 @@ const CooperateEnterprise: React.FC = () => {
);
};
export default connect()(CooperateEnterprise);
export default CooperateEnterprise;

View File

@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
import { connect, useIntl } from 'umi';
import { useIntl } from 'umi';
import { Form, Button, Table, Select, Input } from 'antd';
import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
import { SearchOutlined } from '@ant-design/icons';
@ -149,4 +149,4 @@ const CooperateEnterprise: React.FC = () => {
);
};
export default connect()(CooperateEnterprise);
export default CooperateEnterprise;

View File

@ -3,7 +3,6 @@ import React, { useEffect, useState } from "react";
import { Form, Button, Table, Select, Input, Space, DatePicker, message } from "antd";
import { SearchOutlined, ReloadOutlined } from "@ant-design/icons";
// umi相关
import { connect } from 'umi';
import { mockList } from './services'
// 下拉数据接口
@ -211,4 +210,4 @@ const CategoryLibraryManage: React.FC = () => {
);
};
export default connect()(CategoryLibraryManage);
export default CategoryLibraryManage;

View File

@ -5,7 +5,6 @@ import { SearchOutlined, ReloadOutlined, PlusOutlined } from '@ant-design/icons'
// 类型定义
import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
// umi 相关
import { connect } from 'umi';
// 弹窗组件
import CategoryAddModal from './components/CategoryAddModal';
import SupplierAddModal from './components/SupplierAddModal';
@ -234,4 +233,4 @@ const CategoryManage: React.FC = () => {
);
};
export default connect()(CategoryManage);
export default CategoryManage;

View File

@ -1,7 +1,6 @@
import React, { useEffect, useState } from "react";
import { Form, Button, Table, Select, Input, Space, DatePicker, message } from "antd";
import { SearchOutlined, ReloadOutlined } from "@ant-design/icons";
import { connect } from 'umi';
import ApproveRecordModal from './components/ApproveRecordModal'
@ -322,4 +321,4 @@ const SupplierEntryManage: React.FC = () => {
);
};
export default connect()(SupplierEntryManage);
export default SupplierEntryManage;

View File

@ -1,7 +1,6 @@
import React, { useEffect, useState } from "react";
import { Form, Button, Table, Select, Input, Space, DatePicker, message } from "antd";
import { SearchOutlined, ReloadOutlined } from "@ant-design/icons";
import { connect } from 'umi';
import ApproveRecordModal from './components/ApproveRecordModal'
@ -322,4 +321,4 @@ const SupplierEntryReview: React.FC = () => {
);
};
export default connect()(SupplierEntryReview);
export default SupplierEntryReview;

View File

@ -4,7 +4,7 @@ import { Modal, Form, Input, Button, Table, message, Tooltip } from "antd";
//类型定义
import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
//umi 相关
import { connect, useIntl } from 'umi';
import { useIntl } from 'umi';
//本地服务/接口
import { supplierDetail } from '../services';
//本地组件
@ -176,4 +176,4 @@ const SupplierAccessDetailModal: React.FC<SupplierAccessDetailModalProps> = ({ v
);
};
export default connect()(SupplierAccessDetailModal);
export default SupplierAccessDetailModal;

View File

@ -5,7 +5,6 @@ import { SearchOutlined, DownloadOutlined, ReloadOutlined } from '@ant-design/ic
//类型定义
import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
//umi 相关
import { connect } from 'umi';
//本地组件、弹窗、业务逻辑
import SupplierViewModal from './components/SupplierViewModal';
import SupplierDetailModal from './components/SupplierDetailModal';
@ -291,4 +290,4 @@ const groupQualifiedSupplierQuery: React.FC = () => {
);
};
export default connect()(groupQualifiedSupplierQuery);
export default groupQualifiedSupplierQuery;

View File

@ -4,7 +4,7 @@ import { Modal, Form, Input, Button, Table, message, Tooltip } from "antd";
//类型定义
import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
//umi 相关
import { connect, useIntl } from 'umi';
import { useIntl } from 'umi';
//本地服务/接口
import { supplierDetail } from '../services';
//本地组件
@ -176,4 +176,4 @@ const SupplierAccessDetailModal: React.FC<SupplierAccessDetailModalProps> = ({ v
);
};
export default connect()(SupplierAccessDetailModal);
export default SupplierAccessDetailModal;

View File

@ -5,7 +5,6 @@ import { SearchOutlined, DownloadOutlined, ReloadOutlined } from '@ant-design/ic
//类型定义
import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
//umi 相关
import { connect } from 'umi';
//本地组件、弹窗、业务逻辑
import SupplierViewModal from './components/SupplierViewModal';
import SupplierDetailModal from './components/SupplierDetailModal';
@ -229,4 +228,4 @@ const mySupplierInquiry: React.FC = () => {
);
};
export default connect()(mySupplierInquiry);
export default mySupplierInquiry;

View File

@ -4,7 +4,7 @@ import { Modal, Form, Input, Button, Table, message, Tooltip } from "antd";
//类型定义
import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
//umi 相关
import { connect, useIntl } from 'umi';
import { useIntl } from 'umi';
//本地服务/接口
import { supplierDetail } from '../services';
@ -157,4 +157,4 @@ const SupplierAccessDetailModal: React.FC<SupplierAccessDetailModalProps> = ({ v
);
};
export default connect()(SupplierAccessDetailModal);
export default SupplierAccessDetailModal;

View File

@ -5,7 +5,7 @@ import { SearchOutlined } from '@ant-design/icons';
//类型定义
import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
//umi 相关
import { connect, useIntl } from 'umi';
import { useIntl } from 'umi';
//本地组件、弹窗、业务逻辑
import SupplierViewModal from './components/SupplierViewModal';
import SupplierDetailModal from './components/SupplierDetailModal';
@ -221,4 +221,4 @@ const RegistrationQuery: React.FC = () => {
</>
);
};
export default connect()(RegistrationQuery);
export default RegistrationQuery;