Merge branch 'v2-220518' into 'v2-220518'

src/pages/contract/manage/add/components/FormList.tsx

@@ -20,7 +20,6 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { purchaseSchema } from './schema';
 import { PurchaseContractListSchema } from './schema';
-import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix';
 import Submit from '@/components/NiceForm/components/Submit'
 
 const intl = getIntl();
@@ -617,7 +616,6 @@ const FormList = (props: any) => {
                 );
               },
               components: {
-                DateRangePickerUnix,
                 Submit
               },
             },

src/pages/contract/manage/add/components/schema.tsx

@@ -112,9 +112,8 @@ export const PurchaseContractListSchema: any = {
             placeholder: intl.formatMessage({id: 'contract.qingshuru'})+ intl.formatMessage({id: 'contract.purchase.member'})
           }
         },
-        "[startTime,endTime]": {
-          type: 'array',
-          "x-component": 'DateRangePickerUnix',
+        "[startDate,endDate]": {
+          "type": "daterange",
           'x-component-props': {
             placeholder: [intl.formatMessage({id: 'contract.qingshuru'}), intl.formatMessage({id: 'contract.jieshushijian'})],
           },

src/pages/contract/manage/purchaseRequisition/index.tsx

@@ -7,14 +7,12 @@ import { ColumnType } from 'antd/lib/table/interface';
 import StandardTable from '@/components/StandardTable';
 import EyePreview from '@/components/EyePreview'
 import { FORM_FILTER_PATH } from '@/formSchema/const';
-import StatusTag from '@/components/StatusTag';
 import { PurchaseContractListSchema } from '../schema'
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
 import Submit from '@/components/NiceForm/components/Submit'
-import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
 import { getIntl, history } from 'umi';
 import moment from 'moment';
-import { getContractPurchaseInviteBidPageToBeCreate, getContractPurchaseRequisitionPageToBeCreate } from '@/services/ContractV2Api'
+import { getContractPurchaseRequisitionPageToBeCreate } from '@/services/ContractV2Api'
 import AuthButton from '@/components/AuthButton'
 import { InfoCircleFilled, PlusCircleOutlined } from '@ant-design/icons';
 const intl = getIntl();
@@ -142,8 +140,6 @@ const BiddingList = () => {
   }
   // 列表数据
   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) => {
       getContractPurchaseRequisitionPageToBeCreate({
         ...params,
@@ -246,7 +242,6 @@ const BiddingList = () => {
                 );
               },
               components: {
-                DateRangePickerUnix,
                 Submit
               },
             },

src/pages/contract/manage/schema/index.ts

@@ -481,9 +481,8 @@ export const PurchaseContractListSchema: any = {
             placeholder: intl.formatMessage({id: 'contract.qingshuru'})+ intl.formatMessage({id: 'contract.purchase.member'})
           }
         },
-        "[startTime,endTime]": {
-          type: 'array',
-          "x-component": 'DateRangePickerUnix',
+        "[startDate,endDate]": {
+          "type": "daterange",
           'x-component-props': {
             placeholder: [intl.formatMessage({id: 'contract.qingshuru'}), intl.formatMessage({id: 'contract.jieshushijian'})],
           },

src/pages/transaction/contractManagementRules/add.tsx

@@ -192,18 +192,18 @@ const Add = () => {
       };
     }
 
-    const { materials,baseProcessId,members, ...rest } = values;
+    const { materials,baseProcessId,members,name,...rest } = values;
     const defaultPostData = {
       allMembers: values.suitableMaterialType === 1,
       processId: baseProcessId,
-      ...rest,
+      name:name,
       ...tempData,
     };
     const postData = isAdd
       ? defaultPostData
       : {
           ...defaultPostData,
-          processSubId: id,
+          processSubId: Number(id),
         };
 
     const service = isAdd