merge: 合并v2-220318

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

@@ -136,9 +136,10 @@ const ContrastLyout1: React.FC<IProps> = (props: any) => {
     const dataSoure = { ...soure }
     dataSoure[index] = [...params]
     setSoure(dataSoure);
-    if (preview || isEdit) {
-      redux(params)
-    }
+    redux(params)
+    // if (preview || isEdit) {
+    //   redux(params)
+    // }
   }
 
   /** 点击比价 */

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

@@ -33,6 +33,7 @@ const BidModal: React.FC<IProps> = (props: any) => {
   const [loading, setloading] = useState(false);
   const [priceParityInfos, setPriceParityInfos] = useState<any>([]);
   const dataSource = useContext(BidDetailContext);
+  const [confirmLoading, setConfirmLoading] = useState<boolean>(false);
   /**判断文件类型和大小 */
   const beforeDocUpload = (file: any) => {
     const isLt20M = file.size / 1024 / 1024 < 20;
@@ -104,8 +105,10 @@ const BidModal: React.FC<IProps> = (props: any) => {
         item.awardInfoResponses = awardInfoResponses
         params.push(item)
       })
+      console.log(params, 'params')
       setPriceParityInfos(params)
     }
+    console.log(dataSource, 'dataSource')
   }, [visible])
 
   const handleSubmit = async () => {
@@ -130,10 +133,15 @@ const BidModal: React.FC<IProps> = (props: any) => {
           return
         }
       }
