fix: 调整外部状态和状态传参字段

src/constants/index.ts

@@ -1331,8 +1331,6 @@ export const PAY_CHANNEL = {
 };
 
 
-
-
 /****                ****/
 /** 招标 ** 投标 ** 常量 */
 /****               ****/
@@ -1375,125 +1373,110 @@ export const ExpertTypeMap = {
   4: '其他类专家',
 }
 
-// 招标 内部状态工作流状态
+/** 招标 内部状态工作流状态 */
 export enum BidInsideWorkState {
   /** 待提交审核招标 */
   Not_Submitted_Check_Invite_Tender = 1,
   /** 待审核招标 */
-  Not_Tender_Check = 2,
-  /** 招标审核通过 */
-  Tender_Check_Pass = 3,
+  Not_Tender_Check,
   /** 招标审核不通过 */
-  Tender_Check_Not_Pass = 4,
+  Tender_Check_Not_Pass,
+  /** 待提交招标 */
+  Tender_Check_Pass,
   /** 已提交招标 */
-  Submitted_Invite_Tender = 5,
-  /** 报名审核通过 */
-  Register_Check_Pass = 6,
-  /** 报名审核不通过 */
-  Register_Check_Not_Pass = 7,
-  /** 资格预审审核通过 */
-  Qualifications_Check_Pass = 8,
-  /** 资格预审审核不通过 */
-  Qualifications_Check_Not_Pass = 9,
-   /** 待专家评标 */
-   Not_Selection_Tender = 10,
+  Submitted_Invite_Tender,
+  /** 待审核报名 */
+  Not_Register_Check,
+  /** 待审核资格预审 */
+  Not_Qualifications_Check,
+  /** 待评标 */
+  Not_Selection_Tender,
   /** 待提交评标报告 */
-  Submitted_Selection_Tender = 11,
+  Submitted_Selection_Tender,
   /** 待提交审核定标 */
-  Not_Submitted_Check_Finish_Tender = 12,
+  Not_Submitted_Check_Finish_Tender,
   /** 待审核定标 */
-  Not_Check_Finish_Tender = 13,
-  /** 定标审核通过 */
-  Finish_Tender_Check_Pass = 14,
+  Not_Check_Finish_Tender,
   /** 定标审核不通过 */
-  Finish_Tender_Check_Not_Pass = 15,
+  Finish_Tender_Check_Not_Pass,
+  /** 待确认定标 */
+  Not_Confirm_Finish_Tender,
   /** 待中标公示 */
-  Not_Win_Notice = 16,
-  /** 待完成招标 */
-  Not_Finish_Invite_Tender = 17,
+  Not_Win_Notice,
   /** 完成招标 */
-  Finish_Invite_Tender = 18,
+  Finish_Invite_Tender,
   /** 已废标 */
-  Discard_Tender = 19,
+  Discard_Tender,
 }
 
 /** 招标 内部状态 */
 export const BidInStateTexts = {
   1: "待提交审核招标",
   2: "待审核招标",
-  3: '招标审核通过',
-  4: '招标审核不通过',
-  5: '已提交招标',
-  6: '报名审核通过',
-  7: '报名审核不通过',
-  8: '资格预审审核通过',
-  9: '资格预审审核不通过',
-  10: '待专家评标',
-  11: '待提交评标报告',
-  12: '待提交审核定标',
-  13: '待审核定标',
-  14: '定标审核通过',
-  15: '定标审核不通过',
-  16: '待中标公示',
-  17: '待完成招标',
-  18: '完成招标',
-  19: '已废标',
+  3: "招标审核不通过",
+  4: "待提交招标",
+  5: "已提交招标",
+  6: "待审核报名",
+  7: "待审核资格预审",
+  8: "待评标",
+  9: "待提交评标报告",
+  10: "待提交审核定标",
+  11: "待审核定标",
+  12: "定标审核不通过",
+  13: "待确认定标",
+  14: "待中标公示",
+  15: "完成招标",
+  16: "已废标",
 }
 
