Skip to content

J
jinfa-platform
Commit c74564a9 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

feat: 修复询价报价工作流接口调用

parent 66f68798
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 84 deletions
src/pages/transaction/dealAbility/inquiryOffer/offerSearch/index.tsx
View file @ c74564a9
......@@ -7,7 +7,7 @@ import EyePreview from '@/components/EyePreview';
import moment from 'moment';
import { OFFERSEARCHSCHEMA } from './schema';
import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
import { getTransactionProductInquiryInteriorStateEnum, getTransactionProductQuotationList, getTransactionQuotationtInquiryExternalStateEnum } from '@/services/TransactionV2Api';
import { getTransactionProductQuotationList, getTransactionQuotationtInquiryExternalStateEnum, postTransactionQuotationtInquiryInteriorStateEnum } from '@/services/TransactionV2Api';
const intl = getIntl();
const OfferSearch = () => {
......@@ -19,49 +19,49 @@ const OfferSearch = () => {
const columns: ColumnType<any>[] = [
{
title: intl.formatMessage({id: 'dealAbility.baojiadanhao'}),
title: intl.formatMessage({ id: 'dealAbility.baojiadanhao' }),
key: 'quotationNo',
dataIndex: 'quotationNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/inquiryOffer/offerSearch/offer/preview?id=${record.id}`}>{text}</EyePreview>
},
{
title: intl.formatMessage({id: 'dealAbility.xunjiadanhao'}),
title: intl.formatMessage({ id: 'dealAbility.xunjiadanhao' }),
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/inquiryOffer/offerSearch/inquiry/preview?id=${record.inquiryListId}`}>{text}</EyePreview>
},
{
title: intl.formatMessage({id: 'dealAbility.baojiadanzhaiyao'}),
title: intl.formatMessage({ id: 'dealAbility.baojiadanzhaiyao' }),
key: 'details',
dataIndex: 'details',
},
{
title: intl.formatMessage({id: 'dealAbility.xunjiahuiyuan'}),
title: intl.formatMessage({ id: 'dealAbility.xunjiahuiyuan' }),
key: 'memberName',
dataIndex: 'memberName',
},
{
title:intl.formatMessage({id: 'dealAbility.baojiajiezhishijian'}),
title: intl.formatMessage({ id: 'dealAbility.baojiajiezhishijian' }),
key: 'quotationAsTime',
dataIndex: 'quotationAsTime',
render: (text: any, record: any) => format(text)
},
{
title: intl.formatMessage({id: 'dealAbility.danjushijian'}),
title: intl.formatMessage({ id: 'dealAbility.danjushijian' }),
key: 'voucherTime',
dataIndex: 'voucherTime',
render: (text: any, record: any) => format(text)
},
{
title: intl.formatMessage({id: 'dealAbility.waibuzhuangtai'}),
title: intl.formatMessage({ id: 'dealAbility.waibuzhuangtai' }),
key: 'externalState',
dataIndex: 'externalState',
render: (text: any, record: any) => <Tag color={EXTERNALSTATE_COLOR[text]}>{record.externalStateName}</Tag>
},
{
title: intl.formatMessage({id: 'dealAbility.neibuzhuangtai'}),
title: intl.formatMessage({ id: 'dealAbility.neibuzhuangtai' }),
key: 'interiorState',
dataIndex: 'interiorState',
render: (text: any, record: any) => <Badge status={INTERNALSTATE_COLOR[text]} text={record.interiorStateName} />
......@@ -76,7 +76,7 @@ const OfferSearch = () => {
fetch={getTransactionProductQuotationList}
reload={reload}
externalStatusFetch={getTransactionQuotationtInquiryExternalStateEnum()}
interiorStatusFetch={getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
interiorStatusFetch={postTransactionQuotationtInquiryInteriorStateEnum({}, { ctlType: 'none' })}
/>
)
}
......
src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/index.tsx
View file @ c74564a9
......@@ -140,8 +140,6 @@ const WaitAddOffer = () => {
columns={columns}
effects="quotationNo"
fetch={getTransactionStayProductQuotationList}
externalStatusFetch={getTransactionProductInquiryExternalStateEnum({ type: '2' })}
interiorStatusFetch={getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
fetchRowkeys={(e) => setRowKeys(e)}
getCheckboxProps={getCheckboxProps}
controllerBtns={
......
src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/schema.ts
View file @ c74564a9
......@@ -75,26 +75,6 @@ export const WAITADDOFFERSCHEMA: ISchema = {
placeholder: [intl.formatMessage({id: 'dealAbility.kaishishijian'}),intl.formatMessage({id: 'dealAbility.jieshushijian'})],
}
},
externalState: {
type: "string",
"x-component-props": {
placeholder: intl.formatMessage({ id: 'dealAbility.waibuzhuangtai' }),
style: {
width: 160
}
},
enum: []
},
interiorState: {
type: "string",
"x-component-props": {
placeholder: intl.formatMessage({ id: 'dealAbility.neibuzhuangtai' }),
style: {
width: 160
}
},
enum: []
},
}
},
sumbit: {
......
src/pages/transaction/dealAbility/inquiryOffer/waitAuditOfferOne/index.tsx
View file @ c74564a9
......@@ -87,8 +87,6 @@ const WaitAuditOfferOne = () => {
columns={columns}
effects="quotationNo"
fetch={getTransactionAuditProductQuotationList}
externalStatusFetch={getTransactionProductInquiryExternalStateEnum({ type: '2' })}
interiorStatusFetch={getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
fetchRowkeys={(e) => setRowKeys(e)}
controllerBtns={
<Row>
......
src/pages/transaction/dealAbility/inquiryOffer/waitAuditOfferOne/schema.ts
View file @ c74564a9
......@@ -75,26 +75,6 @@ export const WAITAUDITOFFERONESCHEMA: ISchema = {
placeholder: [intl.formatMessage({id: 'dealAbility.kaishishijian'}),intl.formatMessage({id: 'dealAbility.jieshushijian'})],
}
},
externalState: {
type: "string",
"x-component-props": {
placeholder: intl.formatMessage({ id: 'dealAbility.waibuzhuangtai' }),
style: {
width: 160
}
},
enum: []
},
interiorState: {
type: "string",
"x-component-props": {
placeholder: intl.formatMessage({ id: 'dealAbility.neibuzhuangtai' }),
style: {
width: 160
}
},
enum: []
},
}
},
sumbit: {
......
src/pages/transaction/dealAbility/inquiryOffer/waitAuditOfferTwo/index.tsx
View file @ c74564a9
......@@ -87,8 +87,6 @@ const WaitAuditOfferTwo = () => {
columns={columns}
effects="quotationNo"
fetch={getTransactionAuditProductQuotationListTwo}
externalStatusFetch={getTransactionProductInquiryExternalStateEnum({ type: '2' })}
interiorStatusFetch={getTransactionProductInquiryInteriorStateEnum({ type: '2' })}
fetchRowkeys={(e) => setRowKeys(e)}
controllerBtns={
<Row>
......
src/pages/transaction/dealAbility/inquiryOffer/waitAuditOfferTwo/schema.ts
View file @ c74564a9
......@@ -75,26 +75,6 @@ export const WAITADUITOFFERTWOSCHEMA: ISchema = {
placeholder: [intl.formatMessage({id: 'dealAbility.kaishishijian'}),intl.formatMessage({id: 'dealAbility.jieshushijian'})],
}
},
externalState: {
type: "string",
"x-component-props": {
placeholder: intl.formatMessage({ id: 'dealAbility.waibuzhuangtai' }),
style: {
width: 160
}
},
enum: []
},
interiorState: {
type: "string",
"x-component-props": {
placeholder: intl.formatMessage({ id: 'dealAbility.neibuzhuangtai' }),
style: {
width: 160
}
},
enum: []
},
}
},
sumbit: {
......
src/pages/transaction/marketingAbility/selfManagement/readySubmitExamine/components/rulesLayout/index.tsx
View file @ c74564a9
......@@ -249,7 +249,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
rules={[
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/;
const pattern = /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/
const randomEndPrice = getFieldValue('activityDefined')['randomEndPrice'];
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseMinimumAmountRandom' })}`));
......@@ -272,7 +272,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
rules={[
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/;
const pattern = /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/
const randomStartPrice = getFieldValue('activityDefined')['randomStartPrice'];
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseLargestAmountRandom' })}`));
......@@ -351,8 +351,8 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
fieldKey={[fieldKey, `${int === ACTIVITY_TYPE_7 ? 'num' : 'key'}`]}
rules={[{
required: true, validator: (_rule, value) => {
const pattern1 = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
const pattern2 = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/;
const pattern1 = /^([1-9]\d*(\.\d{1,3})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/
const pattern2 = /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/
const valueKey = form.getFieldValue(`activityDefined`)['ladderList'][fieldKey]['value'];
console.log(valueKey)
if (!value && int === ACTIVITY_TYPE_4) {
......@@ -387,8 +387,8 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
fieldKey={[fieldKey, `${int === ACTIVITY_TYPE_7 ? 'discount' : 'value'}`]}
rules={[{
required: true, validator: (_rule, value) => {
const pattern1 = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/;
const pattern2 = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/;
const pattern1 = /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/
const pattern2 = /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/
const pattern3 = /^(?!0+(?:\.0+)?$)\d?\d(?:\.\d{1,1}?)?$/;
const pattern4 = /^(?!0+(?:\.0+)?$)\d?\d(?:\.\d{1,1}?)?$/;
const valueKey = form.getFieldValue(`activityDefined`)['ladderList'][fieldKey]['key'];
......@@ -454,7 +454,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
name={['activityDefined', 'price']}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/;
const pattern = /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseEnterTheAmount' })}`));
}
......@@ -796,7 +796,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
name={['activityDefined', 'orderPrice']}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/;
const pattern = /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseEnterTheOrderAmount' })}`));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment