Merge branch 'dev-srm' of 10.0.0.22:lingxi/lingxi-business-paltform into dev-srm

src/pages/contract/funds/addbill/components/info.tsx

@@ -125,23 +125,27 @@ const AddInfo = (props: any) => {
   /* 查询银行卡新  */
   const getAmountOrder = (selectRow) => {
     PublicApi.getContractManageGetContractInfoByApplyAmountOrder({ contractId: selectRow.id }).then(res => {
+      const basicsData = basics;
+      const info = Info;
       if (res.code == 1000) {
-        const expectPayTime = new Date(res.data.payPlanList[0].expectPayTime).getTime();
-        const basicsData = basics;
-        const info = Info;
-        basicsData.payeeName = res.data.corporateAccountConfig.name;
-        basicsData.bankAccount = res.data.corporateAccountConfig.bankAccount;
-        basicsData.bankDeposit = res.data.corporateAccountConfig.bankDeposit;
-        basicsData.payPlanId = res.data.payPlanList[0].id;
-        basicsData.payRatio = res.data.payPlanList[0].payRatio;
-        basicsData.expectPayTime = moment(expectPayTime),
-          basicsData.payWay = res.data.payPlanList[0].payWay
+        if (res.data.payPlanList.length != 0) {
+          const expectPayTime = new Date(res.data.payPlanList[0].expectPayTime).getTime();
+          basicsData.payPlanId = res.data.payPlanList[0].id;
+          basicsData.payRatio = res.data.payPlanList[0].payRatio;
+          basicsData.expectPayTime = moment(expectPayTime);
+          basicsData.payWay = res.data.payPlanList[0].payWay;
+          basicsData.payParam = res.data.payPlanList[0].payParam;
+          basicsData.applyAmount = res.data.payPlanList[0].payAmount;
+          setapplyAmount(res.data.payPlanList[0].payAmount)
+        }
+
         basicsData.contractNo = selectRow.contractNo;
         basicsData.contractId = selectRow.id;
-        basicsData.payParam = res.data.payPlanList[0].payParam
         info.startTime = selectRow.startTime;
-        basicsData.applyAmount = res.data.payPlanList[0].payAmount;
-        setapplyAmount(res.data.payPlanList[0].payAmount)
+        basicsData.payeeName = res.data.corporateAccountConfig.name;
+        basicsData.bankAccount = res.data.corporateAccountConfig.bankAccount;
+        basicsData.bankDeposit = res.data.corporateAccountConfig.bankDeposit;
+
         info.status = "同意签订合同";
         setpayPlanList(res.data.payPlanList)
         setInfo(info)
@@ -447,10 +451,10 @@ const AddInfo = (props: any) => {
           >
             <Button onClick={() => setvisible(!visible)} style={{ marginRight: 8 }}>
               取消
-          </Button>
+            </Button>
             <Button type="primary" onClick={() => Confirm()} >
               确定
-          </Button>
+            </Button>
           </div>
         }
         destroyOnClose

src/pages/member/memberPrVerifyComing1/detail.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-25 18:02:45
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-06-15 16:29:16
+ * @LastEditTime: 2021-06-18 09:50:34
  * @Description: 待审核入库(一级)详情
  */
 import React, { useState, useEffect } from 'react';
@@ -108,8 +108,8 @@ const MemberPrVerifyComing1Detail: React.FC<{}> = () => {
     ),
     (
       memberInfo
-      && memberInfo.classfication
-      && memberInfo.classfication.code
+      && memberInfo.classification
+      && memberInfo.classification.code
         ? {
           key: 'classifyInfo',
           name: '分类信息',
@@ -238,10 +238,10 @@ const MemberPrVerifyComing1Detail: React.FC<{}> = () => {
           ) : null}
           
           {/* 分类信息 */}
-          {memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
+          {memberInfo && memberInfo.classification && memberInfo.classification.code ? (
             <Col span={24}>
               <MemberDocCategory
-                dataSource={memberInfo?.classfication}
+                dataSource={memberInfo?.classification}
                 id="classifyInfo"
               />
             </Col>

src/pages/member/memberPrVerifyComing1/verify.tsx

@@ -141,8 +141,8 @@ const MemberPrVerifyComing1Verify: React.FC<{}> = () => {
     ),
     (
       memberInfo
-      && memberInfo.classfication
-      && memberInfo.classfication.code
+      && memberInfo.classification
+      && memberInfo.classification.code
         ? {
           key: 'classifyInfo',
           name: '分类信息',
@@ -280,10 +280,10 @@ const MemberPrVerifyComing1Verify: React.FC<{}> = () => {
           ) : null}
           
           {/* 分类信息 */}
-          {memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
+          {memberInfo && memberInfo.classification && memberInfo.classification.code ? (
             <Col span={24}>
               <MemberDocCategory
-                dataSource={memberInfo?.classfication}
+                dataSource={memberInfo?.classification}
                 id="classifyInfo"
               />
             </Col>

src/pages/member/memberPrVerifyComing2/detail.tsx

@@ -108,8 +108,8 @@ const MemberPrVerifyComing2Detail: React.FC<{}> = () => {
     ),
     (
       memberInfo
-      && memberInfo.classfication
-      && memberInfo.classfication.code
+      && memberInfo.classification
+      && memberInfo.classification.code
         ? {
           key: 'classifyInfo',
           name: '分类信息',
@@ -238,10 +238,10 @@ const MemberPrVerifyComing2Detail: React.FC<{}> = () => {
           ) : null}
           
           {/* 分类信息 */}
-          {memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
+          {memberInfo && memberInfo.classification && memberInfo.classification.code ? (
             <Col span={24}>
               <MemberDocCategory
-                dataSource={memberInfo?.classfication}
+                dataSource={memberInfo?.classification}
                 id="classifyInfo"
               />
             </Col>

src/pages/member/memberPrVerifyComing2/verify.tsx

@@ -141,8 +141,8 @@ const MemberPrVerifyComing2Verify: React.FC<{}> = () => {
     ),
     (
       memberInfo
-      && memberInfo.classfication
-      && memberInfo.classfication.code
+      && memberInfo.classification
+      && memberInfo.classification.code
         ? {
           key: 'classifyInfo',
           name: '分类信息',
@@ -280,10 +280,10 @@ const MemberPrVerifyComing2Verify: React.FC<{}> = () => {
           ) : null}
           
           {/* 分类信息 */}
-          {memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
+          {memberInfo && memberInfo.classification && memberInfo.classification.code ? (
             <Col span={24}>
               <MemberDocCategory
-                dataSource={memberInfo?.classfication}
+                dataSource={memberInfo?.classification}
                 id="classifyInfo"
               />
             </Col>

src/pages/member/memberPrVerifyComingConfirm/detail.tsx

@@ -108,8 +108,8 @@ const MemberPrVerifyComingConfirmDetail: React.FC<{}> = () => {
     ),
     (
       memberInfo
-      && memberInfo.classfication
-      && memberInfo.classfication.code
+      && memberInfo.classification
+      && memberInfo.classification.code
         ? {
           key: 'classifyInfo',
           name: '分类信息',
@@ -238,10 +238,10 @@ const MemberPrVerifyComingConfirmDetail: React.FC<{}> = () => {
           ) : null}
           
           {/* 分类信息 */}
-          {memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
+          {memberInfo && memberInfo.classification && memberInfo.classification.code ? (
             <Col span={24}>
               <MemberDocCategory
-                dataSource={memberInfo?.classfication}
+                dataSource={memberInfo?.classification}
                 id="classifyInfo"
               />
             </Col>

src/pages/member/memberPrVerifyComingConfirm/verify.tsx

@@ -141,8 +141,8 @@ const MemberPrVerifyComingConfirmVerify: React.FC<{}> = () => {
     ),
     (
       memberInfo
-      && memberInfo.classfication
-      && memberInfo.classfication.code
+      && memberInfo.classification
+      && memberInfo.classification.code
         ? {
           key: 'classifyInfo',
           name: '分类信息',
@@ -280,10 +280,10 @@ const MemberPrVerifyComingConfirmVerify: React.FC<{}> = () => {
           ) : null}
           
           {/* 分类信息 */}
-          {memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
+          {memberInfo && memberInfo.classification && memberInfo.classification.code ? (
             <Col span={24}>
               <MemberDocCategory
-                dataSource={memberInfo?.classfication}
+                dataSource={memberInfo?.classification}
                 id="classifyInfo"
               />
             </Col>

src/pages/member/memberPrVerifyComingData/detail.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-24 16:46:22
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-05-24 17:09:06
+ * @LastEditTime: 2021-06-18 09:51:05
  * @Description: 待审核入库资料详情
  */
 import React, { useState, useEffect } from 'react';

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

@@ -18,7 +18,6 @@ export interface BidTransformRecordProps {
 
 const BidTransformRecord:React.FC<BidTransformRecordProps> = ({cardTitle}) => {
   const { data, externalProcurementOrderLogResponses, interiorProcurementOrderLogResponses, apiType } = useContext(BidDetailContext)
-
   // 根据模式选择对应的状态映射
   const insideModel = apiType.indexOf('ender') !== -1 ? 'tenderInside' : 'inside';
 
@@ -143,7 +142,7 @@ const BidTransformRecord:React.FC<BidTransformRecordProps> = ({cardTitle}) => {
       extra={
         <Radio.Group value={transferRadio} buttonStyle="solid" size="small" onChange={handleChangeType}>
           {externalProcurementOrderLogResponses?.length ? <Radio.Button value={TransferEnum.Outer}>外部流转</Radio.Button> : null}
-          {interiorProcurementOrderLogResponses?.length ? <Radio.Button value={TransferEnum.Interior}>内部流转</Radio.Button> : null}
+          {interiorProcurementOrderLogResponses?.length && apiType!=='tenderInCallForBid' && apiType!=='callForBidInTender' ? <Radio.Button value={TransferEnum.Interior}>内部流转</Radio.Button> : null}
         </Radio.Group>
       }
       className={style.cardWrap}

src/pages/transaction/components/orderMergeInfo/index.tsx

@@ -74,6 +74,10 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
     { title: '其他要求:', name: 'restsRequire' },
   ]
 
+  if(data.orderModel > 30) {
+    otherInfo.shift()
+  }
+
   return (
     <>
     <Row style={{ marginTop: 24 }} gutter={24}>

src/pages/transaction/components/orderPayModal/index.tsx

@@ -258,7 +258,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
           setPayStep(1)
         }
         else {
-          message.error('暂只支持线下支付、授信额度支付、余额支付、货到付款、微信支付方式')
+          message.error('暂只支持线下支付、授信额度支付、余额支付、货到付款、微信、账期月结支付方式')
         }
       } else {
         message.error('请先选择支付方式')

src/pages/transaction/purchaseAbility/components/detail/components/purchaseBidDemandLayout/index.tsx

 import React, { useContext, useRef } from 'react';
 import { Row, Col, Image, Tag, Tooltip, Switch, Typography } from 'antd';
 import { StandardTable } from 'god';
+import { QuestionCircleOutlined } from '@ant-design/icons';
+
+import StatusTag from '@/components/StatusTag';
 
 import Card from '../../../card';
 import { Context } from '../context';
 import style from './index.less';
-import { QuestionCircleOutlined } from '@ant-design/icons';
 
 const TYPE = {
     1: '发布至平台',
@@ -70,7 +72,7 @@ const DemandLayout: React.FC<DemandLayoutIProps> = (props: any) => {
             title: '是否归属会员',
             key: 'membershipOrNot',
             dataIndex: 'membershipOrNot',
-            render: (text: any) => (<Tag color={text ? 'success' : 'error'}>{text ? '是' : '否'}</Tag>)
+            render: (text: any) => (<StatusTag type={text ? 'success' : 'danger'} title={text ? '是' : '否'} />)
         },
         {
             title: (

src/pages/transaction/purchaseAbility/components/detail/components/recordCommonLayout/index.tsx

 /** 详情通用 - 流转进度 */
 import React, { useContext, useState, useMemo } from 'react';
-import { Radio, Table, Typography, Tag } from 'antd';
+import { Radio, Table, Typography } from 'antd';
 const { Text } = Typography;
+
+import StatusTag from '@/components/StatusTag';
 import { formatTimeString } from '@/utils'
 
 
@@ -44,7 +46,7 @@ const RecordLayout: React.FC<ProgressProps> = (props: any) => {
                     title: '状态',
                     key: 'state',
                     dataIndex: 'state',
-                    render: (_text: any, _record: any) => <Tag color={externalColors(_text)}>{_record.stateName}</Tag>
+                    render: (_text: any, _record: any) => <StatusTag type={externalColors(_text)} title={_record.stateName} />
                 },
                 {
                     title: '操作',
@@ -93,7 +95,7 @@ const RecordLayout: React.FC<ProgressProps> = (props: any) => {
                 title: '状态',
                 key: 'state',
                 dataIndex: 'state',
-                render: (_text: any, _record: any) => <Tag color={internalColors(_text)}>{_record.stateName}</Tag>
+                render: (_text: any, _record: any) => <StatusTag type={internalColors(_text) === 'processing' ? 'primary' : (internalColors(_text) === 'error' ? 'danger' : internalColors(_text))} title={_record.stateName} />
             },
             {
                 title: '操作',

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

@@ -4,13 +4,13 @@ export const BID_EXTERNALSTATE_COLOR = (text) => {
         case -1:
         case 7:
         case 8:
-            return 'error';
+            return 'danger';
         case 2:
         case 3:
         case 4:
             return 'warning';
         case 6:
-            return 'processing';
+            return 'primary';
         case 99:
             return 'success';
         default:

src/pages/transaction/purchaseAbility/onlineBid/detail/index.tsx

 import React, { Fragment, useEffect, useState } from 'react';
-import { Tag, Badge, Button } from 'antd';
+import { Badge, Button } from 'antd';
 import { history } from 'umi';
 
 import { PublicApi } from '@/services/api';
 import { formatTimeString } from '@/utils'
 import { priceFormat } from '@/utils/numberFomat';
+import StatusTag from '@/components/StatusTag';
 
 import { Context } from '../../components/detail/components/context';
 import PeripheralLayout from '../../components/detail';
@@ -89,7 +90,7 @@ const SearchDetail = () => {
                 col: [
                     { label: '竞价编号', extra: data.biddingNo, type: 'text' },
                     { label: '竞价摘要', extra: data.details, type: 'text' },
-                    { label: '外部状态', extra: <Tag color={BID_EXTERNALSTATE_COLOR(data.externalState)}>{data.externalStateName}</Tag>, type: 'text' },
+                    { label: '外部状态', extra: <StatusTag type={BID_EXTERNALSTATE_COLOR(data.externalState)} title={data.externalStateName} />, type: 'text' },
                     { label: '内部状态', extra: <Badge status={BID_INTERNALSTATE_COLOR(data.interiorState)} text={data.interiorStateName} />, type: 'text' },
                 ]
             },

src/pages/transaction/purchaseAbility/onlineBid/readyBid/index.tsx

 import React, { useRef, useState } from 'react';
 import { history } from 'umi';
-import { Button, Tag, Badge, Typography, Space } from 'antd';
+import { Button, Badge, Typography, Space } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
-import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons'
-import moment from 'moment';
+import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons';
 
 import { formatTimeString } from '@/utils'
 import EyePreview from '@/components/EyePreview';
+import StatusTag from '@/components/StatusTag';
 import { PublicApi } from '@/services/api';
 
 import Table from '../../components/table'
@@ -69,7 +69,7 @@ const ReadyBid = () => {
         title: '外部状态',
         key: 'externalState',
         dataIndex: 'externalState',
-        render: (text: any, record: any) => <Tag color={BID_EXTERNALSTATE_COLOR(text)}>{record.externalStateName}</Tag>
+        render: (text: any, record: any) => <StatusTag type={BID_EXTERNALSTATE_COLOR(text)} title={record.externalStateName} />
     }, {
         title: '内部状态',
         key: 'interiorState',

src/pages/transaction/purchaseAbility/onlineBid/readySignUp/index.tsx

 import React, { useRef, useState } from 'react';
 import { history } from 'umi';
-import { Button, Tag, Badge, Typography, Space } from 'antd';
+import { Button, Badge, Typography, Space } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons'
-import moment from 'moment';
 
 import { formatTimeString } from '@/utils'
 import EyePreview from '@/components/EyePreview';
+import StatusTag from '@/components/StatusTag';
 import { PublicApi } from '@/services/api';
 
 import Table from '../../components/table'
@@ -68,7 +68,7 @@ const ReadySignUp = () => {
         title: '外部状态',
         key: 'externalState',
         dataIndex: 'externalState',
-        render: (text: any, record: any) => <Tag color={BID_EXTERNALSTATE_COLOR(text)}>{record.externalStateName}</Tag>
+        render: (text: any, record: any) => <StatusTag type={BID_EXTERNALSTATE_COLOR(text)} title={record.externalStateName} />
     }, {
         title: '内部状态',
         key: 'interiorState',

src/pages/transaction/purchaseAbility/onlineBid/search/index.tsx

 import React, { useRef } from 'react';
-import { Tag, Badge, Typography, Space } from 'antd';
+import { Badge, Typography, Space } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons'
 
 import { formatTimeString } from '@/utils'
 import EyePreview from '@/components/EyePreview';
+import StatusTag from '@/components/StatusTag';
 import { PublicApi } from '@/services/api';
 
 import Table from '../../components/table'
@@ -63,14 +64,14 @@ const Search = () => {
         key: 'isPrize',
         dataIndex: 'isPrize',
         render: (text: any, record: any) => <>
-            {(text !== 1 && text !== 0) ? null : <Tag color={text ? 'success' : 'warning'}>{text ? '是' : '否'}</Tag> }
+            {(text !== 1 && text !== 0) ? null : <StatusTag type={text ? 'success' : 'danger'} title={text ? '是' : '否'} />}
         </>,
         width: 180
     }, {
         title: '外部状态',
         key: 'externalState',
         dataIndex: 'externalState',
-        render: (text: any, record: any) => <Tag color={BID_EXTERNALSTATE_COLOR(text)}>{record.externalStateName}</Tag>
+        render: (text: any, record: any) => <StatusTag type={BID_EXTERNALSTATE_COLOR(text)} title={record.externalStateName} />
     }, {
         title: '内部状态',
         key: 'interiorState',

src/pages/transaction/purchaseAbility/purchaseBid/detail/index.tsx

 import React, { Fragment, useEffect, useState, useMemo } from 'react';
-import { Tag, Badge, Popconfirm, Button } from 'antd';
+import { Badge, Popconfirm, Button } from 'antd';
 import { history } from 'umi';
 import { CheckCircleOutlined } from '@ant-design/icons';
 
@@ -7,6 +7,7 @@ import { PublicApi } from '@/services/api';
 import { GlobalConfig } from '@/global/config'
 import { formatTimeString } from '@/utils'
 import { priceFormat } from '@/utils/numberFomat';
+import StatusTag from '@/components/StatusTag';
 
 import { Context } from '../../components/detail/components/context';
 import PeripheralLayout from '../../components/detail';
@@ -119,7 +120,7 @@ const SearchDetail = () => {
         col: [
           { label: '竞价编号', extra: data.biddingNo, type: 'text' },
           { label: '竞价摘要', extra: data.details, type: 'text' },
-          { label: '外部状态', extra: <Tag color={BID_EXTERNALSTATE_COLOR(data.externalState)}>{data.externalStateName}</Tag>, type: 'text' },
+          { label: '外部状态', extra: <StatusTag type={BID_EXTERNALSTATE_COLOR(data.externalState)} title={data.externalStateName} />, type: 'text' },
           { label: '内部状态', extra: <Badge status={BID_INTERNALSTATE_COLOR(data.interiorState)} text={data.interiorStateName} />, type: 'text' },
         ]
       },

src/pages/transaction/purchaseAbility/purchaseBid/readyAdd/index.tsx

 import React, { useRef, useState } from 'react';
 import { history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
-import { Row, Col, Space, Button, Typography, Popconfirm, Badge, Tag, Menu, Dropdown } from 'antd';
+import { Row, Col, Space, Button, Typography, Popconfirm, Badge, Menu, Dropdown } from 'antd';
 import { PlusOutlined, PlayCircleOutlined, PoweroffOutlined, CaretDownOutlined } from '@ant-design/icons';
 
 import { formatTimeString } from '@/utils'
 import EyePreview from '@/components/EyePreview';
+import StatusTag from '@/components/StatusTag';
 import { PublicApi } from '@/services/api';
 
 import Table from '../../components/table'
@@ -51,7 +52,7 @@ const ReadyAdd = () => {
         title: '外部状态',
         key: 'externalState',
         dataIndex: 'externalState',
-        render: (text: any, record: any) => <Tag color={BID_EXTERNALSTATE_COLOR(text)}>{record.externalStateName}</Tag>
+        render: (text: any, record: any) => <StatusTag type={BID_EXTERNALSTATE_COLOR(text)} title={record.externalStateName} />
     }, {
         title: '内部状态',
         key: 'interiorState',

src/pages/transaction/purchaseAbility/purchaseBid/readyBid/index.tsx

 import React, { useRef } from 'react';
 import { history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
-import { Space, Button, Typography, Badge, Tag } from 'antd';
+import { Space, Button, Typography, Badge } from 'antd';
 import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons';
 
 import EyePreview from '@/components/EyePreview';
+import StatusTag from '@/components/StatusTag';
 import { PublicApi } from '@/services/api';
 import { formatTimeString } from '@/utils'
 
@@ -55,7 +56,7 @@ const ReadyBid = () => {
         title: '外部状态',
         key: 'externalState',
         dataIndex: 'externalState',
-        render: (text: any, record: any) => <Tag color={BID_EXTERNALSTATE_COLOR(text)}>{record.externalStateName}</Tag>
+        render: (text: any, record: any) => <StatusTag type={BID_EXTERNALSTATE_COLOR(text)} title={record.externalStateName} />
     }, {
         title: '内部状态',
         key: 'interiorState',

src/pages/transaction/purchaseAbility/purchaseBid/readyConfirm/index.tsx

 import React, { useRef, useState } from 'react';
 import { ColumnType } from 'antd/lib/table/interface';
-import { Space, Button, Typography, Badge, Tag } from 'antd';
+import { Space, Button, Typography, Badge } from 'antd';
 import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons';
 
 import EyePreview from '@/components/EyePreview';
+import StatusTag from '@/components/StatusTag';
 import { PublicApi } from '@/services/api';
 import { formatTimeString } from '@/utils'
 
@@ -65,7 +66,7 @@ const ReadyConfirm = () => {
         title: '外部状态',
         key: 'externalState',
         dataIndex: 'externalState',
-        render: (text: any, record: any) => <Tag color={BID_EXTERNALSTATE_COLOR(text)}>{record.externalStateName}</Tag>
+        render: (text: any, record: any) => <StatusTag type={BID_EXTERNALSTATE_COLOR(text)} title={record.externalStateName} />
     }, {
         title: '内部状态',
         key: 'interiorState',

src/pages/transaction/purchaseAbility/purchaseBid/readyExamineOne/index.tsx

 import React, { useRef, useState } from 'react';
 import { ColumnType } from 'antd/lib/table/interface';
-import { Row, Col, Space, Button, Typography, Badge, Tag } from 'antd';
+import { Row, Col, Space, Button, Typography, Badge } from 'antd';
 import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons';
 
 import EyePreview from '@/components/EyePreview';
+import StatusTag from '@/components/StatusTag';
 import { PublicApi } from '@/services/api';
 import { formatTimeString } from '@/utils'
 
@@ -54,7 +55,7 @@ const ReadyExamineOne = () => {
         title: '外部状态',
         key: 'externalState',
         dataIndex: 'externalState',
-        render: (text: any, record: any) => <Tag color={BID_EXTERNALSTATE_COLOR(text)}>{record.externalStateName}</Tag>
+        render: (text: any, record: any) => <StatusTag type={BID_EXTERNALSTATE_COLOR(text)} title={record.externalStateName} />
     }, {
         title: '内部状态',
         key: 'interiorState',

src/pages/transaction/purchaseAbility/purchaseBid/readyExamineResultOne/index.tsx

 import React, { useRef, useState } from 'react';
 import { ColumnType } from 'antd/lib/table/interface';
-import { Row, Col, Space, Button, Typography, Badge, Tag } from 'antd';
+import { Row, Col, Space, Button, Typography, Badge } from 'antd';
 import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons';
 
 import EyePreview from '@/components/EyePreview';
+import StatusTag from '@/components/StatusTag';
 import { PublicApi } from '@/services/api';
 import { formatTimeString } from '@/utils'
 
@@ -59,7 +60,7 @@ const ReadyExamineResultOne = () => {
         title: '外部状态',
         key: 'externalState',
         dataIndex: 'externalState',
-        render: (text: any, record: any) => <Tag color={BID_EXTERNALSTATE_COLOR(text)}>{record.externalStateName}</Tag>
+        render: (text: any, record: any) => <StatusTag type={BID_EXTERNALSTATE_COLOR(text)} title={record.externalStateName} />
     }, {
         title: '内部状态',
         key: 'interiorState',

src/pages/transaction/purchaseAbility/purchaseBid/readyExamineResultTwo/index.tsx

 import React, { useRef, useState } from 'react';
 import { ColumnType } from 'antd/lib/table/interface';
-import { Row, Col, Space, Button, Typography, Badge, Tag } from 'antd';
+import { Row, Col, Space, Button, Typography, Badge } from 'antd';
 import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons';
 
 import EyePreview from '@/components/EyePreview';
+import StatusTag from '@/components/StatusTag';
 import { PublicApi } from '@/services/api';
 import { formatTimeString } from '@/utils'
 
@@ -60,7 +61,7 @@ const ReadyExamineResultTwo = () => {
         title: '外部状态',
         key: 'externalState',
         dataIndex: 'externalState',
-        render: (text: any, record: any) => <Tag color={BID_EXTERNALSTATE_COLOR(text)}>{record.externalStateName}</Tag>
+        render: (text: any, record: any) => <StatusTag type={BID_EXTERNALSTATE_COLOR(text)} title={record.externalStateName} />
     }, {
         title: '内部状态',
         key: 'interiorState',

src/pages/transaction/purchaseAbility/purchaseBid/readyExamineSignUp/index.tsx

 import React, { useRef, useState } from 'react';
 import { ColumnType } from 'antd/lib/table/interface';
-import { Space, Button, Typography, Badge, Tag } from 'antd';
+import { Space, Button, Typography, Badge } from 'antd';
 import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons';
 
 import EyePreview from '@/components/EyePreview';
+import StatusTag from '@/components/StatusTag';
 import { PublicApi } from '@/services/api';
 import { formatTimeString } from '@/utils'
 
@@ -67,7 +68,7 @@ const ReadyExamineSignUp = () => {
         title: '外部状态',
         key: 'externalState',
         dataIndex: 'externalState',
-        render: (text: any, record: any) => <Tag color={BID_EXTERNALSTATE_COLOR(text)}>{record.externalStateName}</Tag>
+        render: (text: any, record: any) => <StatusTag type={BID_EXTERNALSTATE_COLOR(text)} title={record.externalStateName} />
     }, {
         title: '内部状态',
         key: 'interiorState',

src/pages/transaction/purchaseAbility/purchaseBid/readyExamineTwo/index.tsx

 import React, { useRef, useState } from 'react';
 import { ColumnType } from 'antd/lib/table/interface';
-import { Row, Col, Space, Button, Typography, Badge, Tag } from 'antd';
+import { Row, Col, Space, Button, Typography, Badge } from 'antd';
 import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons';
 
 import EyePreview from '@/components/EyePreview';
+import StatusTag from '@/components/StatusTag';
 import { PublicApi } from '@/services/api';
 import { formatTimeString } from '@/utils'
 
@@ -53,7 +54,7 @@ const ReadyExamineTwo = () => {
         title: '外部状态',
         key: 'externalState',
         dataIndex: 'externalState',
-        render: (text: any, record: any) => <Tag color={BID_EXTERNALSTATE_COLOR(text)}>{record.externalStateName}</Tag>
+        render: (text: any, record: any) => <StatusTag type={BID_EXTERNALSTATE_COLOR(text)} title={record.externalStateName} />
     }, {
         title: '内部状态',
         key: 'interiorState',

src/pages/transaction/purchaseAbility/purchaseBid/readySubmit/index.tsx

 import React, { useRef, useState } from 'react';
 import { ColumnType } from 'antd/lib/table/interface';
-import { Row, Col, Space, Button, Typography, Badge, Tag } from 'antd';
+import { Row, Col, Space, Button, Typography, Badge } from 'antd';
 import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons';
 
 import EyePreview from '@/components/EyePreview';
+import StatusTag from '@/components/StatusTag';
 import { PublicApi } from '@/services/api';
 import { formatTimeString } from '@/utils'
 
@@ -53,7 +54,7 @@ const ReadySubmit = () => {
         title: '外部状态',
         key: 'externalState',
         dataIndex: 'externalState',
-        render: (text: any, record: any) => <Tag color={BID_EXTERNALSTATE_COLOR(text)}>{record.externalStateName}</Tag>
+        render: (text: any, record: any) => <StatusTag type={BID_EXTERNALSTATE_COLOR(text)} title={record.externalStateName} />
     }, {
         title: '内部状态',
         key: 'interiorState',

src/pages/transaction/purchaseAbility/purchaseBid/readySubmitExamineResult/index.tsx

 import React, { useRef, useState } from 'react';
 import { ColumnType } from 'antd/lib/table/interface';
-import { Space, Button, Typography, Badge, Tag } from 'antd';
+import { Space, Button, Typography, Badge } from 'antd';
 import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons';
 
 import EyePreview from '@/components/EyePreview';
+import StatusTag from '@/components/StatusTag';
 import { PublicApi } from '@/services/api';
 import { formatTimeString } from '@/utils'
 
@@ -61,7 +62,7 @@ const ReadySubmitExamineResult = () => {
         title: '外部状态',
         key: 'externalState',
         dataIndex: 'externalState',
-        render: (text: any, record: any) => <Tag color={BID_EXTERNALSTATE_COLOR(text)}>{record.externalStateName}</Tag>
+        render: (text: any, record: any) => <StatusTag type={BID_EXTERNALSTATE_COLOR(text)} title={record.externalStateName} />
     }, {
         title: '内部状态',
         key: 'interiorState',

src/pages/transaction/purchaseAbility/purchaseBid/search/index.tsx

 import React, { useRef, useState } from 'react';
-import { Button, Tag, Badge, Typography, Space } from 'antd';
+import { Button, Badge, Typography, Space } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons'
 
 import { formatTimeString } from '@/utils'
 import EyePreview from '@/components/EyePreview';
+import StatusTag from '@/components/StatusTag';
 import { PublicApi } from '@/services/api';
 
 import Table from '../../components/table'
@@ -57,7 +58,7 @@ const Search = () => {
         title: '外部状态',
         key: 'externalState',
         dataIndex: 'externalState',
-        render: (text: any, record: any) => <Tag color={BID_EXTERNALSTATE_COLOR(text)}>{record.externalStateName}</Tag>
+        render: (text: any, record: any) => <StatusTag type={BID_EXTERNALSTATE_COLOR(text)} title={record.externalStateName} />
     }, {
         title: '内部状态',
         key: 'interiorState',

src/pages/transaction/purchaseOrder/orderCollect/index.tsx

@@ -137,7 +137,8 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
   const [formLoading, setFormLoading] = useState(false)
   const [btnLoading, setBtnLoading] = useState(false)
   const update = useUpdate()
-  const [productSumPrice, setProductSumPrice] = useState<number>(0)
+  // const [productSumPrice, setProductSumPrice] = useState<number>(0)
+  const productSumPriceRef = useRef<any>(0)
   const { pageStatus, id, page_type = '0', modelType, spam_id, lastTypeParams } = usePageStatus()
   const [initFormSchema, setInitFormSchema] = useState<any>(() => ({...mergeAllSchemas[page_type]}))
   const [initFormValue, setInitFormValue] = useState<any>(() => {
@@ -444,7 +445,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
         forceEdit: col.forceEdit,
         handleSave: paymentSave,
         handleChange: (record, value = 100) => {
-          const payPrice = (value / 100 * productSumPrice).toFixed(2)
+          const payPrice = (value / 100 * productSumPriceRef.current).toFixed(2)
           const newData = [...addSchemaAction.getFieldValue('paymentInformationResponses')];
           const item = newData[index];
           newData.splice(index, 1, {
@@ -460,8 +461,8 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
   const providerValue = {
     detailData: initFormValue,
     schemaActions: addSchemaAction,
-    productSumPrice,
-    setProductSumPrice
+    // productSumPrice,
+    // setProductSumPrice
   }
 
   // 显示采购下单合同栏目
@@ -559,7 +560,8 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
                   })
                   addSchemaAction.setFieldValue('paymentInformationResponses', newData)
                 }
-                setProductSumPrice(payload)
+                // setProductSumPrice(payload)
+                productSumPriceRef.current = payload
               })
               $('onFieldInputChange', 'orderModel').subscribe(state => {
                 const { editable, value } = state
@@ -590,6 +592,9 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
                       state.props.title = orderTypeLabelMap[value]
                       state.visible = true
                     })
+                    ctx.setFieldState('needTheInvoice', state => {
+                      state.visible = false
+                    })
                     showContractColumn()
                   } else {
                     ctx.setFieldState('quotationNo', state => {
@@ -654,24 +659,24 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
                   value === OrderModalType.PURCHASE_TENDER_CONTRACT_ORDER
                 ) {
                   // 判断合同下单
-                  setTimeout(() => {
+                  // setTimeout(() => {
                     addSchemaAction.setFieldState('orderProductRequests', productState => {
                       productState.props["x-component-props"] = {
                         ...productState.props["x-component-props"],
                         prefix: editable ? materialAddButton : '',
                       }
                     })
-                  }, 300)
+                  // }, 500)
                   showContractColumn()
                 } else {
-                  setTimeout(() => {
+                  // setTimeout(() => {
                     addSchemaAction.setFieldState('orderProductRequests', productState => {
                       productState.props["x-component-props"] = {
                         ...productState.props["x-component-props"],
                         prefix: '',
                       }
                     })
-                  })
+                  // }, 500)
                 }
                 // 选择某种类型时， 需显示对应的订单类型
                 ctx.setFieldValue('type', orderTypeLabelMap[value])