liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

9.27 标的类型展示支持多个展示

Browse Source
This commit is contained in:
jl-zhoujl2
2022-09-27 15:31:15 +08:00
parent b431e82647
commit 566ebae68b
14 changed files with 589 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/Project/EntrustAssign/manager/index.tsx
View File

@ -1,7 +1,7 @@
import React, { useState, useRef, useEffect } from 'react';
import { message, Modal, Col, Input, Form, Row, PageHeader, TreeSelect, Button, Spin, Upload } from 'antd';
import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table';
import { proTableValueEnum, returnDictVal } from '@/utils/CommonUtils';
import { multipleTypeTransform, proTableValueEnum, returnDictVal } from '@/utils/CommonUtils';
import { getPage, agreeEntrust, queryEntrust, recallEntrust, refuseEntrust, aginstEntrust, assignEntrust, queryTree } from './service';
import './styles.less';
import { getDicData, getSessionUserData } from '@/utils/session';
@ -186,7 +186,7 @@ const entrust: React.FC<{}> = () => {
{ title: '方案编号', dataIndex: 'projectNumber', width: '10%', search: false },
{ title: '接收时间', dataIndex: 'createDate', width: '10%', valueType: 'dateTime', search: false },
{ title: '采购方式', dataIndex: 'procurementMode', width: '10%', valueEnum: proTableValueEnum(dictData['procurement_mode=entrust']) },
{ title: '标的类型', dataIndex: 'procurementType', width: '10%', hideInTable: typeVisible, search: false, valueEnum: proTableValueEnum(dictData['procurement_type=entrust']) },
{ title: '标的类型', dataIndex: 'procurementType', width: '10%', hideInTable: typeVisible, search: false, render: (_, record) => multipleTypeTransform(record.procurementType, proTableValueEnum(dictData['procurement_type=entrust'])) },
{
title: '状态', dataIndex: 'status', width: '10%',
valueEnum: {

4
src/pages/Project/EntrustAssign/operator/index.tsx
View File

@ -1,7 +1,7 @@
import React, { useState, useRef, useEffect } from 'react';
import { message, Modal, Col, Input, Form, Row, PageHeader, Button, Spin, Upload } from 'antd';
import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table';
import { proTableValueEnum, returnDictVal } from '@/utils/CommonUtils';
import { multipleTypeTransform, proTableValueEnum, returnDictVal } from '@/utils/CommonUtils';
import { getPage, agreeEntrust, queryEntrust, recallEntrust, refuseEntrust, aginstEntrust } from './service';
import './styles.less';
import { getDicData, getSessionUserData } from '@/utils/session';
@ -155,7 +155,7 @@ const entrust: React.FC<{}> = () => {
{ title: '方案编号', dataIndex: 'projectNumber', width: '6%', search: false },
{ title: '接收时间', dataIndex: 'createDate', width: '10%', valueType: 'dateTime', search: false },
{ title: '采购方式', dataIndex: 'procurementMode', width: '6%', valueEnum: proTableValueEnum(dictData['procurement_mode=entrust']) },
{ title: '标的类型', dataIndex: 'procurementType', width: '5%', hideInTable: typeVisible, search: false, valueEnum: proTableValueEnum(dictData['procurement_type=entrust']) },
{ title: '标的类型', dataIndex: 'procurementType', width: '5%', hideInTable: typeVisible, search: false, render: (_, record) => multipleTypeTransform(record.procurementType, proTableValueEnum(dictData['procurement_type=entrust'])) },
{
title: '状态', dataIndex: 'status', width: '4%',
valueEnum: {

4
src/pages/Project/EntrustWithdraw/index.tsx
View File

@ -1,7 +1,7 @@
import React, { useState, useRef, useEffect } from 'react';
import { Modal, Col, Input, Form, Row, PageHeader, Button, Spin, Upload } from 'antd';
import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table';
import { proTableValueEnum, returnDictVal } from '@/utils/CommonUtils';
import { multipleTypeTransform, proTableValueEnum, returnDictVal } from '@/utils/CommonUtils';
import { getPage, queryEntrust } from './service';
import './styles.less';
import { getDicData, getSessionRoleData, getSessionUserData } from '@/utils/session';
@ -47,7 +47,7 @@ const entrust: React.FC<{}> = () => {
{ title: '接收时间', dataIndex: 'receiveTime', width: '10%', valueType: 'dateTime', search: false },
{ title: '撤回时间', dataIndex: 'createDate', width: '10%', valueType: 'dateTime', search: false },
{ title: '采购方式', dataIndex: 'procurementMode', width: '6%', valueEnum: proTableValueEnum(dictData['procurement_mode=entrust']) },
{ title: '标的类型', dataIndex: 'procurementType', width: '5%', search: false, valueEnum: proTableValueEnum(dictData['procurement_type=entrust']) },
{ title: '标的类型', dataIndex: 'procurementType', width: '5%', search: false, render: (_, record) => multipleTypeTransform(record.procurementType, proTableValueEnum(dictData['procurement_type=entrust'])) },
{
title: '操作', width: '4%',
valueType: 'option',

4
src/pages/Project/ProjectManage/Examination/components/ProjectManage.tsx
View File

@ -1,4 +1,4 @@
import { getUrlRelativePath, isEmpty, isNotEmpty, proTableValueEnum } from '@/utils/CommonUtils';
import { getUrlRelativePath, isEmpty, isNotEmpty, multipleTypeTransform, proTableValueEnum } from '@/utils/CommonUtils';
import { followUpAProjectManager, getDicData, setPurchaseCanOperate } from '@/utils/session';
import ProTable, { ProColumns } from '@ant-design/pro-table';
import { Button, Spin } from 'antd';
@ -78,7 +78,7 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
dataIndex: 'procurementType',
width: '5%',
search: false,
valueEnum: proTableValueEnum(dictData[procurementTypeEntrust]),
render: (_, record) => multipleTypeTransform(record.procurementType, proTableValueEnum(dictData[procurementTypeEntrust])),
},
{
title: '所属区域',

4
src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx
View File

@ -1,6 +1,6 @@
import React, { useState } from 'react';
import { queryingPagingData } from '@/utils/PageUtils';
import { getDictNameByVal, getProjectTypeCode, getURLInformation, getUrlParam, getUrlRelativePath, isEmpty, isNotEmpty, proTableValueEnumOther } from '@/utils/CommonUtils';
import { getDictNameByVal, getProjectTypeCode, getURLInformation, getUrlParam, getUrlRelativePath, isEmpty, isNotEmpty, multipleTypeTransform, proTableValueEnum, proTableValueEnumOther } from '@/utils/CommonUtils';
import { useHistory } from 'umi';
import { followUpAProjectManager, getDicData, projectDataItem, getSessionUserData } from '@/utils/session';
import ExceptionHandling from './ExceptionHandling/ExceptionHandling';
@ -86,7 +86,7 @@ const ProjectDocumentation: React.FC = () => {
</>
</Col>
<Col span={4}>
标的类型：{getDictNameByVal(dictData[procurementTypeEntrust], record.procurementType)} <br />
标的类型：{multipleTypeTransform(record.procurementType, proTableValueEnum(dictData[procurementTypeEntrust]))} <br />
</Col>
<Col span={4}>
{

4
src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod7.tsx
View File

@ -7,7 +7,7 @@ import { ProcurementMethodItem, updateUtils } from '../utils';
import { getId7 } from '../service';
import ProTable from '@ant-design/pro-table';
import { getDicData } from '@/utils/session';
import { getDictName, isEmpty } from '@/utils/CommonUtils';
import { getDictName, isEmpty, multipleTypeTransform, proTableValueEnum } from '@/utils/CommonUtils';
const { Option } = Select;
@ -77,7 +77,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
//组织方式字典项
data.bidOrgDict = getDictName(dictData['organization=entrust'], data.bidOrgDict);
//采购类型字典项
data.procurementType = getDictName(dictData['procurement_type=entrust'], data.procurementType);
data.procurementType = multipleTypeTransform(data.procurementType, proTableValueEnum(dictData['procurement_type=entrust']));
form.setFieldsValue(data);
}
})

4
src/pages/Project/ProjectManage/ProjectManager/PurchasingManagerEnquiries/components/PurchasingManagerEnquiries.tsx
View File

@ -7,7 +7,7 @@
* @FilePath: \ebtp-cloud-frontend\src\pages\Project\ProjectManage\ProjectManager\PurchasingManagerEnquiries\index.tsx
*/
import { getURLInformation, getUrlParam, getUrlRelativePath, isEmpty, isNotEmpty, proTableValueEnum } from '@/utils/CommonUtils';
import { getURLInformation, getUrlParam, getUrlRelativePath, isEmpty, isNotEmpty, multipleTypeTransform, proTableValueEnum } from '@/utils/CommonUtils';
import { queryingPagingData } from '@/utils/PageUtils';
import { followUpAProjectManager, getDicData, setPurchaseCanOperate, getSessionUserData } from '@/utils/session';
import ProTable, { ProColumns } from '@ant-design/pro-table';
@ -78,7 +78,7 @@ const PurchasingManagerEnquiries: React.FC = () => {
dataIndex: 'procurementType',
width: '8%',
search: false,
valueEnum: proTableValueEnum(dictData[procurementTypeEntrust]),
render: (_, record) => multipleTypeTransform(record.procurementType, proTableValueEnum(dictData[procurementTypeEntrust])),
},
{
title: '所属区域',

4
src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx
View File

@ -1,4 +1,4 @@
import { getUrlRelativePath, isEmpty, isNotEmpty, proTableValueEnum } from '@/utils/CommonUtils';
import { getUrlRelativePath, isEmpty, isNotEmpty, multipleTypeTransform, proTableValueEnum } from '@/utils/CommonUtils';
import { followUpAProjectManager, getDicData, setPurchaseCanOperate } from '@/utils/session';
import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
import { Button, message, Popconfirm, Spin, Space, Tag } from 'antd';
@ -98,7 +98,7 @@ const FavoritesList: React.FC<FavoritesListProps> = (props) => {
dataIndex: 'procurementType',
width: '5%',
search: false,
valueEnum: proTableValueEnum(dictData[procurementTypeEntrust]),
render: (_, record) => multipleTypeTransform(record.procurementType, proTableValueEnum(dictData[procurementTypeEntrust])),
},
{
title: '所属区域',

4
src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx
View File

@ -1,4 +1,4 @@
import { getUrlRelativePath, isEmpty, isNotEmpty, proTableValueEnum } from '@/utils/CommonUtils';
import { getUrlRelativePath, isEmpty, isNotEmpty, multipleTypeTransform, proTableValueEnum } from '@/utils/CommonUtils';
import { followUpAProjectManager, getDicData, setPurchaseCanOperate } from '@/utils/session';
import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
import { Button, message, Space, Spin, Tag } from 'antd';
@ -84,7 +84,7 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
dataIndex: 'procurementType',
width: '5%',
search: false,
valueEnum: proTableValueEnum(dictData[procurementTypeEntrust]),
render: (_, record) => multipleTypeTransform(record.procurementType, proTableValueEnum(dictData[procurementTypeEntrust])),
},
{
title: '所属区域',

6
src/pages/Tender/ProjectsInvolved/index.tsx
View File

@ -7,7 +7,7 @@ import { getProMethod,getSessionUserData } from '@/utils/session';
import '@/assets/ld_style.less';
import { history } from 'umi';
import { followUpAProjectSupplier, getDicData } from '@/utils/session';
import { getDictName, getProjectTypeCode, getURLInformation, getUrlParam, getUrlRelativePath, isEmpty, isNotEmpty, proTableValueEnum, proTableValueEnumOther } from '@/utils/CommonUtils';
import { getDictName, getProjectTypeCode, getURLInformation, getUrlParam, getUrlRelativePath, isEmpty, isNotEmpty, multipleTypeTransform, proTableValueEnum, proTableValueEnumOther } from '@/utils/CommonUtils';
import { btnAuthority } from '@/utils/authority';
import kefu from '@/assets/img/kefu.png' //智慧客服
import { submitHiddenForm, createHiddenForm } from '@/utils/CustomerService' //智慧客服
@ -145,9 +145,9 @@ const Index: React.FC<{}> = () => {
{
title: '项目分类',
dataIndex: 'procurementType',
valueEnum: proTableValueEnum(dictData['procurement_type=entrust']),
search: false,
width: '5%'
width: '5%',
render: (_: any, record: any) => multipleTypeTransform(record.procurementType, proTableValueEnum(dictData['procurement_type=entrust'])),
},
{
title: '所属区域',

6
src/pages/Tender/supplier/InvitationLetter/components/InvitationLetter.tsx
View File

@ -7,7 +7,7 @@ import '@/utils/lq.style.less';
import { downloadAttachmentPath } from '@/utils/DownloadUtils';
import { getNoticeInfo } from '../../LookingForBusinessOpportunities/service';
import { getDicData, getSessionUserData } from '@/utils/session';
import { getBidMethodDictTypeCode, getProjectTypeCode, getURLInformation, isNotEmpty, proTableValueEnum, proTableValueEnumOther } from '@/utils/CommonUtils';
import { getBidMethodDictTypeCode, getProjectTypeCode, getURLInformation, isNotEmpty, multipleTypeTransform, proTableValueEnum, proTableValueEnumOther } from '@/utils/CommonUtils';
import Weboffice from "@/pages/webOffice/weboffice";
import { queryingPagingData } from '@/utils/PageUtils';
import ExtendUpload from '@/utils/ExtendUpload';
@ -144,7 +144,7 @@ const LookingForBusinessOpportunitiesList: React.FC = () => {
label: '项目分类',
paraName: 'procurementType',
isEncode: false,
paraVal:record.procurementType=='procurement_type_1'?'货物':record.procurementType=='procurement_type_2'?'工程':record.procurementType=='procurement_type_3'?'服务':record.procurementType=='procurement_type_4'?'其他':'-',
paraVal: multipleTypeTransform(record.procurementType, proTableValueEnum(dictData[procurementTypeEntrust])),
},
{
label: '所属区域',
@ -224,7 +224,7 @@ const LookingForBusinessOpportunitiesList: React.FC = () => {
dataIndex: 'procurementType',
width: '8%',
search: false,
valueEnum: proTableValueEnum(dictData[procurementTypeEntrust])
render: (_: any, record: any) => multipleTypeTransform(record.procurementType, proTableValueEnum(dictData[procurementTypeEntrust])),
},
{
title: '所属区域',

4
src/pages/Tender/supplier/LookingForBusinessOpportunities/components/LookingForBusinessOpportunitiesList.tsx
View File

@ -12,7 +12,7 @@ import {
import '@/utils/lq.style.less';
import { downloadAttachmentPath } from '@/utils/DownloadUtils';
import { getDicData, getSessionUserData } from '@/utils/session';
import { proTableValueEnum, getURLInformation, isNotEmpty, proTableValueEnumOther, getProjectTypeCode, getBidMethodDictTypeCode, getDictName } from '@/utils/CommonUtils';
import { proTableValueEnum, getURLInformation, isNotEmpty, proTableValueEnumOther, getProjectTypeCode, getBidMethodDictTypeCode, getDictName, multipleTypeTransform } from '@/utils/CommonUtils';
import Weboffice from "@/pages/webOffice/weboffice";
import { queryingPagingData } from '@/utils/PageUtils';
import ExtendUpload from '@/utils/ExtendUpload';
@ -271,8 +271,8 @@ const LookingForBusinessOpportunitiesList: React.FC<{}> = () => {
title: '项目分类',
dataIndex: 'procurementType',
width: '5%',
valueEnum: proTableValueEnum(dictData[procurementTypeEntrust]),
search: false,
render: (_: any, record: any) => multipleTypeTransform(record.procurementType, proTableValueEnum(dictData[procurementTypeEntrust])),
},
{
title: '所属区域',

3
src/pages/Tender/supplier/LookingForBusinessOpportunities/service.ts
View File

@ -7,7 +7,6 @@
* @Description: In User Settings Edit
* @FilePath: \ebtp-cloud-frontend\src\pages\LookingForBusinessOpportunities\service.ts
*/
import { isEmpty } from '@/utils/CommonUtils';
import request from '@/utils/request';
/**
* 我要参与 保存
@ -30,7 +29,6 @@ export async function participationSaveOther(data: any) {
}
/**
* 寻找商机
* @param procurementType
* @param data
*/
export function lookingForBussiness(data: any) {
@ -55,7 +53,6 @@ export function lookingForBussiness(data: any) {
}
/**
* 寻找商机 招募专用
* @param procurementType
* @param data
*/
export function lookingForBussinessOther(data: any) {

9
src/utils/CommonUtils.ts
View File

@ -50,6 +50,15 @@ export function returnDictVal(data: any, value: any) {
}
return val;
}
/**
* procurementType标的类型转换多个 20220927
*/
export function multipleTypeTransform(value: string | null | undefined, valueEnum: any): string {
if (valueEnum && value) {
return value.split(",").map(item => valueEnum[item].text).join();
}
return "-";
}
/**
* 获取url路径信息