Merge branch 'master-20220513' into 'master'

【生产】5.13版本同步到Master

See merge request eshop/fe_service_ebtp_frontend!46

src/pages/Calibration/BidPublicityResult/index.tsx

@@ -52,7 +52,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
   const [approvalVisible, setApprovalVisible] = useState<boolean>(false);//选择流程弹窗控制参数
   const [approvalData, setApprovalData] = useState<any[]>([]);//选择流程数据存储
 
-  let name1 = "中标";
+  let name1 = "中标候选人";
   let name2 = "评标";
   let name3 = "开标";
   let name4 = "标段";
@@ -62,35 +62,35 @@ const BidPublicityResult: React.FC<{}> = (props) => {
   let defId = getDefId();
   if (proDict == "procurement_mode_1" || proDict == "procurement_mode_2") {
     TpPackageName = "招标";
-    name1 = "中标";
+    name1 = "中标候选人";
     name2 = "评标";
     name3 = "开标";
     name4 = "标段";
     name5 = '定标';
   } else if (proDict == "procurement_mode_3") {
     TpPackageName = "比选";
-    name1 = "中选";
+    name1 = "中选候选人";
     name2 = "评审";
     name3 = "评审开始"
     name4 = "采购包";
     name5 = '评审结果';
   } else if (proDict == "procurement_mode_5" || proDict == "procurement_mode_6" || proDict == "procurement_mode_9") {
     TpPackageName = "谈判";
-    name1 = "中选";
+    name1 = "中选候选人";
     name2 = "评审";
     name3 = "评审开始";
     name4 = "采购包";
     name5 = '评审结果';
   } else if (proDict == "procurement_mode_4") {
     TpPackageName = "招募";
-    name1 = "中选";
+    name1 = "招募结果";
     name2 = "评审";
     name3 = "评审开始"
     name4 = "包件";
     name5 = '评审结果';
   } else if (proDict == "procurement_mode_7") {
     TpPackageName = "询价";
-    name1 = "中选";
+    name1 = "中选候选人";
     name2 = "评审";
     name3 = "评审开始";
     name4 = "采购包";
@@ -282,7 +282,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           message.warn(`没有可关联的${name4}！`)
         } else {
           setPkId("");
-          setUpdateChange(`新建${name1}候选人公示`)
+          setUpdateChange(`${proDict == "procurement_mode_4" ? '新增' : '新建'}${name1}公示`)
           setType("new");
           setUpdateVisible(true);
         }
@@ -293,14 +293,14 @@ const BidPublicityResult: React.FC<{}> = (props) => {
   }
   /*编辑招标公示*/
   const toEdit = (props: any) => {
-    setUpdateChange(`编辑${name1}候选人公示`)
+    setUpdateChange(`编辑${name1}公示`)
     setPkId(props.id);
     setType("edit");
     setUpdateVisible(true);
   }
   /*查看招标公示*/
   const toRead = (props: any) => {
-    setUpdateChange(`查看${name1}候选人公示`)
+    setUpdateChange(`查看${name1}公示`)
     setType("read");
     setPkId(props.id);
     setUpdateVisible(true);
@@ -440,7 +440,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           size={"small"}
           loading={pageloading}
           toolBarRender={() => [
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"1"} type="primary" onClick={() => toEditAdd([])}>新建{name1}候选人公示</Button>,
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"1"} type="primary" onClick={() => toEditAdd([])}>{proDict == "procurement_mode_4" ? '新增' : '新建'}{name1}公示</Button>,
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"2"} onClick={() => {
               handleRemoveMore()
             }}>批量删除</Button>,

src/pages/Evaluation/BidControl/BidControlManager/components/ViewBlacklistFormModal.tsx

@@ -68,14 +68,7 @@ const ViewBlacklistFormModal: React.FC<ViewBlacklistFormModalProps> = (props) =>
         return a;
       }
     },
-    {
+    { title: '黑名单等级', dataIndex: 'lvName', },
-      title: '黑名单等级', dataIndex: 'lv', render: (_, record) => {
-        if (record.isBlack == "1") {
-          return (isEmpty(record.lv) || record.lv == "1") ? '一级' : '二级';
-        }
-        return '';
-      }
-    },
     { title: '黑名单开始时间', dataIndex: 'startTime', },
     { title: '黑名单结束时间', dataIndex: 'endTime', },
     { title: '黑名单期限', dataIndex: 'term', },

src/pages/Evaluation/BidControl/BidControlManager/components/ViewInvoiceFormModal.tsx

