From 9fd38a98eed2fed74dc219fd19c7bf94fb0eb023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=99=AF=E5=AD=A6?= <5412262+sun_jing_xue@user.noreply.gitee.com> Date: Fri, 18 Jul 2025 14:46:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/proxy.ts | 2 +- .../components/GroupLeaderModal.tsx | 2 +- .../supplier/category/CategoryLibraryManage/index.tsx | 9 +++------ .../supplier/category/CategoryLibraryReview/index.tsx | 9 +++------ .../supplier/category/SupplierEntryManage/index.tsx | 11 ++++------- .../supplier/category/SupplierEntryReview/index.tsx | 9 +++------ .../supplier/supplierExit/supplierExitAudit/index.tsx | 4 ++-- .../supplierExit/supplierExitManage/index.tsx | 4 ++-- 8 files changed, 19 insertions(+), 31 deletions(-) diff --git a/config/proxy.ts b/config/proxy.ts index 4e5b100..b2210a3 100644 --- a/config/proxy.ts +++ b/config/proxy.ts @@ -17,7 +17,7 @@ export default { pathRewrite: { '^/api': '' }, }, '/upload': { - target: 'http://10.0.0.10:18013',// + target: 'http://10.0.0.14:18013',// changeOrigin: true, pathRewrite: { '^/upload': '' }, }, diff --git a/src/pages/supplier/admission/admissionReviewManagement/components/GroupLeaderModal.tsx b/src/pages/supplier/admission/admissionReviewManagement/components/GroupLeaderModal.tsx index 27e799b..0a60d4c 100644 --- a/src/pages/supplier/admission/admissionReviewManagement/components/GroupLeaderModal.tsx +++ b/src/pages/supplier/admission/admissionReviewManagement/components/GroupLeaderModal.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react'; import { Modal, Table, Button, Select, Spin, message } from 'antd'; -import { reviewInfo, groupByList, update } from '../services'; +import { reviewInfo, update } from '../services'; import { connect } from 'umi'; import './GroupLeaderModal.less' interface GroupLeaderModalProps { diff --git a/src/pages/supplier/category/CategoryLibraryManage/index.tsx b/src/pages/supplier/category/CategoryLibraryManage/index.tsx index 01c7949..73d17e4 100644 --- a/src/pages/supplier/category/CategoryLibraryManage/index.tsx +++ b/src/pages/supplier/category/CategoryLibraryManage/index.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; // antd 组件 -import { Form, Button, Table, Select, Input } from 'antd'; +import { Form, Button, Table, Input } from 'antd'; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; // 类型定义 import type { ColumnsType, TablePaginationConfig } from 'antd/es/table'; @@ -10,11 +10,11 @@ import CategoryAddModal from './components/CategoryAddModal'; import SupplierAddModal from './components/SupplierAddModal'; import SupplierListModal from './components/SupplierListModal'; import LockManagerModal from './components/LockManagerModal'; +import AccessDepartmentSelect from "@/components/AccessDepartmentSelect" //接口 import { getPage } from './services'; //统一列表分页 import tableProps from '@/utils/tableProps' -const { Option } = Select; // 列表数据接口 interface Data { @@ -187,10 +187,7 @@ const CategoryLibraryManage: React.FC = () => { - + diff --git a/src/pages/supplier/category/CategoryLibraryReview/index.tsx b/src/pages/supplier/category/CategoryLibraryReview/index.tsx index f012f9b..cde61e2 100644 --- a/src/pages/supplier/category/CategoryLibraryReview/index.tsx +++ b/src/pages/supplier/category/CategoryLibraryReview/index.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; // antd 组件 -import { Form, Button, Table, Select, Input, Modal, message, DatePicker } from 'antd'; +import { Form, Button, Table, Input, Modal, message, DatePicker } from 'antd'; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; // 类型定义 import type { ColumnsType, TablePaginationConfig } from 'antd/es/table'; @@ -8,6 +8,7 @@ import type { ColumnsType, TablePaginationConfig } from 'antd/es/table'; import CategoryAddModal from './components/CategoryAddModal'; import ViewModal from './components/ViewModal'; import AccessStatusSelect from '@/components/CommonSelect/AccessStatusSelect'; +import AccessDepartmentSelect from "@/components/AccessDepartmentSelect" //接口与字典 import { getDictList } from '@/servers/api/dicts' import { getPage, approval } from './services'; @@ -16,7 +17,6 @@ import tableProps from '@/utils/tableProps' import moment from 'moment'; const { RangePicker } = DatePicker; -const { Option } = Select; // 列表数据接口 interface Data { @@ -197,10 +197,7 @@ const CategoryLibraryManage: React.FC = () => { - + diff --git a/src/pages/supplier/category/SupplierEntryManage/index.tsx b/src/pages/supplier/category/SupplierEntryManage/index.tsx index ba5bd19..d175bfa 100644 --- a/src/pages/supplier/category/SupplierEntryManage/index.tsx +++ b/src/pages/supplier/category/SupplierEntryManage/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from "react"; // antd 组件 -import { Form, Button, Table, Select, Input } from 'antd'; -import { SearchOutlined, ReloadOutlined, DeleteOutlined } from '@ant-design/icons'; +import { Form, Button, Table, Input } from 'antd'; +import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; // 类型定义 import type { ColumnsType, TablePaginationConfig } from 'antd/es/table'; // 弹窗组件 @@ -9,11 +9,11 @@ import CategoryAddModal from './components/CategoryAddModal'; import SupplierAddModal from './components/SupplierAddModal'; import SupplierListModal from './components/SupplierListModal'; import LockManagerModal from './components/LockManagerModal'; +import AccessDepartmentSelect from "@/components/AccessDepartmentSelect" // 接口 import { getPage } from './services'; //统一列表分页 import tableProps from '@/utils/tableProps' -const { Option } = Select; // 列表数据接口 interface Data { @@ -168,10 +168,7 @@ const SupplierEntryManage: React.FC = () => { - + diff --git a/src/pages/supplier/category/SupplierEntryReview/index.tsx b/src/pages/supplier/category/SupplierEntryReview/index.tsx index c0769e7..1796e10 100644 --- a/src/pages/supplier/category/SupplierEntryReview/index.tsx +++ b/src/pages/supplier/category/SupplierEntryReview/index.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; // antd 组件 -import { Form, Button, Table, Select, Input, Modal, message, DatePicker } from 'antd'; +import { Form, Button, Table, Input, Modal, message, DatePicker } from 'antd'; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; // 类型定义 import type { ColumnsType, TablePaginationConfig } from 'antd/es/table'; @@ -9,6 +9,7 @@ import CategoryAddModal from './components/CategoryAddModal'; import ViewModal from './components/ViewModal'; import moment from 'moment'; import AccessStatusSelect from '@/components/CommonSelect/AccessStatusSelect'; +import AccessDepartmentSelect from "@/components/AccessDepartmentSelect" //接口 import { getPage, approval } from './services'; //统一列表分页 @@ -17,7 +18,6 @@ import tableProps from '@/utils/tableProps' const { RangePicker } = DatePicker; -const { Option } = Select; // 列表数据接口 interface Data { @@ -191,10 +191,7 @@ const CategoryLibraryManage: React.FC = () => { - + diff --git a/src/pages/supplier/supplierExit/supplierExitAudit/index.tsx b/src/pages/supplier/supplierExit/supplierExitAudit/index.tsx index 7a66e83..0a15d1e 100644 --- a/src/pages/supplier/supplierExit/supplierExitAudit/index.tsx +++ b/src/pages/supplier/supplierExit/supplierExitAudit/index.tsx @@ -94,8 +94,8 @@ const supplierExitAudit: React.FC = () => { render: (_: any, __: any, idx: number) => (((pagination.current ?? 1) - 1) * (pagination.pageSize ?? 10)) + idx + 1, }, { title: "申请主题", dataIndex: "exitTheme", key: "exitTheme", align: "left", ellipsis: true }, - { title: "发起单位", dataIndex: "deptId", key: "deptId", align: "center" }, - { title: "发起部门", dataIndex: "deptId", key: "deptId", align: "center" }, + { title: "发起单位", dataIndex: "orgName", key: "orgName", align: "center" }, + { title: "发起部门", dataIndex: "deptName", key: "deptName", align: "center" }, { title: "发起时间", dataIndex: "createTime", key: "createTime", align: "center", width: 180 }, { title: "审批记录状态", dataIndex: "approveStatusText", key: "approveStatusText", align: "center" }, { diff --git a/src/pages/supplier/supplierExit/supplierExitManage/index.tsx b/src/pages/supplier/supplierExit/supplierExitManage/index.tsx index bc76ab3..b98f22a 100644 --- a/src/pages/supplier/supplierExit/supplierExitManage/index.tsx +++ b/src/pages/supplier/supplierExit/supplierExitManage/index.tsx @@ -93,8 +93,8 @@ const supplierExitManage: React.FC = () => { render: (_: any, __: any, idx: number) => (((pagination.current ?? 1) - 1) * (pagination.pageSize ?? 10)) + idx + 1, }, { title: "申请主题", dataIndex: "exitTheme", key: "exitTheme", align: "center" }, - { title: "发起单位", dataIndex: "deptId", key: "deptId", align: "center" }, - { title: "发起部门", dataIndex: "deptId", key: "deptId", align: "center" }, + { title: "发起单位", dataIndex: "orgName", key: "orgName", align: "center" }, + { title: "发起部门", dataIndex: "deptName", key: "deptName", align: "center" }, { title: "发起时间", dataIndex: "createTime", key: "createTime", align: "center" }, { title: "审批记录状态", dataIndex: "approveStatusText", key: "approveStatusText", align: "center" }, {