diff --git a/config/config.dev.ts b/config/config.dev.ts
index b3c99d7..992a7cf 100644
--- a/config/config.dev.ts
+++ b/config/config.dev.ts
@@ -6,6 +6,6 @@ export default defineConfig({
UPLOAD_URL: '/upload',
REQUEST_BASE: '/api',
// 下载文件时用到,直接window.open 拼上接口地址+参数
- SERVER_BASE: 'http://10.0.0.10:18012',
+ SERVER_BASE: 'http://10.0.0.125:18012',
},
});
diff --git a/config/proxy.ts b/config/proxy.ts
index 97dba59..7c42911 100644
--- a/config/proxy.ts
+++ b/config/proxy.ts
@@ -23,10 +23,20 @@ export default {
},
},
prod: {
+ '/api/v1/*': {
+ target: 'http://10.0.0.125:18030',//
+ changeOrigin: true,
+ pathRewrite: { '^/api/v1': '/v1' },
+ },
'/api/*': {
- target: 'http://uscm.unicom.local:18022',//
+ target: 'http://10.0.0.125:18012',//
changeOrigin: true,
pathRewrite: { '^': '' },
},
+ '/upload/*': {
+ target: 'http://10.0.0.125:18012',//
+ changeOrigin: true,
+ pathRewrite: { '^/upload': '' },
+ },
}
};
diff --git a/src/locales/zh-CN/menu.ts b/src/locales/zh-CN/menu.ts
index fcef2b6..87daf94 100644
--- a/src/locales/zh-CN/menu.ts
+++ b/src/locales/zh-CN/menu.ts
@@ -78,8 +78,8 @@ export default {
'menu.supplierBlacklist': '供应商黑名单管理',
'menu.blacklistManage': '供应商黑名单管理',
'menu.blacklistAudit': '供应商黑名单审批管理',
- 'menu.supplierExit': '供应商黑名单管理',
- 'menu.supplierExitManage': '供应商黑名单管理',
- 'menu.supplierExitAudit': '供应商黑名单审批管理',
+ 'menu.supplierExit': '供应商退出管理',
+ 'menu.supplierExitManage': '供应商退出管理',
+ 'menu.supplierExitAudit': '供应商退出审批管理',
'menu.supplierMessage': '消息通知',
};
diff --git a/src/pages/supplier/backend/changeProgressInquiry/index.tsx b/src/pages/supplier/backend/changeProgressInquiry/index.tsx
index 3ba2d5c..460127e 100644
--- a/src/pages/supplier/backend/changeProgressInquiry/index.tsx
+++ b/src/pages/supplier/backend/changeProgressInquiry/index.tsx
@@ -7,6 +7,7 @@ import { SearchOutlined, DeleteOutlined } from '@ant-design/icons';
import moment from 'moment';
//查看组件
import DetailView from './components/DetailView';
+import AccessDepartmentSelect from "@/components/AccessDepartmentSelect"
//字典与接口
import { getSupplierChangePage } from './services';
import { getDictList } from '@/servers/api/dicts'
@@ -165,11 +166,7 @@ const CooperateEnterprise: React.FC = () => {
-
+
diff --git a/src/pages/supplier/supplierBlacklist/blacklistManage/components/CreateBlacklistModal.tsx b/src/pages/supplier/supplierBlacklist/blacklistManage/components/CreateBlacklistModal.tsx
index 2a46271..9b14ef1 100644
--- a/src/pages/supplier/supplierBlacklist/blacklistManage/components/CreateBlacklistModal.tsx
+++ b/src/pages/supplier/supplierBlacklist/blacklistManage/components/CreateBlacklistModal.tsx
@@ -146,7 +146,7 @@ const CreateBlacklistModal: React.FC = ({
diff --git a/src/pages/supplier/supplierBlacklist/blacklistManage/components/ViewBlacklistModal.tsx b/src/pages/supplier/supplierBlacklist/blacklistManage/components/ViewBlacklistModal.tsx
index aba6748..9045bf5 100644
--- a/src/pages/supplier/supplierBlacklist/blacklistManage/components/ViewBlacklistModal.tsx
+++ b/src/pages/supplier/supplierBlacklist/blacklistManage/components/ViewBlacklistModal.tsx
@@ -109,7 +109,7 @@ const ViewBlacklistModal: React.FC = ({
return (
= ({
{detail && (
{timelimitMap[detail.timelimitType] || '' }
- {detail.blacklistReason}
+ {detail.blacklistReason}
)}
diff --git a/src/pages/supplier/supplierExit/supplierExitAudit/components/CreateBlacklistModal.tsx b/src/pages/supplier/supplierExit/supplierExitAudit/components/CreateBlacklistModal.tsx
index 0d1e59d..a7bfd1b 100644
--- a/src/pages/supplier/supplierExit/supplierExitAudit/components/CreateBlacklistModal.tsx
+++ b/src/pages/supplier/supplierExit/supplierExitAudit/components/CreateBlacklistModal.tsx
@@ -109,7 +109,7 @@ const CreateBlacklistModal: React.FC = ({
return (
<>
= ({
-
+
diff --git a/src/pages/supplier/supplierExit/supplierExitAudit/components/ViewBlacklistModal.tsx b/src/pages/supplier/supplierExit/supplierExitAudit/components/ViewBlacklistModal.tsx
index 7fda3e7..967c141 100644
--- a/src/pages/supplier/supplierExit/supplierExitAudit/components/ViewBlacklistModal.tsx
+++ b/src/pages/supplier/supplierExit/supplierExitAudit/components/ViewBlacklistModal.tsx
@@ -93,13 +93,13 @@ const ViewBlacklistModal: React.FC = ({
},
{ title: "发起单位", dataIndex: "orgName", 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: "createTime", align: "center", width: 180 },
+ { title: "退出品类", dataIndex: "categoryName", align: "center", ellipsis: true, width: 160 },
+ { title: "退出时间", dataIndex: "createTime", align: "center", width: 180 },
];
return (
= ({
-
+
diff --git a/src/pages/supplier/supplierExit/supplierExitManage/components/CreateBlacklistModal.tsx b/src/pages/supplier/supplierExit/supplierExitManage/components/CreateBlacklistModal.tsx
index 06695b1..0613200 100644
--- a/src/pages/supplier/supplierExit/supplierExitManage/components/CreateBlacklistModal.tsx
+++ b/src/pages/supplier/supplierExit/supplierExitManage/components/CreateBlacklistModal.tsx
@@ -124,7 +124,7 @@ const CreateBlacklistModal: React.FC = ({
return (
<>
= ({
diff --git a/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx b/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx
index 61034f5..ba0e883 100644
--- a/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx
+++ b/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx
@@ -93,13 +93,13 @@ const ViewBlacklistModal: React.FC = ({
},
{ title: "发起单位", dataIndex: "orgName", 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: "createTime", align: "center", width: 180 },
+ { title: "退出品类", dataIndex: "categoryName", align: "center", ellipsis: true, width: 160 },
+ { title: "退出时间", dataIndex: "createTime", align: "center", width: 180 },
];
return (
= ({
-
+