@@ -32,10 +32,7 @@ const ViewInvoiceFormModal: React.FC<ViewInvoiceFormModalProps> = (props) => {
       dataIndex: 'ouName',
     }, {
       title: '黑名单等级',
-      dataIndex: 'reserved5',
+      dataIndex: 'lvName',
-      render: (_: any, record: any) => {
-        return (isEmpty(record.reserved5) || record.reserved5 == "1") ? '一级' : '二级';
-      }
     }, {
       title: '黑名单开始时间',
       dataIndex: 'startTime',

src/pages/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx

@@ -477,9 +477,10 @@ const ClarifyTheList: React.FC<{}> = () => {
     }
     function afterSave() {
         let packageIds = isNotEmpty(form.getFieldValue('packageId')) ? String(form.getFieldValue('packageId')).split(',') : [];
+        let params = { roomType };
         if (isNotEmpty(packageIds) && packageIds.length !== 0) {
             //获取公告信息 判断文件的获取和截止时间与应答截止时间的关系
-            getClarifyAnnoList(packageIds).then(res => {
+            getClarifyAnnoList(packageIds, params).then(res => {
                 if (res.code === 200) {
                     //招标文件获取开始时间
                     let docStartTimes = res.data.map((item: any) => item.docStartTime);

src/pages/Tender/ProjectManager/ClarifyTheList/service.ts

@@ -98,7 +98,7 @@ export async function clarifyReply(id: any) {
  * 查询标段
  * @param projectId 
  */
-export function getSections(projectId: any, roomType:any) {
+export function getSections(projectId: any, roomType: any) {
     return request('/api/biz-service-ebtp-tender/v1/clarifydissent/packages/' + projectId + '?roomType=' + roomType, {
         method: 'put'
     });
@@ -107,9 +107,10 @@ export function getSections(projectId: any, roomType:any) {
  * 根据标段id查询公告
  * @param data 
  */
-export function getClarifyAnnoList(data: any) {
+export function getClarifyAnnoList(data: any, params: any) {
     return request('/api/biz-service-ebtp-bid/v1/anno/clarifyAnnoList', {
         method: 'post',
-        data: data
+        data: data,
+        params: params,
     });
 }

src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx

@@ -69,15 +69,15 @@ const BidPublicityResult: React.FC<{}> = (props) => {
       title: '起草时间',
       dataIndex: 'createDate',
       // dataIndex: 'annoStartTime',
-      key:"annoStartTime",
+      key: "annoStartTime",
-      align:'left',
+      align: 'left',
       valueType: 'dateTime',
     },
     {
       title: '公示状态',
       dataIndex: 'status',
-      key:"status",
+      key: "status",
-      align:'left',
+      align: 'left',
       // valueEnum: {
       //   1: { text: '起草', status: '' },
       //   2: { text: '已提交', status: '' },
@@ -219,7 +219,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
         if (res.data.length == 0) {
           message.warn("没有可关联的包件！")
         } else {
-          setUpdateChange('新建中选候选人公示')
+          setUpdateChange('新增招募结果公示')
           setType("new");
           setUpdateVisible(true);
         }
@@ -231,14 +231,14 @@ const BidPublicityResult: React.FC<{}> = (props) => {
   }
   /*编辑招标公示*/
   const toEdit = (props: any) => {
-    setUpdateChange('编辑中选候选人公示')
+    setUpdateChange('编辑招募结果公示')
     setPkId(props.id);
     setType("edit");
     setUpdateVisible(true);
   }
   /*查看招标公示*/
   const toRead = (props: any) => {
-    setUpdateChange('查看中选候选人公示')
+    setUpdateChange('查看招募结果公示')
     setType("read");
     setPkId(props.id);
     setUpdateVisible(true);
@@ -317,9 +317,9 @@ const BidPublicityResult: React.FC<{}> = (props) => {
     setPageloading(true);
     //获取流程列表
     getApprProcessList(record.id).then(res => {
-      if(res?.code == 200) {
+      if (res?.code == 200) {
         const data = res?.data
-        if(data?.approval == true) {//打开选择流程界面
+        if (data?.approval == true) {//打开选择流程界面
           setRecordData(record)
           setApprovalData(data?.list)
           setApprovalVisible(true)
@@ -358,7 +358,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           size={"small"}
           loading={pageloading}
           toolBarRender={() => [
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"1"} type="primary" onClick={() => toEditAdd([])}>新建中选候选人公示</Button>,
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"1"} type="primary" onClick={() => toEditAdd([])}>新增招募结果公示</Button>,
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"2"} onClick={() => { handleRemoveMore() }}>批量删除</Button>,
           ]}
           search={false}

src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx

@@ -477,9 +477,10 @@ const ClarifyTheList: React.FC<{}> = () => {
                 return;
             }
             let packageIds = isNotEmpty(form.getFieldValue('packageId')) ? String(form.getFieldValue('packageId')).split(',') : [];
+            let params = { roomType };
             if (isNotEmpty(packageIds) && packageIds.length !== 0) {
                 //获取公告信息 判断文件的获取和截止时间与应答截止时间的关系
-                getClarifyAnnoList(packageIds).then(res => {
+                getClarifyAnnoList(packageIds, params).then(res => {
                     if (res.code == 200) {
                         getRoomList({ sectionIdList: packageIds }).then((res2) => {
                             if (res2.code == 200) {

src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/service.ts

@@ -107,10 +107,11 @@ export function getSections(projectId: any, roomType: any) {
  * 根据标段id查询公告
  * @param data 
  */
-export function getClarifyAnnoList(data: any) {
+export function getClarifyAnnoList(data: any, params: any) {
     return request('/api/biz-service-ebtp-bid/v1/anno/clarifyAnnoList', {
         method: 'post',
-        data: data
+        data: data,
+        params: params,
     });
 }
 /**

src/services/bidev.js

@@ -18,7 +18,7 @@ export async function zmmultiOpenBizassessroom(params) {
 
 export async function resetVerificationCode(params) {
   return request(`/api/biz-service-ebtp-process/v1/bizassessroom/update/captcha/${params.id}`,
-  {method: 'put'});
+  {method: 'post'});
 }
 
 export async function fetchJuryList(params) {