From aa36a2bf94f3aabd1c1033b5657c662b8db8519d Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Wed, 28 Sep 2022 09:52:13 +0800
Subject: [PATCH] =?UTF-8?q?9.28=20=E4=BF=AE=E6=94=B9procurementTypeDict?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Tender/BiddingResponse/index.tsx             | 4 ++--
 src/pages/Tender/ProjectsInvolved/index.tsx            | 2 +-
 src/pages/ZZhaoMu/Tender/BiddingResponse/TableLook.tsx | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/Tender/BiddingResponse/index.tsx b/src/pages/Tender/BiddingResponse/index.tsx
index 5b1d2d5..035902d 100644
--- a/src/pages/Tender/BiddingResponse/index.tsx
+++ b/src/pages/Tender/BiddingResponse/index.tsx
@@ -4,7 +4,7 @@ import { getPayandreply, getDetail } from './service';
 import '@/assets/ld_style.less';
 import { getProId, getProMethod, getDicData } from '@/utils/session';
 import FileDown from '@/utils/Download';
-import { getURLInformation, proTableValueEnum } from '@/utils/CommonUtils';
+import { getURLInformation, multipleTypeTransform, proTableValueEnum } from '@/utils/CommonUtils';
 import { btnAuthority } from '@/utils/authority';
 import ProTable from '@ant-design/pro-table';
 
@@ -235,7 +235,7 @@ const Index: React.FC<{}> = () => {
     {
       title: bidSectTypeDict,
       dataIndex: 'procurementTypeDict',
-      valueEnum: proTableValueEnum(dictData['procurement_type=entrust']),
+      render: (_: any, record: any) => multipleTypeTransform(record.procurementTypeDict, proTableValueEnum(dictData['procurement_type=entrust'])),
     },
     {
       title: bidcontactName,
diff --git a/src/pages/Tender/ProjectsInvolved/index.tsx b/src/pages/Tender/ProjectsInvolved/index.tsx
index fa9aedd..df01582 100644
--- a/src/pages/Tender/ProjectsInvolved/index.tsx
+++ b/src/pages/Tender/ProjectsInvolved/index.tsx
@@ -193,7 +193,7 @@ const Index: React.FC<{}> = () => {
       dataIndex: 'procurementTypeDict',
       search: false,
       width: '5%',
-      valueEnum: proTableValueEnum(dictData['procurement_type=entrust'])
+      render: (_: any, record: any) => multipleTypeTransform(record.procurementTypeDict, proTableValueEnum(dictData['procurement_type=entrust'])),
     },
     {
       title: '采购方式',
diff --git a/src/pages/ZZhaoMu/Tender/BiddingResponse/TableLook.tsx b/src/pages/ZZhaoMu/Tender/BiddingResponse/TableLook.tsx
index c268317..6d63316 100644
--- a/src/pages/ZZhaoMu/Tender/BiddingResponse/TableLook.tsx
+++ b/src/pages/ZZhaoMu/Tender/BiddingResponse/TableLook.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { Button, Table, Space, Modal, Collapse, Pagination } from 'antd';
 import FileDown from '@/utils/Download';
 import { getDicData } from '@/utils/session';
-import { getURLInformation, proTableValueEnum } from '@/utils/CommonUtils';
+import { getURLInformation, multipleTypeTransform, proTableValueEnum } from '@/utils/CommonUtils';
 import { getDetail, getOpen } from './service';
 import { btnAuthority } from '@/utils/authority';
 import ProTable from '@ant-design/pro-table';
@@ -114,7 +114,7 @@ const Index: React.FC<IndexProps> = (props) => {
     {
       title: '包件分类',
       dataIndex: 'procurementTypeDict',
-      valueEnum: proTableValueEnum(dictData['procurement_type=entrust']),
+      render: (_: any, record: any) => multipleTypeTransform(record.procurementTypeDict, proTableValueEnum(dictData['procurement_type=entrust'])),
     },
     {
       title: '包件联系人',
@@ -190,7 +190,7 @@ const Index: React.FC<IndexProps> = (props) => {
     getOpen(messProp.id).then((res) => {
       if (res.code == 200) {
         // if (res.data.length > 0) {
-          setDateList(res?.data[0])
+        setDateList(res?.data[0])
         // }
       }
     })