-// 招标 外部状态工作流状态
+/** 招标 外部状态工作流状态 */
 export enum BidOuterWorkState {
   /** 待提交招标 */
   Submitted_Invite_Tender = 1,
   /** 待平台审核招标 */
-  Platform_Not_Check_Invite_Tender = 2,
+  Platform_Not_Check_Invite_Tender,
   /** 平台审核不通过 */
-  Platform_Check_Not_Pass = 3,
+  Platform_Check_Not_Pass,
   /** 待招标报名 */
-  Not_Invite_Tender_Register = 4,
+  Not_Invite_Tender_Register,
   /** 待审核报名 */
-  Not_Check_Register_Check = 5,
-  /** 报名审核不通过 */
-  Register_Check_Not_Pass = 6,
+  Not_Check_Register_Check,
   /** 待提交资格预审 */
-  Not_Submitted_Qualifications_Check = 7,
+  Not_Submitted_Qualifications_Check,
   /** 待资格预审 */
-  Not_Qualifications_Check = 8,
-  /** 资格预审不通过 */
-  Qualifications_Check_Not_Pass = 9,
+  Not_Qualifications_Check,
   /** 待投标 */
-  Not_Invite_Tender = 10,
+  Not_Submit_Tender,
   /** 待开标 */
-  Not_Open_Tender = 11,
+  Not_Open_Tender,
   /** 待评标 */
-  Not_Selection_Tender = 12,
+  Not_Selection_Tender,
   /** 待定标 */
-  Not_Finish_Notice = 13,
+  Not_Finish_Notice,
   /** 待中标公示 */
-  Not_Win_Notice = 14,
+  Not_Win_Notice,
   /** 完成招标 */
-  Finish_Invite_Tender = 15,
+  Finish_Invite_Tender,
   /** 已废标 */
-  Discard_Tender = 16,
+  Discard_Tender,
 }
 
 /** 招标 外部状态 */
 export const BidOutStateTexts = {
-  1: "提交招标",
-  2: '待平台审核招标',
-  3: '平台审核不通过',
-  4: '待招标报名',
-  5: '待审核报名',
-  6: '报名审核不通过',
-  7: '待提交资格预审',
-  8: '待资格预审',
-  9: '资格预审不通过',
-  10: '待投标',
-  11: '待开标',
-  12: '待评标',
-  13: '待定标',
-  14: '待中标公示',
-  15: '完成招标',
-  16: '已废标',
+  1: "待提交招标",
+  2: "待平台审核招标",
+  3: "平台审核不通过",
+  4: "待招标报名",
+  5: "待审核报名",
+  6: "待提交资格预审",
+  7: "待资格预审",
+  8: "待投标",
+  9: "待开标",
+  10: "待评标",
+  11: "待定标",
+  12: "待中标公示",
+  13: "完成招标",
+  14: "已废标",
 }
 
 
@@ -1531,28 +1514,32 @@ export const BidOutOpeartTexts = {
   13: "已废标",
 }
 
-//******投标** 内部状态工作流状态
+/** 投标 内部状态工作流状态 */
 export enum TenderInsideWorkState {
   /** 待招标报名 */
-  NotSubmitted_Invite_Tender_Register = 1,
+  Not_Submitted_Invite_Tender_Register = 1,
   /** 已提交招标报名 */
-  Submitted_Invite_Tender_Register = 2,
+  Submitted_Invite_Tender_Register,
   /** 待提交资格预审 */
-  Not_Submitted_Qualifications_Check = 3,
+  Not_Submitted_Qualifications_Check,
   /** 已提交资格预审 */
-  Submitted_Qualifications_Check = 4,
+  Submitted_Qualifications_Check,
   /** 待新增投标 */
-  Not_Save_Submit_Tender = 5,
+  Not_Save_Submit_Tender,
   /** 待提交审核投标 */
-  Not_Submitted_Check_Submit_Tender = 6,
+  Not_Submitted_Check_Submit_Tender,
   /** 待审核投标 */
-  Submitted_Check_Submit_Tender = 7,
-  /** 审核投标不通过 */
-  Check_Submit_Tender_Not_Pass = 8,
+  Submitted_Check_Submit_Tender,
+  /** 投标审核不通过 */
+  Check_Submit_Tender_Not_Pass,
   /** 待提交投标 */
-  Not_Submitted_Submit_Tender = 9,
+  Not_Submitted_Submit_Tender,
   /** 已提交投标 */
-  Submitted_Submit_Tender = 10,
+  Submitted_Submit_Tender,
+  /** 已评标 */
+  Finish_Evaluation_Submit_Tender,
+  /** 已废标 */
+  Discard_Tender,
 }
 
 /** 投标 内部状态 */
@@ -1560,13 +1547,62 @@ export const TenderInStateTexts = {
   1: "待招标报名",
   2: "已提交招标报名",
   3: "待提交资格预审",
-  4: '已提交资格预审',
-  5: '待新增投标',
-  6: '待提交审核投标',
-  7: '待审核投标',
-  8: '审核投标不通过',
-  9: '待提交投标',
-  10: '已提交投标',
+  4: "已提交资格预审",
+  5: "待新增投标",
+  6: "待提交审核投标",
+  7: "待审核投标",
+  8: "投标审核不通过",
+  9: "待提交投标",
+  10: "已提交投标",
+  11: "已评标",
+  12: "已废标",
+}
+
+/** 投标 外部状态工作流状态 */
+export enum TenderOutWorkState {
+  /** 待招标报名 */
+  Not_Invite_Tender_Register = 1,
+  /** 待审核报名 */
+  Not_Check_Register_Check,
+  /** 报名审核不通过 */
+  Register_Check_Not_Pass,
+  /** 待提交资格预审 */
+  Not_Submitted_Qualifications_Check,
+  /** 待资格预审 */
+  Not_Qualifications_Check,
+  /** 资格预审不通过 */
+  Qualifications_Check_Not_Pass,
+  /** 待投标 */
+  Not_Submit_Tender,
+  /** 待开标 */
+  Not_Open_Tender,
+  /** 待评标 */
+  Not_Selection_Tender,
+  /** 待定标 */
+  Not_Finish_Notice,
+  /** 待中标公示 */
+  Not_Win_Notice,
+  /** 完成招标 */
+  Finish_Invite_Tender,
+  /** 已废标 */
+  Discard_Tender,
+}
+
+/** 投标 外部状态 */
+export const TenderOutStateTexts = {
+  1: "待招标报名",
+  2: "待审核报名",
+  3: "报名审核不通过",
+  4: "待提交资格预审",
+  5: "待资格预审",
+  6: "资格预审不通过",
+  7: "待投标",
+  8: "待开标",
+  9: "待评标",
+  10: "待定标",
+  11: "待中标公示",
+  12: "完成招标",
+  13: "已废标",
 }
 
 /** 投标 内部操作文本 */

