Merge branch 'master' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220613-将PUT和DELETE请求更改成POST请求

src/pages/Tender/ProjectsInvolved/index.tsx

@@ -101,7 +101,7 @@ const Index: React.FC<{}> = () => {
       search: proTypeCode?.length > 1 ? null : false,
       initialValue: bidMethodDict ? bidMethodDict : void 0,
       valueEnum: proTableValueEnumOther(dictData['procurement_mode=entrust'], proTypeCode),
-      width: '10%',
+      width: '7%',
       render: (_: any, record: any) => {
         if (proTypeCode.indexOf("procurement_mode_4") !== -1) {
           const recruitmentMethod = getDictName(dictData[recruitmentMethodRecord], record.examinationMethodDict)
@@ -124,7 +124,7 @@ const Index: React.FC<{}> = () => {
       title: proTypeCode.indexOf("procurement_mode_4") !== -1 ? '招募人' : '采购人',
       dataIndex: 'tendereeOrgName',
       search: false,
-      width: '10%'
+      width: '15%'
     },
     {
       title: '代理机构',
@@ -137,17 +137,17 @@ const Index: React.FC<{}> = () => {
       dataIndex: 'procurementType',
       valueEnum: proTableValueEnum(dictData['procurement_type=entrust']),
       search: false,
-      width: '8%'
+      width: '5%'
     },
     {
       title: '所属区域',
       dataIndex: 'regionDictName',
       search: false,
-      width: '10%'
+      width: '15%'
     },
     {
       title: '操作',
-      width: '15%',
+      width: '7%',
       search: false,
       render: (text: any, record: any) => {
         if (MethodDict == "procurement_mode_7") {
@@ -156,11 +156,11 @@ const Index: React.FC<{}> = () => {
           )
         } else {
           return (
-            <Space>
+            <>
               <Button hidden={btnAuthority(['ebtp-supplier'])} type="text" onClick={() => saveProject(record)} danger>项目跟进</Button>
               <Button hidden={btnAuthority(['ebtp-supplier'])} type="text" danger onClick={() => changePerson(record)} >修改负责人</Button>
               <Button hidden={btnAuthority(['ebtp-supplier'])} type="text" danger onClick={() => quitProject(record.id)} >退出项目</Button>
-            </Space>
+            </>
           )
         }
       }
@@ -182,31 +182,33 @@ const Index: React.FC<{}> = () => {
       title: '采购类型',
       dataIndex: 'procurementTypeDict',
       search: false,
-      width: '8%',
+      width: '5%',
       valueEnum: proTableValueEnum(dictData['procurement_type=entrust'])
     },
     {
       title: '采购方式',
       dataIndex: 'bidMethodDict',
       search: false,
-      width: '10%',
+      width: '7%',
       valueEnum: proTableValueEnum(dictData['procurement_mode=entrust'])
     },
     {
       title: '已报名标段名称',
       dataIndex: 'bidSectName',
+      width: '20%',
       search: false
     },
     {
       title: '已报名标段编号',
       dataIndex: 'bidSectBizNum',
+      width: '10%',
       search: false
     },
     {
       title: '项目负责人',
       dataIndex: 'projectBidUser',
       search: false,
-      width: '10%'
+      width: '7%'
     },
   ];
   const dataSource = [

src/pages/Tender/supplier/DownloadPurchasingDocuments/components/DownloadPurchasingDocuments.tsx

@@ -335,8 +335,8 @@ const DownloadPurchasingDocuments: React.FC<{}> = () => {
                 } else {
                     Modal.warning({
                         title: <>
-                            <p style={{ color: "#b30000" }}>下载失败，缺少必需的【供应商营业执照编号】</p>
-                            <p>为确保制作应答文件环节顺利进行，请您提前维护好供应商库信息，具体操作步骤可参照系统菜单-【我的工作台】-【共享文档下载】-【招标采购中心引用供应商信息库信息操作手册】</p>
+                            <p style={{ color: "#b30000" }}>下载失败，缺少必需的【供应商营业执照编号、组织机构代码、税务登记号】</p>
+                            <p>请您提前在合作方维护好供应商公司信息，具体操作步骤可参考：登陆合作方门户-合作方管理应用-基础信息管理-公司信息维护</p>
                         </>,
                         onOk() {
                             reject('下载失败');

src/pages/Tender/supplier/InvitationLetter/components/InvitationLetter.tsx

@@ -123,7 +123,7 @@ const LookingForBusinessOpportunitiesList: React.FC = () => {
             title: '代理机构',
             dataIndex: 'tenderAgencyName',
             search: false,
-            width: '10%',
+            width: '15%',
         },
         {
             title: '项目分类',
@@ -136,12 +136,12 @@ const LookingForBusinessOpportunitiesList: React.FC = () => {
             title: '所属区域',
             dataIndex: 'regionDictName',
             search: false,
-            width: '10%',
+            width: '15%',
         },
         {
             title: '操作',
             valueType: 'option',
-            width: '15%',
+            width: '8%',
             render: (text: any, record: any, index: number) => {
                 return <>
                     <Button key="participation" hidden={btnAuthority(["ebtp-supplier"])} type="text" danger onClick={() => participation(record)}>我要参与</Button>

src/pages/Tender/supplier/LookingForBusinessOpportunities/components/LookingForBusinessOpportunitiesList.tsx

@@ -95,6 +95,8 @@ const LookingForBusinessOpportunitiesList: React.FC<{}> = () => {
   }
 
   const docSaveBtn = "compact";//保存按钮是否展示
+  //项目编号
+  const ebpProjectNumber = getURLInformation('number');
 
   function getBsName() {
     if (bidMethodDict.indexOf("procurement_mode_4") !== -1) {
@@ -108,12 +110,14 @@ const LookingForBusinessOpportunitiesList: React.FC<{}> = () => {
   useEffect(() => {
     setTableLoading(true);
     if (bidMethodDict.indexOf("procurement_mode_4") > -1) {
-      lookingForBussinessOther(bussinessParams).then(res => {
+      lookingForBussinessOther(isNotEmpty(ebpProjectNumber) ? { ...bussinessParams, ebpProjectNumber } : bussinessParams).then(res => {
+        isNotEmpty(window.location.search) && history.push(window.location.pathname);
         setTableList(res.data);
         setTableLoading(false);
       })
     } else {
-      lookingForBussiness(bussinessParams).then(res => {
+      lookingForBussiness(isNotEmpty(ebpProjectNumber) ? { ...bussinessParams, ebpProjectNumber } : bussinessParams).then(res => {
+        isNotEmpty(window.location.search) && history.push(window.location.pathname);
         setTableList(res.data);
         setTableLoading(false);
       })
@@ -132,6 +136,7 @@ const LookingForBusinessOpportunitiesList: React.FC<{}> = () => {
       title: bidMethodDict.indexOf("procurement_mode_4") !== -1 ? '招募方式' : '采购方式',
       dataIndex: 'bidMethodDict',
       search: bidMethodDict?.length > 1 ? void 0 : false,
+      width: '7%',
       valueEnum: proTableValueEnumOther(dictData[procurementModeEntrust], bidMethodDict),
       render: (_: any, record: any) => {
         if (bidMethodDict.indexOf("procurement_mode_4") !== -1) {
@@ -154,16 +159,18 @@ const LookingForBusinessOpportunitiesList: React.FC<{}> = () => {
       title: bidMethodDict.indexOf("procurement_mode_4") !== -1 ? '招募人' : '采购人',
       dataIndex: 'tendereeOrgName',
       search: false,
+      width: '15%'
     },
     {
       title: '代理机构',
       dataIndex: 'tenderAgencyName',
       search: false,
+      width: '15%'
     },
     {
       title: '项目分类',
       dataIndex: 'procurementType',
-      width: 80,
+      width: '5%',
       valueEnum: proTableValueEnum(dictData[procurementTypeEntrust]),
       search: false,
     },
@@ -171,11 +178,12 @@ const LookingForBusinessOpportunitiesList: React.FC<{}> = () => {
       title: '所属区域',
       dataIndex: 'regionDictName',
       search: false,
+      width: '15%'
     },
     {
       title: '操作',
       valueType: 'option',
-      width: 150,
+      width: '7%',
       render: (text: any, record: any, index: number) => {
         return <>
           <Button key="participation" hidden={btnAuthority(["ebtp-supplier"])} type="text" danger onClick={() => participation(record)}>我要参与</Button>