11.22 电子评标室修改评委会设置

src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx

@@ -8,7 +8,7 @@ import { getURLInformation } from '@/utils/CommonUtils';
 import './judgList.less';
 import '@/assets/xsy_style.less';
 import FileDown from '@/utils/Download';
-import { DownOutlined, EllipsisOutlined, UploadOutlined } from '@ant-design/icons';
+import { DownOutlined, EllipsisOutlined, QuestionCircleOutlined, UploadOutlined } from '@ant-design/icons';
 import { btnAuthority } from '@/utils/authority';
 import RiskPrevention from '@/utils/RiskPrevention';
 import BidEvalAppointment from '@/components/ElecBidEvaluation/BidEvalAppointment';
@@ -118,11 +118,11 @@ const JudgingPanel: React.FC<{}> = () => {
     //     '2': { text: `招标项目${showName.pb}`, },
     //   }
     // },
-    { title: '专家数量', dataIndex: 'expertNumber', width: '8%', },
-    { title: `${showName.zbr}代表数量`, dataIndex: 'representativeNumber', width: '12%', },
     { title: `${showName.bb}名称`, dataIndex: 'sectionName', },
-    { title: '是否预约电子评标室', dataIndex: 'reserveStatus', width: '10%', valueEnum: { 1: "是", 0: "否" } },
+    { title: '专家数量', dataIndex: 'expertNumber', width: 80 },
-    { title: `${showName.pb}地点`, dataIndex: 'evalLocation', width: '15%', ellipsis: true, render: (_: any, record: any) => sectionNameValue(record.elecEvalRoomReserve, record.evalLocation, record.reserveStatus) },
+    { title: `${showName.zbr}代表数量`, dataIndex: 'representativeNumber', width: 120 },
+    { title: '是否预约电子评标室', dataIndex: 'reserveStatus', width: 150, valueEnum: { 1: "是", 0: "否" } },
+    { title: `${showName.pb}地点`, dataIndex: 'evalLocation', width: '18%', ellipsis: true, render: (_: any, record: any) => sectionNameValue(record.elecEvalRoomReserve, record.evalLocation, record.reserveStatus) },
     { title: '预计开始时间', dataIndex: 'startTime', valueType: 'dateTime', width: '10%', },
     { title: '预计结束时间', dataIndex: 'endTime', valueType: 'dateTime', width: '10%', },
     {
@@ -319,8 +319,10 @@ const JudgingPanel: React.FC<{}> = () => {
       detail != null ? (
         <span>
           <Popover content={content} trigger={["hover"]} placement="bottom">
-            {text}
+            <span style={{ cursor: 'pointer' }}>
-            <DownOutlined style={{ cursor: 'pointer', marginLeft: '4px' }} />
+              {text}
+              <QuestionCircleOutlined style={{ marginLeft: '4px' }} />
+            </span>
           </Popover>
         </span>
       ) : (
@@ -827,13 +829,9 @@ const JudgingPanel: React.FC<{}> = () => {
                   name="evalLocation"
                   label={`${showName.pb}地点`}
                   rules={[...rule(`${showName.pb}地点`), { type: 'string', message: '请输入正确内容' }, { max: 100, message: '内容超长' }]}
+                  tooltip={(disabled && isReserve == "1") && evalLocationTitle(selectEvalData, updateData)}
                 >
-                  <Input style={{ width: "90%" }} disabled={disabled} placeholder={`${showName.pb}地点`}
+                  <Input style={{ width: "90%" }} disabled={disabled} placeholder={`${showName.pb}地点`} />
-                    addonAfter={
-                      disabled && <Tooltip title={() => evalLocationTitle(selectEvalData, updateData)}>
-                        <EllipsisOutlined />
-                      </Tooltip>
-                    } />
                 </FormItem>
               </Col>
             )}

src/pages/ZZhaoMu/JudgingPanel/index.tsx

@@ -7,7 +7,7 @@ import { getProId, getProMethod, getDefId, getSessionProjectData, getRoomReturnU
 import './judgList.less';
 import '@/assets/xsy_style.less';
 import FileDown from '@/utils/Download';
-import { DownOutlined, EllipsisOutlined, UploadOutlined } from '@ant-design/icons';
+import { DownOutlined, EllipsisOutlined, QuestionCircleOutlined, UploadOutlined } from '@ant-design/icons';
 import { btnAuthority } from '@/utils/authority';
 import RiskPrevention from '@/utils/RiskPrevention';
 import { history } from 'umi';
@@ -106,11 +106,11 @@ const JudgingPanel: React.FC<{}> = (props: any) => {
     //     '2': { text: '招标项目评审', },
     //   }
     // },
-    { title: '专家数量', dataIndex: 'expertNumber', width: '8%', },
-    { title: '采购人代表数量', dataIndex: 'representativeNumber', width: '12%', },
     { title: '包件名称', dataIndex: 'sectionName', },
-    { title: '是否预约电子评标室', dataIndex: 'reserveStatus', width: '10%', valueEnum: { 1: "是", 0: "否" } },
+    { title: '专家数量', dataIndex: 'expertNumber', width: 80, },
-    { title: "评审地点", dataIndex: 'evalLocation', width: '15%', ellipsis: true, render: (_: any, record: any) => sectionNameValue(record.elecEvalRoomReserve, record.evalLocation, record.reserveStatus) },
+    { title: '采购人代表数量', dataIndex: 'representativeNumber', width: 120, },
+    { title: '是否预约电子评标室', dataIndex: 'reserveStatus', width: 150, valueEnum: { 1: "是", 0: "否" } },
+    { title: "评审地点", dataIndex: 'evalLocation', width: '18%', ellipsis: true, render: (_: any, record: any) => sectionNameValue(record.elecEvalRoomReserve, record.evalLocation, record.reserveStatus) },
     { title: '预计开始时间', dataIndex: 'startTime', valueType: 'dateTime', width: '10%', },
     { title: '预计结束时间', dataIndex: 'endTime', valueType: 'dateTime', width: '10%', },
     {
@@ -308,8 +308,10 @@ const JudgingPanel: React.FC<{}> = (props: any) => {
       detail != null ? (
         <span>
           <Popover content={content} trigger={["hover"]} placement="bottom">
-            {text}
+            <span style={{ cursor: 'pointer' }}>
-            <DownOutlined style={{ cursor: 'pointer', marginLeft: '4px' }} />
+              {text}
+              <QuestionCircleOutlined style={{ marginLeft: '4px' }} />
+            </span>
           </Popover>
         </span>
       ) : (
@@ -711,13 +713,9 @@ const JudgingPanel: React.FC<{}> = (props: any) => {
                   name="evalLocation"
                   label="评审地点"
                   rules={[...rule('评审地点'), { type: 'string', message: '请输入正确内容' }, { max: 100, message: '内容超长' }]}
+                  tooltip={(disabled && isReserve == "1") && evalLocationTitle(selectEvalData, updateData)}
                 >
-                  <Input style={{ width: "90%" }} disabled={disabled} placeholder="评审地点"
+                  <Input style={{ width: "90%" }} disabled={disabled} placeholder="评审地点" />
-                    addonAfter={
-                      disabled && <Tooltip title={() => evalLocationTitle(selectEvalData, updateData)}>
-                        <EllipsisOutlined />
-                      </Tooltip>
-                    } />
                 </FormItem>
               </Col>
             )}