Commit f05048e5 authored by wuting's avatar wuting

fix: bug

parent 854fba20
...@@ -20,7 +20,6 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte ...@@ -20,7 +20,6 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import { FORM_FILTER_PATH } from '@/formSchema/const'; import { FORM_FILTER_PATH } from '@/formSchema/const';
import { purchaseSchema } from './schema'; import { purchaseSchema } from './schema';
import { PurchaseContractListSchema } from './schema'; import { PurchaseContractListSchema } from './schema';
import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix';
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
const intl = getIntl(); const intl = getIntl();
...@@ -617,7 +616,6 @@ const FormList = (props: any) => { ...@@ -617,7 +616,6 @@ const FormList = (props: any) => {
); );
}, },
components: { components: {
DateRangePickerUnix,
Submit Submit
}, },
}, },
......
...@@ -112,9 +112,8 @@ export const PurchaseContractListSchema: any = { ...@@ -112,9 +112,8 @@ export const PurchaseContractListSchema: any = {
placeholder: intl.formatMessage({id: 'contract.qingshuru'})+ intl.formatMessage({id: 'contract.purchase.member'}) placeholder: intl.formatMessage({id: 'contract.qingshuru'})+ intl.formatMessage({id: 'contract.purchase.member'})
} }
}, },
"[startTime,endTime]": { "[startDate,endDate]": {
type: 'array', "type": "daterange",
"x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: [intl.formatMessage({id: 'contract.qingshuru'}), intl.formatMessage({id: 'contract.jieshushijian'})], placeholder: [intl.formatMessage({id: 'contract.qingshuru'}), intl.formatMessage({id: 'contract.jieshushijian'})],
}, },
......
...@@ -7,14 +7,12 @@ import { ColumnType } from 'antd/lib/table/interface'; ...@@ -7,14 +7,12 @@ import { ColumnType } from 'antd/lib/table/interface';
import StandardTable from '@/components/StandardTable'; import StandardTable from '@/components/StandardTable';
import EyePreview from '@/components/EyePreview' import EyePreview from '@/components/EyePreview'
import { FORM_FILTER_PATH } from '@/formSchema/const'; import { FORM_FILTER_PATH } from '@/formSchema/const';
import StatusTag from '@/components/StatusTag';
import { PurchaseContractListSchema } from '../schema' import { PurchaseContractListSchema } from '../schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import { getIntl, history } from 'umi'; import { getIntl, history } from 'umi';
import moment from 'moment'; import moment from 'moment';
import { getContractPurchaseInviteBidPageToBeCreate, getContractPurchaseRequisitionPageToBeCreate } from '@/services/ContractV2Api' import { getContractPurchaseRequisitionPageToBeCreate } from '@/services/ContractV2Api'
import AuthButton from '@/components/AuthButton' import AuthButton from '@/components/AuthButton'
import { InfoCircleFilled, PlusCircleOutlined } from '@ant-design/icons'; import { InfoCircleFilled, PlusCircleOutlined } from '@ant-design/icons';
const intl = getIntl(); const intl = getIntl();
...@@ -142,8 +140,6 @@ const BiddingList = () => { ...@@ -142,8 +140,6 @@ const BiddingList = () => {
} }
// 列表数据 // 列表数据
const fetchData = (params?: any) => { const fetchData = (params?: any) => {
params.startTime = params.startTime ? moment(Number(params.startTime)).format('YYYY-MM-DD') : '';
params.endTime = params.endTime ? moment(Number(params.endTime)).format('YYYY-MM-DD') : '';
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getContractPurchaseRequisitionPageToBeCreate({ getContractPurchaseRequisitionPageToBeCreate({
...params, ...params,
...@@ -246,7 +242,6 @@ const BiddingList = () => { ...@@ -246,7 +242,6 @@ const BiddingList = () => {
); );
}, },
components: { components: {
DateRangePickerUnix,
Submit Submit
}, },
}, },
......
...@@ -481,9 +481,8 @@ export const PurchaseContractListSchema: any = { ...@@ -481,9 +481,8 @@ export const PurchaseContractListSchema: any = {
placeholder: intl.formatMessage({id: 'contract.qingshuru'})+ intl.formatMessage({id: 'contract.purchase.member'}) placeholder: intl.formatMessage({id: 'contract.qingshuru'})+ intl.formatMessage({id: 'contract.purchase.member'})
} }
}, },
"[startTime,endTime]": { "[startDate,endDate]": {
type: 'array', "type": "daterange",
"x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: [intl.formatMessage({id: 'contract.qingshuru'}), intl.formatMessage({id: 'contract.jieshushijian'})], placeholder: [intl.formatMessage({id: 'contract.qingshuru'}), intl.formatMessage({id: 'contract.jieshushijian'})],
}, },
......
...@@ -192,18 +192,18 @@ const Add = () => { ...@@ -192,18 +192,18 @@ const Add = () => {
}; };
} }
const { materials,baseProcessId,members, ...rest } = values; const { materials,baseProcessId,members,name,...rest } = values;
const defaultPostData = { const defaultPostData = {
allMembers: values.suitableMaterialType === 1, allMembers: values.suitableMaterialType === 1,
processId: baseProcessId, processId: baseProcessId,
...rest, name:name,
...tempData, ...tempData,
}; };
const postData = isAdd const postData = isAdd
? defaultPostData ? defaultPostData
: { : {
...defaultPostData, ...defaultPostData,
processSubId: id, processSubId: Number(id),
}; };
const service = isAdd const service = isAdd
......
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