-      postPurchaseConfirmQuotedPriceSubmitContrastPrice(params).then(res => {
-        if (res.code === 1000) {
-          handleConfirm();
+      setConfirmLoading(true)
+      postPurchaseConfirmQuotedPriceSubmitContrastPrice({ ...params }, { ctlType: 'none' }).then(res => {
+        if (res.code !== 1000) {
+          message.error(intl.formatMessage({ id: res.code }));
+          setConfirmLoading(false)
+          return
         }
+        setConfirmLoading(false)
+        handleConfirm();
       })
     } catch (errInfo) {
       console.log('Save failed:', errInfo);
@@ -146,6 +154,7 @@ const BidModal: React.FC<IProps> = (props: any) => {
       visible={visible}
       width={600}
       onCancel={onCancel}
+      confirmLoading={confirmLoading}
       onOk={handleSubmit}
     >
       <Form form={form} layout="vertical">
@@ -155,7 +164,7 @@ const BidModal: React.FC<IProps> = (props: any) => {
         >
           <TextArea />
         </Form.Item>
-        <Form.Item label={intl.formatMessage({ id: 'detail.purchase.file'})} name='upload'>
+        <Form.Item label={intl.formatMessage({ id: 'detail.purchase.file' })} name='upload'>
           <div className={style.upload_data}>
             {files.length > 0 && files.map((v, index) => (
               <div key={index} className={style.upload_item}>

src/pages/transaction/purchaseOrder/orderCollectB2b/components/addressModal/index.tsx

-import React, { useMemo } from 'react'
+import React, { useMemo, useRef } from 'react'
 import ModalForm from '@/components/ModalForm'
 import { createFormActions } from '@formily/antd'
 import addressSchema from './schema'
@@ -31,6 +31,7 @@ const fetchTelCode = async () => {
 const AddressModal:React.FC<AddressModalProps> = (props) => {
   const { mode, formInitValue } = props
   const selfInitValue = useMemo(() => mode === 'add' ? null : formInitValue, [mode, formInitValue])
+  const changDistrict = useRef<boolean>(false)
   // 由于默认是number类型, 但switch组件只接收boolean
   if (selfInitValue) {
     selfInitValue.isDefault = !!selfInitValue.isDefault
@@ -55,7 +56,8 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
     const provinceName = obj_provinceCode ? obj_provinceCode['title'] :  value.provinceName
     const cityName = obj_cityCode ? obj_cityCode['title'] :  value.cityName
     const districtName = obj_districtCode ? obj_districtCode['title'] :  value.districtName
-    const streetName = obj_streetCode ? obj_streetCode['title'] :  value.streetName
+    const streetName = changDistrict.current ? (obj_streetCode ? obj_streetCode['title'] : obj_streetCode) : value.streetName
+    const streetCode = changDistrict.current ? (obj_streetCode ? obj_streetCode['value'] : obj_streetCode) : value.streetCode
 
     const params = {
       ...value,
@@ -63,7 +65,8 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
       provinceName,
       cityName,
       districtName,
-      streetName
+      streetName,
+      streetCode
     }
     const fn = mode === 'edit' ? postLogisticsReceiverAddressUpdate : postLogisticsReceiverAddressAdd
     await fn(params)
@@ -116,6 +119,7 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
     // 街道/乡/镇
     $('onFieldValueChange', 'districtCode').subscribe(({value}) => {
       if(value) {
+        changDistrict.current = true
         ctx.setFieldValue('streetCode', null)
         renderSelectOption('streetCode', ctx, { pcode: value })
       }

src/pages/transaction/purchaseOrder/orderCollectCash/components/addressModal/index.tsx

@@ -31,6 +31,7 @@ const fetchTelCode = async () => {
 const AddressModal:React.FC<AddressModalProps> = (props) => {
   const { mode, formInitValue } = props
   const selfInitValue = useMemo(() => mode === 'add' ? null : formInitValue, [mode, formInitValue])
+  const changDistrict = useRef<boolean>(false)
   // 由于默认是number类型, 但switch组件只接收boolean
   if (selfInitValue) {
     selfInitValue.isDefault = !!selfInitValue.isDefault
@@ -55,7 +56,8 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
     const provinceName = obj_provinceCode ? obj_provinceCode['title'] :  value.provinceName
     const cityName = obj_cityCode ? obj_cityCode['title'] :  value.cityName
     const districtName = obj_districtCode ? obj_districtCode['title'] :  value.districtName
-    const streetName = obj_streetCode ? obj_streetCode['title'] :  value.streetName
+    const streetName = changDistrict.current ? (obj_streetCode ? obj_streetCode['title'] : obj_streetCode) : value.streetName
+    const streetCode = changDistrict.current ? (obj_streetCode ? obj_streetCode['value'] : obj_streetCode) : value.streetCode
 
     const params = {
       ...value,
@@ -63,7 +65,8 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
       provinceName,
       cityName,
       districtName,
-      streetName
+      streetName,
+      streetCode
     }
 
     const fn = mode === 'edit' ? postLogisticsReceiverAddressUpdate : postLogisticsReceiverAddressAdd
@@ -117,6 +120,7 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
     // 街道/乡/镇
     $('onFieldValueChange', 'districtCode').subscribe(({value}) => {
       if(value) {
+        changDistrict.current = true
         ctx.setFieldValue('streetCode', null)
         renderSelectOption('streetCode', ctx, { pcode: value })
       }

src/pages/transaction/purchaseOrder/orderCollectSrm/components/addressModal/index.tsx

-import React, { useMemo } from 'react'
+import React, { useMemo, useRef } from 'react'
 import ModalForm from '@/components/ModalForm'
 import { createFormActions } from '@formily/antd'
 import addressSchema from './schema'
@@ -31,6 +31,7 @@ const fetchTelCode = async () => {
 const AddressModal:React.FC<AddressModalProps> = (props) => {
   const { mode, formInitValue } = props
   const selfInitValue = useMemo(() => mode === 'add' ? null : formInitValue, [mode, formInitValue])
+  const changDistrict = useRef<boolean>(false)
   // 由于默认是number类型, 但switch组件只接收boolean
   if (selfInitValue) {
     selfInitValue.isDefault = !!selfInitValue.isDefault
@@ -55,7 +56,8 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
     const provinceName = obj_provinceCode ? obj_provinceCode['title'] :  value.provinceName
     const cityName = obj_cityCode ? obj_cityCode['title'] :  value.cityName
     const districtName = obj_districtCode ? obj_districtCode['title'] :  value.districtName
-    const streetName = obj_streetCode ? obj_streetCode['title'] :  value.streetName
+    const streetName = changDistrict.current ? (obj_streetCode ? obj_streetCode['title'] : obj_streetCode) : value.streetName
+    const streetCode = changDistrict.current ? (obj_streetCode ? obj_streetCode['value'] : obj_streetCode) : value.streetCode
 
     const params = {
       ...value,
@@ -63,7 +65,8 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
       provinceName,
       cityName,
       districtName,
-      streetName
+      streetName,
+      streetCode
     }
     const fn = mode === 'edit' ? postLogisticsReceiverAddressUpdate : postLogisticsReceiverAddressAdd
     await fn(params)
@@ -116,6 +119,7 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
     // 街道/乡/镇
     $('onFieldValueChange', 'districtCode').subscribe(({value}) => {
       if(value) {
+        changDistrict.current = true
         ctx.setFieldValue('streetCode', null)
         renderSelectOption('streetCode', ctx, { pcode: value })
       }

src/pages/transaction/purchaserEvaluation/analysis/index.tsx

 import React, { useEffect, useState } from 'react';
 import { Tabs, Row, Col, Button } from 'antd';
-import { getIntl, history } from 'umi';
+import { getIntl, history, IRouteComponentProps } from 'umi';
 import { observer, inject } from 'mobx-react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { getMemberCommentConsumerCountTradeHistoryPage, getMemberCommentConsumerCountTradeSummary, getMemberCommentConsumerReceiveTradeHistoryPage, getMemberCommentConsumerSendTradeHistoryPage } from '@/services/MemberV2Api';
@@ -16,6 +16,7 @@ import styles from './index.less';
 
 const { TabPane } = Tabs;
 const intl = getIntl();
+
 interface ReceivedSearch {
   /**
    * 评价星级（1-5）
@@ -46,13 +47,15 @@ interface EstimateSumItems {
   sum?: number,
 };
 
-interface AnalysisProps {
+interface AnalysisProps extends IRouteComponentProps {
   EvaluationStore?: IEvaluationModule;
 };
 
 const Analysis: React.FC<AnalysisProps> = ({
   EvaluationStore,
+  match,
 }) => {
+  const url = match.path.split('/').slice(0, -1).join('/');
   const [evaluateSum, setEvaluateSum] = useState([]);
   const [evaluatePie, setEvaluatePie] = useState([]);
 
@@ -301,15 +304,15 @@ const Analysis: React.FC<AnalysisProps> = ({
   }, []);
 
   const handleJumpReceived = record => {
-    history.push(`/memberCenter/tranactionAbility/purchaserEvaluation/received/detail?id=${record.id}`);
+    history.push(`${url}/received/detail?id=${record.id}`);
   };
 
   const handleEditSent = record => {
-    history.push(`/memberCenter/tranactionAbility/purchaserEvaluation/sent/edit?id=${record.id}`);
+    history.push(`${url}/sent/edit?id=${record.id}`);
   };
 
   const handleJumpSent = record => {
-    history.push(`/memberCenter/tranactionAbility/purchaserEvaluation/sent/detail?id=${record.id}`);
+    history.push(`${url}/sent/detail?id=${record.id}`);
   };
 
   return (

src/pages/transaction/purchaserEvaluation/unevaluated/index.tsx

 import React, { useState, useRef } from 'react';
 import { Card, Badge, Button } from 'antd';
-import { getIntl, Link } from 'umi';
+import { getIntl, Link, IRouteComponentProps } from 'umi';
 import StandardTable from '@/components/StandardTable';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
@@ -13,14 +13,18 @@ import { checkIsPointsOrder } from '@/constants/order';
 import EyePreview from '@/components/EyePreview';
 import NiceForm from '@/components/NiceForm';
 import StatusTag from '@/components/StatusTag';
-import { listSearchSchema } from './schema';
-import styles from './index.less';
 import { AuthUrl } from '@/components/AuthButton/AuthUrl';
 import AuthButton from '@/components/AuthButton';
+import { listSearchSchema } from './schema';
+import styles from './index.less';
+
 const intl = getIntl();
 const formActions = createFormActions();
 
-const Unevaluated: React.FC = () => {
+interface IProps extends IRouteComponentProps {}
+
+const Unevaluated: React.FC<IProps> = (props) => {
+  const { match } = props;
 
   const ref = useRef<any>({});
 
@@ -32,7 +36,7 @@ const Unevaluated: React.FC = () => {
       render: (text, record) => (
         <EyePreview
           type={AuthUrl('purchaserEvaluation.see') ? 'link' : 'button'}
-          url={`/memberCenter/tranactionAbility/purchaserEvaluation/unevaluated/order?id=${record.id}`}
+          url={`${match.path}/order?id=${record.id}`}
         >
           {text}
         </EyePreview>
@@ -87,7 +91,7 @@ const Unevaluated: React.FC = () => {
       render: (text, record) => (
         <>
           <AuthButton btnCode='purchaserEvaluation.pingjia' >
-            <Link to={`/memberCenter/tranactionAbility/purchaserEvaluation/unevaluated/evaluate?id=${record.id}`}>
+            <Link to={`${match.path}/evaluate?id=${record.id}`}>
               {!record.completeCommentStatus && (
                 <Button
                   type="link"
@@ -97,7 +101,6 @@ const Unevaluated: React.FC = () => {
               )}
             </Link>
           </AuthButton>
-
         </>
       ),
     },

src/pages/transaction/saleOrder/agentOrder/components/addressModal/index.tsx

-import React, { useMemo } from 'react'
+import React, { useMemo, useRef } from 'react'
 import ModalForm from '@/components/ModalForm'
 import { createFormActions } from '@formily/antd'
 import addressSchema from './schema'
@@ -35,13 +35,16 @@ const fetchTelCode = async () => {
 const AddressModal:React.FC<AddressModalProps> = (props) => {
   const { mode, formInitValue, ctx } = props
   const selfInitValue = useMemo(() => mode === 'add' ? null : formInitValue, [mode, formInitValue])
+  const changDistrict = useRef<boolean>(false)
   // 由于默认是number类型, 但switch组件只接收boolean
   if (selfInitValue) {
     selfInitValue.isDefault = !!selfInitValue.isDefault
   }
+
   const resetForm = () => {
     addressSchemaAction.reset({validate: false})
   }
+
   const handleConfirm = () => {
     if (mode === 'preview') {
       props.currentRef.current.setVisible(false)
@@ -59,7 +62,8 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
     const provinceName = obj_provinceCode ? obj_provinceCode['title'] :  value.provinceName
     const cityName = obj_cityCode ? obj_cityCode['title'] :  value.cityName
     const districtName = obj_districtCode ? obj_districtCode['title'] :  value.districtName
-    const streetName = obj_streetCode ? obj_streetCode['title'] :  value.streetName
+    const streetName = changDistrict.current ? (obj_streetCode ? obj_streetCode['title'] : obj_streetCode) : value.streetName
+    const streetCode = changDistrict.current ? (obj_streetCode ? obj_streetCode['value'] : obj_streetCode) : value.streetCode
 
     const roleId =  ctx.getFieldValue('buyerRoleId')
     const memberId =  ctx.getFieldValue('buyerMemberId')
@@ -72,6 +76,7 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
         cityName,
         districtName,
         streetName,
+        streetCode,
         roleId,
         memberId
       }
@@ -81,7 +86,7 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
       props.currentRef.current.setVisible(false)
       props.reloadAddress && props.reloadAddress()
     } else {
-       message.error(getIntl().formatMessage({id: 'purchaseOrder.orderCollect.model.message2'}))
+      message.error(getIntl().formatMessage({id: 'purchaseOrder.orderCollect.model.message2'}))
     }
   }
 
@@ -131,7 +136,7 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
     // 街道/乡/镇
     $('onFieldValueChange', 'districtCode').subscribe(({value}) => {
       if(value) {
-        console.log(value)
+        changDistrict.current = true
         ctx.setFieldValue('streetCode', null)
         renderSelectOption('streetCode', ctx, { pcode: value })
       }

src/pages/transaction/supplierEvaluation/analysis/index.tsx

 import React, { useEffect, useState, useRef } from 'react';
 import { Tabs, Row, Col } from 'antd';
-import { getIntl, history } from 'umi';
+import { getIntl, history, IRouteComponentProps } from 'umi';
 import { observer, inject } from 'mobx-react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { getMemberCommentSupplyCountTradeSummary, getMemberCommentSupplyCountTradeHistoryPage, getMemberCommentSupplyReceiveTradeHistoryPage, getMemberCommentSupplySendTradeHistoryPage, postMemberCommentSupplyReceiveTradeHistoryReply } from '@/services/MemberV2Api';
@@ -48,13 +48,15 @@ interface EstimateSumItems {
   sum?: number,
 };
 
-interface AnalysisProps {
+interface AnalysisProps extends IRouteComponentProps {
   EvaluationStore?: IEvaluationModule;
 };
 
 const Analysis: React.FC<AnalysisProps> = ({
   EvaluationStore,
+  match,
 }) => {
+  const url = match.path.split('/').slice(0, -1).join('/');
   const [evaluateSum, setEvaluateSum] = useState([]);
   const [evaluatePie, setEvaluatePie] = useState([]);
 
@@ -323,15 +325,15 @@ const Analysis: React.FC<AnalysisProps> = ({
   }, []);
 
   const handleJumpReceived = record => {
-    history.push(`/memberCenter/tranactionAbility/supplierEvaluation/received/detail?id=${record.id}`);
+    history.push(`${url}/received/detail?id=${record.id}`);
   };
 
   const handleEditSent = record => {
-    history.push(`/memberCenter/tranactionAbility/supplierEvaluation/sent/edit?id=${record.id}`);
+    history.push(`${url}/sent/edit?id=${record.id}`);
   };
 
   const handleJumpSent = record => {
-    history.push(`/memberCenter/tranactionAbility/supplierEvaluation/sent/detail?id=${record.id}`);
+    history.push(`${url}/sent/detail?id=${record.id}`);
   };
 
   const handleVisibleExplainModal = (flag?: boolean) => {

src/pages/transaction/supplierEvaluation/unevaluated/index.tsx

 import React, { useState, useRef } from 'react';
 import { Card, Badge, Button } from 'antd';
-import { getIntl, Link } from 'umi';
+import { getIntl, IRouteComponentProps, Link } from 'umi';
 import StandardTable from '@/components/StandardTable';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
@@ -20,7 +20,11 @@ import { AuthUrl } from '@/components/AuthButton/AuthUrl';
 
 const formActions = createFormActions();
 const intl = getIntl();
-const Unevaluated: React.FC = () => {
+
+interface IProps extends IRouteComponentProps {}
+
+const Unevaluated: React.FC<IProps> = (props) => {
+  const { match } = props;
 
   const ref = useRef<any>({});
 
@@ -32,7 +36,7 @@ const Unevaluated: React.FC = () => {
       render: (text, record) => (
         <EyePreview
           type={AuthUrl('unevaluated.see') ? 'link' : 'button'}
-          url={`/memberCenter/tranactionAbility/supplierEvaluation/unevaluated/order?id=${record.id}`}
+          url={`${match.path}/order?id=${record.id}`}
         >
           {text}
         </EyePreview>
@@ -87,7 +91,7 @@ const Unevaluated: React.FC = () => {
       render: (text, record) => (
         <>
           <AuthButton btnCode='unevaluated.pingjia' >
-            <Link to={`/memberCenter/tranactionAbility/supplierEvaluation/unevaluated/evaluate?id=${record.id}`}>
+            <Link to={`${match.path}/evaluate?id=${record.id}`}>
               {!record.completeCommentStatus && (
                 <Button
                   type="link"
@@ -97,7 +101,6 @@ const Unevaluated: React.FC = () => {
               )}
             </Link>
           </AuthButton>
-
         </>
       ),
     },