比价接口接入

src/pages/transaction/purchaseAbility/confirmOffer/auditResultsOne/index.tsx

@@ -6,10 +6,10 @@ import moment from 'moment';
 import { PublicApi } from '@/services/api';
 import { Row, Col, Button, Tag, Space, Typography, Rate } from 'antd';
 import {
-  OFFTER_EXTERNALSTATE,
   OFFTER_EXTERNALSTATE_COLOR,
-  OFFTER_CONFIRMINTERIORSTATE,
+  OFFTER_INTERNALSTATE_COLOR,
   OFFTER_CONFIRMINTERIORSTATE_COLOR,
+  OFFTER_EXTERNALSTATE_TYPE,
   CHNUM_TYPE
 } from '../../constants';
 const { Text } = Typography;
@@ -73,12 +73,19 @@ const AuditResultsOne = () => {
     title: '外部状态',
     key: 'externalState',
     dataIndex: 'externalState',
-    render: (text: any, record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[text]}>{OFFTER_EXTERNALSTATE[text]}</Tag>
+    render: (text: any, record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[text]}>{record.externalStateName}</Tag>
   }, {
     title: '内部状态',
     key: 'interiorState',
     dataIndex: 'interiorState',
-    render: (text: any, record: any) => <Tag color={OFFTER_CONFIRMINTERIORSTATE_COLOR[text]}>{OFFTER_CONFIRMINTERIORSTATE[text]}</Tag>
+    render: (text: any, record: any) => (
+      <>
+        { record.externalState === OFFTER_EXTERNALSTATE_TYPE.WAITSUBMIOFFER_TYPE ?
+          <Tag color={OFFTER_INTERNALSTATE_COLOR[text]}>{record.interiorStateName}</Tag> :
+          <Tag color={OFFTER_CONFIRMINTERIORSTATE_COLOR[record.confirmInteriorState]}>{record.confirmInteriorStateName}</Tag>
+        }
+      </>
+    )
   }, {
     title: '操作',
     key: 'operate',

src/pages/transaction/purchaseAbility/confirmOffer/auditResultsTwo/index.tsx

@@ -6,10 +6,10 @@ import moment from 'moment';
 import { PublicApi } from '@/services/api';
 import { Row, Col, Button, Tag, Space, Typography, Rate } from 'antd';
 import {
-  OFFTER_EXTERNALSTATE,
   OFFTER_EXTERNALSTATE_COLOR,
-  OFFTER_CONFIRMINTERIORSTATE,
+  OFFTER_INTERNALSTATE_COLOR,
   OFFTER_CONFIRMINTERIORSTATE_COLOR,
+  OFFTER_EXTERNALSTATE_TYPE,
   CHNUM_TYPE
 } from '../../constants';
 const { Text } = Typography;
@@ -73,12 +73,19 @@ const AuditResultsTwo = () => {
     title: '外部状态',
     key: 'externalState',
     dataIndex: 'externalState',
-    render: (text: any, record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[text]}>{OFFTER_EXTERNALSTATE[text]}</Tag>
+    render: (text: any, record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[text]}>{record.externalStateName}</Tag>
   }, {
     title: '内部状态',
     key: 'interiorState',
     dataIndex: 'interiorState',
-    render: (text: any, record: any) => <Tag color={OFFTER_CONFIRMINTERIORSTATE_COLOR[text]}>{OFFTER_CONFIRMINTERIORSTATE[text]}</Tag>
+    render: (text: any, record: any) => (
+      <>
+        { record.externalState === OFFTER_EXTERNALSTATE_TYPE.WAITSUBMIOFFER_TYPE ?
+          <Tag color={OFFTER_INTERNALSTATE_COLOR[text]}>{record.interiorStateName}</Tag> :
+          <Tag color={OFFTER_CONFIRMINTERIORSTATE_COLOR[record.confirmInteriorState]}>{record.confirmInteriorStateName}</Tag>
+        }
+      </>
+    )
   }, {
     title: '操作',
     key: 'operate',

src/pages/transaction/purchaseAbility/confirmOffer/confirmResults/index.tsx

@@ -7,10 +7,10 @@ import EyePreview from '@/components/EyePreview';
 import moment from 'moment';
 import { PublicApi } from '@/services/api';
 import {
-  OFFTER_EXTERNALSTATE,
   OFFTER_EXTERNALSTATE_COLOR,
-  OFFTER_CONFIRMINTERIORSTATE,
+  OFFTER_INTERNALSTATE_COLOR,
   OFFTER_CONFIRMINTERIORSTATE_COLOR,
+  OFFTER_EXTERNALSTATE_TYPE,
   CHNUM_TYPE
 } from '../../constants';
 
@@ -74,12 +74,19 @@ const ConfirmResults = () => {
     title: '外部状态',
     key: 'externalState',
     dataIndex: 'externalState',
-    render: (text: any, record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[text]}>{OFFTER_EXTERNALSTATE[text]}</Tag>
+    render: (text: any, record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[text]}>{record.externalStateName}</Tag>
   }, {
     title: '内部状态',
     key: 'interiorState',
     dataIndex: 'interiorState',
-    render: (text: any, record: any) => <Tag color={OFFTER_CONFIRMINTERIORSTATE_COLOR[text]}>{OFFTER_CONFIRMINTERIORSTATE[text]}</Tag>
+    render: (text: any, record: any) => (
+      <>
+        { record.externalState === OFFTER_EXTERNALSTATE_TYPE.WAITSUBMIOFFER_TYPE ?
+          <Tag color={OFFTER_INTERNALSTATE_COLOR[text]}>{record.interiorStateName}</Tag> :
+          <Tag color={OFFTER_CONFIRMINTERIORSTATE_COLOR[record.confirmInteriorState]}>{record.confirmInteriorStateName}</Tag>
+        }
+      </>
+    )
   }, {
     title: '操作',
     key: 'operate',

src/pages/transaction/purchaseAbility/confirmOffer/detail/index.less

@@ -62,20 +62,6 @@
     .god-table-control {
       margin-bottom: 0;
     }
-    .ant-table table {
-      border: 3px solid #F4F5F7 !important;
-      border-bottom: 2px !important;
-    }
-    .ant-table-thead {
-      .ant-table-cell {
-        background-color: #F4F5F7;
-      }
-    }
-    .ant-table-tbody {
-      .ant-table-cell {
-        border-bottom: 3px solid #F4F5F7;
-      }
-    }
   }
   .list {
     display: flex;
@@ -93,9 +79,9 @@
   :global {
     .ant-form-item-control-input-content {
       display: flex;
-      .ant-input-group-wrapper {
+      .ant-input-number {
         margin-left: 16px;
-        width: 96px;
+        width: 64px;
       }
     }
   }
@@ -116,3 +102,41 @@
   color: #909399;
   margin-right: 5px;
 }
+.affix_title {
+  font-size: 12px;
+  margin-bottom: 12px;
+  .divider_style {
+    width: 2px;
+    height: 16px;
+    margin: 0px 5px 0px 0px ;
+    background-color: #00B37A;
+  }
+}
+// .tableCard {
+//   :global {
+//     .ant-table table {
+//       border: 3px solid #F4F5F7 !important;
+//       border-bottom: 2px !important;
+//     }
+//     .ant-table-thead {
+//       .ant-table-cell {
+//         background-color: #F4F5F7;
+//       }
+//     }
+//     .ant-table-tbody {
+//       .ant-table-cell {
+//         border-bottom: 3px solid #F4F5F7;
+//       }
+//     }
+//   }
+// }
+.percentum_icon {
+  width: 32px;
+  height: 32px;
+  text-align: center;
+  line-height: 30px;
+  background-color: #F7F8FA;
+  color: #909399;
+  border: 1px solid #d9d9d9;
+  border-left: none;
+}

src/pages/transaction/purchaseAbility/confirmOffer/offerInquire/index.tsx

@@ -7,12 +7,11 @@ import EyePreview from '@/components/EyePreview';
 import moment from 'moment';
 import { PublicApi } from '@/services/api';
 import {
-  OFFTER_EXTERNALSTATE,
   OFFTER_EXTERNALSTATE_COLOR,
-  OFFTER_CONFIRMINTERIORSTATE,
+  OFFTER_INTERNALSTATE_COLOR,
   OFFTER_CONFIRMINTERIORSTATE_COLOR,
+  OFFTER_EXTERNALSTATE_TYPE,
   CHNUM_TYPE,
-  OFFTER_EXTERNALSTATE_TYPE
 } from '../../constants';
 import ModalOperate from '../../components/modalOperate';
 
@@ -81,12 +80,19 @@ const OfferInquire = () => {
     title: '外部状态',
     key: 'externalState',
     dataIndex: 'externalState',
-    render: (text: any, record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[text]}>{OFFTER_EXTERNALSTATE[text]}</Tag>
+    render: (text: any, record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[text]}>{record.externalStateName}</Tag>
   }, {
     title: '内部状态',
     key: 'interiorState',
     dataIndex: 'interiorState',
-    render: (text: any, record: any) => <Tag color={OFFTER_CONFIRMINTERIORSTATE_COLOR[text]}>{OFFTER_CONFIRMINTERIORSTATE[text]}</Tag>
+    render: (text: any, record: any) => (
+      <>
+        { record.externalState === OFFTER_EXTERNALSTATE_TYPE.WAITSUBMIOFFER_TYPE ?
+          <Tag color={OFFTER_INTERNALSTATE_COLOR[text]}>{record.interiorStateName}</Tag> :
+          <Tag color={OFFTER_CONFIRMINTERIORSTATE_COLOR[record.confirmInteriorState]}>{record.confirmInteriorStateName}</Tag>
+        }
+      </>
+    )
   }, {
     title: '操作',
     key: 'operate',

src/pages/transaction/purchaseAbility/confirmOffer/toComparePrices/index.tsx

@@ -7,11 +7,12 @@ import EyePreview from '@/components/EyePreview';
 import moment from 'moment';
 import { PublicApi } from '@/services/api';
 import {
-  OFFTER_EXTERNALSTATE,
   OFFTER_EXTERNALSTATE_COLOR,
-  OFFTER_CONFIRMINTERIORSTATE,
+  OFFTER_INTERNALSTATE_COLOR,
   OFFTER_CONFIRMINTERIORSTATE_COLOR,
-  CHNUM_TYPE
+  OFFTER_EXTERNALSTATE_TYPE,
+  OFFTER_CONFIRMINTERNALSTATE_TYPE,
+  CHNUM_TYPE,
 } from '../../constants';
 
 const { Text } = Typography
@@ -74,25 +75,38 @@ const ToComparePrices = () => {
     title: '外部状态',
     key: 'externalState',
     dataIndex: 'externalState',
-    render: (text: any, record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[text]}>{OFFTER_EXTERNALSTATE[text]}</Tag>
+    render: (text: any, record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[text]}>{record.externalStateName}</Tag>
   }, {
     title: '内部状态',
     key: 'interiorState',
     dataIndex: 'interiorState',
-    render: (text: any, record: any) => <Tag color={OFFTER_CONFIRMINTERIORSTATE_COLOR[text]}>{OFFTER_CONFIRMINTERIORSTATE[text]}</Tag>
+    render: (text: any, record: any) => (
+      <>
+        { record.externalState === OFFTER_EXTERNALSTATE_TYPE.WAITSUBMIOFFER_TYPE ?
+          <Tag color={OFFTER_INTERNALSTATE_COLOR[text]}>{record.interiorStateName}</Tag> :
+          <Tag color={OFFTER_CONFIRMINTERIORSTATE_COLOR[record.confirmInteriorState]}>{record.confirmInteriorStateName}</Tag>
+        }
+      </>
+    )
   }, {
     title: '操作',
     key: 'operate',
     dataIndex: 'operate',
     render: (text: any, record: any) =>
       <>
-        <Button
-          type='link'
-          onClick={() => history.push(`/memberCenter/procurementAbility/confirmOffer/detail?id=${record.id}&turn=${record.turn}`)}
-        >
-          比价
+        { record.confirmInteriorState === OFFTER_CONFIRMINTERNALSTATE_TYPE.WAITSTHAN_TYPE &&
+          <Button
+            type='link'
+            onClick={() => history.push(`/memberCenter/procurementAbility/confirmOffer/detail?id=${record.id}&turn=${record.turn}`)}
+          >
+            比价
         </Button>
-        <Button type='link'>修改授标结果</Button>
+        }
+        {
+          ( record.confirmInteriorState === OFFTER_CONFIRMINTERNALSTATE_TYPE.AUDITNOPASS1_TYPE &&
+            record.confirmInteriorState === OFFTER_CONFIRMINTERNALSTATE_TYPE.AUDITNOPASS2_TYPE
+          ) && <Button type='link'>修改授标结果</Button>
+        }
       </>
 
   }];

src/pages/transaction/purchaseAbility/constants/index.ts

@@ -141,6 +141,29 @@ export enum OFFTER_INTERNALSTATE_TYPE {
   SUCCESS_TYPE = 99,
 }
 
+export enum OFFTER_CONFIRMINTERNALSTATE_TYPE {
+  /** 作废 */
+  ABANDON_TYPE = -1,
+  /** 待比价 */
+  WAITSTHAN_TYPE = 1,
+  /** 待审核授标结果(一级) */
+  WAITAUDIT1_TYPE,
+  /** 待审核授标结果(二级) */
+  WAITAUDIT2_TYPE,
+  /** 待确认授标结果 */
+  WAITCONFIRMRESULTS_TYPE,
+  /** 审核授标结果通过(一级) */
+  AUDITPASS1_TYPE,
+  /** 审核授标结果通过(二级) */
+  AUDITPASS2_TYPE,
+  /** 审核授标结果不通过(一级) */
+  AUDITNOPASS1_TYPE,
+  /** 审核授标结果不通过(二级) */
+  AUDITNOPASS2_TYPE,
+  /** 已完成 */
+  SUCCESS_TYPE = 99,
+}
+
 /** 阿拉伯对应中文 */
 export const CHNUM_TYPE = {
   1: '一',
@@ -237,3 +260,10 @@ export const OFFTER_CONFIRMINTERIORSTATE_COLOR = {
   7: 'error',
   8: 'error',
 }
+
+export enum PRICECONTRAST_TYPE {
+  /** 未解密 */
+  UNDECRYPTED = 1,
+  /** 未加密 */
+  UNENCRYPTED
+}