Merge branch '20220505-公开招募项目-评审结果环节“中选候选人公示”名称变更' into 'master-20220513'

5.13 公开招募项目-评审结果环节“中选候选人公示”名称变更

See merge request eshop/fe_service_ebtp_frontend!42

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/ZZhaoMu/Calibration/BidPublicityResult/index.tsx

@@ -69,15 +69,15 @@ const BidPublicityResult: React.FC<{}> = (props) => {
       title: '起草时间',
       dataIndex: 'createDate',
       // dataIndex: 'annoStartTime',
-      key:"annoStartTime",
-      align:'left',
+      key: "annoStartTime",
+      align: 'left',
       valueType: 'dateTime',
     },
     {
       title: '公示状态',
       dataIndex: 'status',
-      key:"status",
-      align:'left',
+      key: "status",
+      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}