merge: 解决冲突

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/components/basicInfo.tsx

@@ -85,50 +85,6 @@ const BasicInfoLayout: React.FC<BasicInfoLayoutProps> = (props: any) => {
   }, [memb])
 
   return (
-<<<<<<< HEAD
-    <>
-      <Form
-        {...layout}
-        form={basicform}
-        className={styles.revise_style}
-      >
-        <Form.Item label='询价单摘要' name='details' rules={[{ required: true, message: '请输入询价单摘要' }]}>
-          <Input />
-        </Form.Item>
-        <Form.Item label='被询价会员' name='memberId' rules={[{ required: true, message: '请选择被询价会员' }]}>
-          <Search disabled={type === 3 || type === 2} value={memberName ? memberName : undefined} readOnly enterButton={<><LinkOutlined /> 选择</>} onSearch={() => setVisibleChannelMember(true)} />
-          {memberName && <Button type='link' onClick={() => window.open(`${ENTERPRISE_CENTER_URL}/shop/${memberId}_${roleId}`)}>查看会员详情</Button>}
-        </Form.Item>
-        <Form.Item label='询价单号' name='orderNumber'>
-          <span>{(Object.keys(editData).length > 0 && editData.inquiryListNo) ? editData.inquiryListNo : '-'}</span>
-        </Form.Item>
-        <Form.Item label='单据时间' name='time'>
-          <span>{(Object.keys(editData).length > 0 && editData.voucherTime) ? format(editData.voucherTime) : '-'}</span>
-        </Form.Item>
-        <Form.Item label='外部状态' name='external'>
-          <span>{(Object.keys(editData).length > 0 && editData.externalState) ? <Tag color={EXTERNALSTATE_COLOR[editData.externalState]}>{editData.externalStateName}</Tag> : '-'}</span>
-        </Form.Item>
-        <Form.Item label='内部状态' name='internal'>
-          <span>{(Object.keys(editData).length > 0 && editData.interiorState) ? <Badge  status={INTERNALSTATE_COLOR[editData.interiorState]} text={editData.interiorStateName} /> : '-'}</span>
-        </Form.Item>
-      </Form>
-      {/* 选择会员弹框 */}
-      <ModalTable
-        modalTitle='选择会员'
-        confirm={handleOkAddMember}
-        cancel={handleCancelAddMember}
-        visible={visibleChannelMember}
-        forceRender={visibleChannelMember}
-        resetModal={{ destroyOnClose: true, forceRender: true }}
-        columns={columnsSetMember}
-        rowSelection={memberRowSelection}
-        fetchTableData={params => fetchMemberList(params)}
-        formilyProps={
-          {
-            ctx: { schema: formSearch }
-          }
-        }
-=======
     <Card
       id="basicInfoLayout"
       title="基本信息"
@@ -150,7 +106,6 @@ const BasicInfoLayout: React.FC<BasicInfoLayoutProps> = (props: any) => {
         visible={visible}
         title="选择会员"
         mode="radio"
->>>>>>> dev-srm
         tableProps={{
           rowKey: 'id',
         }}