src/pages/procurement/callForBidsSearch/model/useSelfTable.tsx

@@ -86,10 +86,18 @@ export const useSelfTable = () => {
       width: 200
     },
     {
+      title: '开标时间',
+      align: 'left',
+      dataIndex: 'openTenderTime',
+      key: 'openTenderTime',
+      render: (text, record) => formatTimeString(record.openTenderTime),
+      width: 200
+    },
+    {
       title: '外部状态',
       align: 'left',
-      dataIndex: 'tenderOutStatus',
-      key: 'tenderOutStatus',
+      dataIndex: 'inviteTenderOutStatus',
+      key: 'inviteTenderOutStatus',
       render: text => <CustomTag status={text} type='out' />
     },
     // {

src/pages/procurement/components/descriptionsInfo/index.tsx

@@ -47,7 +47,7 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
       span: 8,
       fieldList: [
         { title: '招标编号:', name: 'code' },
-        { title: '外部状态:', name: 'tenderOutStatus', render: (text) => BidOutStateTexts[text]},
+        { title: '外部状态:', name: 'inviteTenderOutStatus', render: (text) => BidOutStateTexts[text]},
         { title: '内部状态:', name: 'inviteTenderInStatus', render: (text) => BidInStateTexts[text] },
         { title: '发布时间:', name: 'createTime', render: (text) => formatTimeString(text) },
       ]

src/pages/procurement/constants/index.tsx

@@ -96,8 +96,8 @@ export const baseBidListColumns: any[] = [
   {
     title: '外部状态',
     align: 'left',
-    dataIndex: 'tenderOutStatus',
-    key: 'tenderOutStatus',
+    dataIndex: 'inviteTenderOutStatus',
+    key: 'inviteTenderOutStatus',
     render: text => <CustomTag status={text} type='out' />
   },
   // {
@@ -149,8 +149,8 @@ export const baseTenderListColumns: any[] = [
   {
     title: '外部状态',
     align: 'left',
-    dataIndex: 'tenderOutStatus',
-    key: 'tenderOutStatus',
+    dataIndex: 'inviteTenderOutStatus',
+    key: 'inviteTenderOutStatus',
     render: text => <CustomTag status={text} type='out' />
   },
   {

src/pages/procurement/readyCheckBid/index.tsx

@@ -38,7 +38,7 @@ const FirstCheckedBid:React.FC<FirstCheckedBidProps> = (props) => {
       message.error('请先选择招标')
       return ;
     }
-    const canBitch = !rowSelectionCtl.selectRow.some(v => v.tenderOutStatus !== BidOuterWorkState.Platform_Not_Check_Invite_Tender)
+    const canBitch = !rowSelectionCtl.selectRow.some(v => v.inviteTenderOutStatus !== BidOuterWorkState.Platform_Not_Check_Invite_Tender)
     if (canBitch) {
       setLoading(true)
       PublicApi.postPurchaseInviteTenderPlatformPlatformCheckInviteTenderBatch({idList: rowSelectionCtl.selectedRowKeys}).then(res => {

src/pages/procurement/readyCheckBid/model/useSelfTable.tsx

@@ -11,7 +11,7 @@ export const useSelfTable = () => {
   const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
 
   const handleSubmit = async (record) => {
-    if (record.tenderOutStatus === BidOuterWorkState.Platform_Not_Check_Invite_Tender) {
+    if (record.inviteTenderOutStatus === BidOuterWorkState.Platform_Not_Check_Invite_Tender) {
       history.push(`/procurement/readyCheckBid/detail?id=${record.id}&action=1`)
     }
   }

src/pages/procurement/tenderSearch/model/useSelfTable.tsx

@@ -67,7 +67,7 @@ export const useSelfTable = () => {
       align: 'left',
       dataIndex: 'inviteTender',
       key: 'inviteTender',
-      render: (text, record) => <CustomTag status={record.inviteTender.tenderOutStatus} type='out' />
+      render: (text, record) => <CustomTag status={record.inviteTender.inviteTenderOutStatus} type='out' />
     },
     // {
     //   title: '内部状态',