From 2f84b7e3ca547afcdea93589ce8497b468fd6325 Mon Sep 17 00:00:00 2001 From: houjishuang <46269784@qq.com> Date: Wed, 28 May 2025 17:22:27 +0800 Subject: [PATCH 1/4] yemiankaifajiekou --- config/proxy.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/proxy.ts b/config/proxy.ts index 45c60ae..de8b9ad 100644 --- a/config/proxy.ts +++ b/config/proxy.ts @@ -43,6 +43,12 @@ export default { changeOrigin: true, pathRewrite: { '/api/biz-service-ebtp-agency': '' }, }, + '/api/biz-supplier-manage': { + target: 'http://localhost:18096', + changeOrigin: true, + pathRewrite: { '/api/biz-supplier-manage': '' }, + } + // '/api/wfap/v1/audit/bill/find/by/procid': { // target: 'http://10.242.31.158:8891/',//审批单 uat环境自动审批，暂时用不到 // changeOrigin: true, From c51d11a174f5f035cc67eaccc844e4fb1b00d446 Mon Sep 17 00:00:00 2001 From: houjishuang <46269784@qq.com> Date: Wed, 28 May 2025 17:22:38 +0800 Subject: [PATCH 2/4] w --- .../components/SelectProvider.tsx | 71 ++++++++++--------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/src/pages/Agency/AgencyManager/components/SelectProvider.tsx b/src/pages/Agency/AgencyManager/components/SelectProvider.tsx index bf61904..40c3e25 100644 --- a/src/pages/Agency/AgencyManager/components/SelectProvider.tsx +++ b/src/pages/Agency/AgencyManager/components/SelectProvider.tsx @@ -1,12 +1,18 @@ import React, { useState, useRef } from 'react'; import { message, Modal, Input, Form, PageHeader, Button, Spin, Select, Tree } from 'antd'; import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table'; -import { getPage, getDataById, deleteAgency, addAgency, updateAgency,disableAgency } from './service'; +import { getProviderToAgencyPage } from '../service'; // import './styles.less'; import { getDicData } from '@/utils/session'; import TextArea from 'antd/lib/input/TextArea'; -const selectProvider: React.FC<{}> = () => { +interface SelectProviderProps { + onSelect?: (record: any) => void; + visible?: boolean; + onCancel?: () => void; +} + +const SelectProvider: React.FC = ({ onSelect, visible = false, onCancel }) => { //获取字典 const getDict: any = getDicData(); const [form] = Form.useForm(); @@ -38,18 +44,19 @@ const selectProvider: React.FC<{}> = () => { //委托列表 const columns: ProColumns[] = [ { title: '序号', valueType: 'index', width: 50, search: false, }, - { title: '供应商名称', dataIndex: 'providerName', },//, ellipsis: true - { title: '供应商分类', dataIndex: 'roleName', + { title: '供应商名称', dataIndex: 'name', },//, ellipsis: true + { title: '供应商分类code', dataIndex: 'kindCode', hideInTable:true, valueEnum: { 'EBTP': { text: '招标采购中心', status: 'EBTP' }, }, + }, + { title: '供应商分类', dataIndex: 'kindName', + },//, ellipsis: true//, ellipsis: true - { title: '品类', dataIndex: 'roleName', }, - { title: '准入时间', dataIndex: 'roleName', },//, ellipsis: true - { title: '准入人', dataIndex: 'roleName', search: false, hideInTable:true,},//, ellipsis: true - { title: '失效时间', dataIndex: 'roleName', search: false,},//, ellipsis: true - { title: '状态', dataIndex: 'status', },//, ellipsis: true + { title: '品类', dataIndex: 'goodsTypeName', }, + { title: '准入时间', dataIndex: 'accessTime', },//, ellipsis: true + { title: '准入人', dataIndex: 'accessUser', search: false, hideInTable:true,},//, ellipsis: true + { title: '状态', dataIndex: 'agent', },//, ellipsis: true { title: 'id', dataIndex: 'id', search: false,hideInTable:true,},//, ellipsis: true - { title: 'providerId', dataIndex: 'providerId', search: false,hideInTable:true,}, // { title: '创建时间', dataIndex: 'createDate', width: '10%', valueType: 'dateTime', search: false }, { @@ -62,19 +69,17 @@ const selectProvider: React.FC<{}> = () => { ] }, ]; - // 删除操作 - const handleSelect = (id: string) => { + // 选择供应商 + const handleSelect = (record: any) => { Modal.confirm({ title: '确认选择该供应商？', onOk: async () => { - await deleteAgency(id).then((r: any) => { - if (r?.code == 200) { - message.success('删除成功'); - } else { - message.error('删除失败'); - } - }) - .finally(() => actionRef.current?.reload()); + // 调用父组件传入的onSelect回调，传递选中的供应商数据 + if (onSelect) { + onSelect(record); + message.success('已选择供应商'); + // 如果需要关闭弹窗，可以在这里添加关闭逻辑 + } }, }); }; @@ -84,9 +89,15 @@ const selectProvider: React.FC<{}> = () => { return ( - - -
+ + +
actionRef={actionRef}//action触发后更新表格 columns={columns}//表格 @@ -96,9 +107,9 @@ const selectProvider: React.FC<{}> = () => { size='small' search={{ labelWidth: 'auto', span: 6 }} request={(params) => - getPage({ + getProviderToAgencyPage({ ...params, - basePageRequest: { pageNo: pageData.pageNo, pageSize: pageData.pageSize }, + pageNo: pageData.pageNo, pageSize: pageData.pageSize , }).then((res) => { const result = { data: res.data.records, @@ -110,12 +121,7 @@ const selectProvider: React.FC<{}> = () => { return result; }) } - toolBarRender={() => [ - , - ] - } + pagination={{ defaultPageSize: 10, showSizeChanger: false, @@ -128,6 +134,7 @@ const selectProvider: React.FC<{}> = () => {
{/* 查看 */} + ) }; -export default selectProvider; \ No newline at end of file +export default SelectProvider; \ No newline at end of file From 9c28c833911bcfc3d3cc6513b8da663e8304d5d5 Mon Sep 17 00:00:00 2001 From: houjishuang <46269784@qq.com> Date: Wed, 28 May 2025 17:22:45 +0800 Subject: [PATCH 3/4] w --- src/pages/Agency/AgencyManager/index.tsx | 221 ++++++++++++++--------- 1 file changed, 136 insertions(+), 85 deletions(-) diff --git a/src/pages/Agency/AgencyManager/index.tsx b/src/pages/Agency/AgencyManager/index.tsx index b693adf..b139694 100644 --- a/src/pages/Agency/AgencyManager/index.tsx +++ b/src/pages/Agency/AgencyManager/index.tsx @@ -1,10 +1,11 @@ import React, { useState, useRef } from 'react'; -import { message, Modal, Input, Form, PageHeader, Button, Spin, Select, Tree } from 'antd'; +import {Radio, message, Modal, Input, Form, PageHeader, Button, Spin, Select, Tree, DatePicker } from 'antd'; import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table'; import { getPage, getDataById, deleteAgency, addAgency, updateAgency,disableAgency } from './service'; // import './styles.less'; import { getDicData } from '@/utils/session'; import TextArea from 'antd/lib/input/TextArea'; +import SelectProvider from './components/SelectProvider'; const agency: React.FC<{}> = () => { //获取字典 @@ -18,6 +19,9 @@ const agency: React.FC<{}> = () => { const dictData = JSON.parse(getDict); const actionRef = useRef(); const [spin, spinSet] = useState(false); + const [selectProviderVisible, setSelectProviderVisible] = useState(false); + const [currentRecord, setCurrentRecord] = useState(null); + const [showEndDate, setShowEndDate] = useState(false); //查询分页数据 const [pageData, pageDataSet] = useState({ pageNo: 1, @@ -56,7 +60,9 @@ const agency: React.FC<{}> = () => { , , , - + ] }, @@ -64,7 +70,7 @@ const agency: React.FC<{}> = () => { // 删除操作 const handleDelete = (id: string) => { Modal.confirm({ - title: '确认删除该角色？', + title: '确认删除该代理机构？', onOk: async () => { await deleteAgency(id).then((r: any) => { if (r?.code == 200) { @@ -77,67 +83,33 @@ const agency: React.FC<{}> = () => { }, }); }; - const handleAdd = async () => { + const handleAdd = async (record: any) => { form.resetFields(); - // const menus = await menuTreeselect(); - // setMenuOptions(menus.data || []); - // setMenuOptions(menu || []); - - // 使用时转换 - setMenuOptions(formatMenuOptions(menu) || []); + form.setFieldsValue({ + ...record, + providerId: record.id + }); + setOpen(true); - setTitle('添加角色'); + setTitle('添加招标代理机构'); }; const [menuOptions, setMenuOptions] = useState([]); - let menu = [{ - "id": '1', "parentId": '0', "label": "系统管理", "weight": 1, - "children": [{ - "id": '101', "parentId": '1', "label": "角色管理", "weight": 2, - "children": [{ "id": '1008', "parentId": '101', "label": "角色查询", "weight": 1 }, - { "id": '1009', "parentId": '101', "label": "角色新增", "weight": 2 }, - { "id": '1010', "parentId": '101', "label": "角色修改", "weight": 3 }, - { "id": '1011', "parentId": '101', "label": "角色删除", "weight": 4 }, - { "id": '1012', "parentId": '101', "label": "角色导出", "weight": 5 }] - }, - { - "id": '105', "parentId": '1', "label": "字典管理", "weight": 6, - "children": [{ "id": '1026', "parentId": '105', "label": "字典查询", "weight": 1 }, - { "id": '1027', "parentId": '105', "label": "字典新增", "weight": 2 }, - { "id": '1028', "parentId": '105', "label": "字典修改", "weight": 3 }, - { "id": '1029', "parentId": '105', "label": "字典删除", "weight": 4 }, - { "id": '1030', "parentId": '105', "label": "字典导出", "weight": 5 }] - }] - }, - { "id": '4', "parentId": '0', "label": "PLUS官网", "weight": 4 }, - { - "id": "1494925781048545281", "parentId": '0', "label": "个人待办", "weight": 18, - "children": [{ "id": "1494926258733633538", "parentId": "1494925781048545281", "label": "待办任务", "weight": 1 }, - { "id": "1494926586677874690", "parentId": "1494925781048545281", "label": "已办任务", "weight": 2 }] - }]; - const formatMenuOptions = (data: any[]) => { - return data.map(item => ({ - title: item.label, - key: item.id, - children: item.children ? formatMenuOptions(item.children) : undefined, - })); - }; + + const handleUpdate = async (record: any) => { form.resetFields(); - const role = await getDataById(record.roleId); + const agencyDetail = await getDataById(record.id); // const menus = await roleMenuTreeselect(record.roleId); // setMenuOptions(menus.data.menus || []); - setMenuOptions(formatMenuOptions(menu) || []); - setCheckedKeys(role.data.menuIds || []); + form.setFieldsValue({ - ...role.data, - menuIds: role.data.menuIds || [], + ...agencyDetail.data }); - // form.setFieldsValue(role.data); - setCurrentRoleId(record.roleId); + setOpen(true); - setTitle('修改角色'); + setTitle('修改代理机构'); }; const closeModal = async () => { @@ -185,40 +157,98 @@ const agency: React.FC<{}> = () => { onOk={handleSubmit} onCancel={() => closeModal()} > + + + +
+ +
+ 供应商名称： + {currentRecord?.name || '-'} +
+ +
+ 供应商类型名称： + {currentRecord?.kindName || '-'} +
+
+ 准入时间： + {currentRecord?.accessTime || '-'} +
+
+ 商品品类： + {currentRecord?.goodsTypeName || '-'} +
+ +
+ +
+
+ 姓名： + {currentRecord?.applyUser || '-'} +
+
+ 工号： + {currentRecord?.name || '-'} +
+
+ 角色： + {currentRecord?.kindCode || '-'} +
+
+ 公司： + {currentRecord?.kindName || '-'} +
+
+ 部门： + {currentRecord?.goodsTypeCode || '-'} +
+ +
-