Merge branch 'v2-220418-fixPurchaseBid' into 'v2-220418'

src/pages/transaction/purchaseAbility/components/modalOperate/index.tsx

@@ -28,7 +28,8 @@ export interface IProps {
   fetch?: () => Promise<unknown>,
   maxNumber?: number,
   createMemberId?: any,
-  createMemberRoleId?: any
+  createMemberRoleId?: any,
+  hideAuditCancel?: boolean
 }
 
 const ModalOperate: React.FC<IProps> = (props: any) => {
@@ -43,7 +44,8 @@ const ModalOperate: React.FC<IProps> = (props: any) => {
     fetch,
     maxNumber,
     createMemberId,
-    createMemberRoleId
+    createMemberRoleId,
+    hideAuditCancel
   } = props;
 
   const [confirmLoading, setConfirmLoading] = useState<boolean>(false);
@@ -101,12 +103,10 @@ const ModalOperate: React.FC<IProps> = (props: any) => {
   const modalNode = () => {
     switch (modalType) {
       case 'audit':
+        let  _enum = [{ label: intl.formatMessage({ id: 'detail.purchase.message86' }), value: 1 }]
+        !hideAuditCancel && _enum.push({ label: intl.formatMessage({ id: 'detail.purchase.message87' }), value: 0 })
         return <Field
-          enum={
-            [
-              { label: intl.formatMessage({ id: 'detail.purchase.message86' }), value: 1 },
-              { label: intl.formatMessage({ id: 'detail.purchase.message87' }), value: 0 }
-            ]}
+          enum={_enum}
           name='state'
           required
           x-component="Radio"

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

@@ -47,8 +47,7 @@ const ReadyBid = () => {
     key: 'createMemberName',
     dataIndex: 'createMemberName',
     render: (text: any, record: any) => (
-      <EyePreview
-        url={`${ENTERPRISE_CENTER_URL}/shop/${record.createMemberId}_${record.createMemberRoleId}`}>{text}</EyePreview>
+      <EyePreview type='button' class>{text}</EyePreview>
     )
   }, {
     title: intl.formatMessage({ id: 'table.purchase.biddingStartTime' }),

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

@@ -46,7 +46,7 @@ const ReadySignUp = () => {
     key: 'createMemberName',
     dataIndex: 'createMemberName',
     render: (text: any, record: any) => (
-      <EyePreview url={`${ENTERPRISE_CENTER_URL}/shop/${record.createMemberId}_${record.createMemberRoleId}`}>{text}</EyePreview>
+      <EyePreview type='button' class>{text}</EyePreview>
     )
   }, {
     title: intl.formatMessage({ id: 'table.purchase.biddingStartTime' }),

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

@@ -634,6 +634,7 @@ const SearchDetail = () => {
         onOk={() => history.goBack()}
         createMemberId={createMemberId}
         createMemberRoleId={createMemberRoleId}
+        hideAuditCancel={pathPci === 'readySubmit'}
       />
       <ConfirmBidResultModal
         title={intl.formatMessage({ id: 'detail.purchase.modalTitle11' })}