fix: 对接新交易/采购流程配置

src/pages/procurement/callForBids/readyCheckedConfirmFirst/components/remarkBidReport/index.tsx

@@ -44,7 +44,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle}) => {
           tempObject.memberName = item.memberName
           for(let j = 0; j < item.evaluationTenderList.length; j++) {
             let _item = item['evaluationTenderList'][j]
-            tempObject.expertExtractRecordId = _item['expertExtractRecord']['id']
+            tempObject.expertExtractRecordId = _item.expertExtractRecord?.id || _item['sort']
             tempObject.score = _item['score']
             tempObject.sort = _item['sort']
             tempObject.standard = _item['standard']

src/pages/procurement/callForBids/readyCheckedConfirmSecond/components/remarkBidReport/index.tsx

@@ -44,7 +44,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle}) => {
           tempObject.memberName = item.memberName
           for(let j = 0; j < item.evaluationTenderList.length; j++) {
             let _item = item['evaluationTenderList'][j]
-            tempObject.expertExtractRecordId = _item['expertExtractRecord']['id']
+            tempObject.expertExtractRecordId = _item.expertExtractRecord?.id || _item['sort']
             tempObject.score = _item['score']
             tempObject.sort = _item['sort']
             tempObject.standard = _item['standard']

src/pages/procurement/callForBids/readyConfirmBid/components/remarkBidReport/index.tsx

@@ -44,7 +44,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle}) => {
           tempObject.memberName = item.memberName
           for(let j = 0; j < item.evaluationTenderList.length; j++) {
             let _item = item['evaluationTenderList'][j]
-            tempObject.expertExtractRecordId = _item['expertExtractRecord']['id']
+            tempObject.expertExtractRecordId = _item.expertExtractRecord?.id || _item['sort']
             tempObject.score = _item['score']
             tempObject.sort = _item['sort']
             tempObject.standard = _item['standard']

src/pages/procurement/callForBids/readyPassBid/components/remarkBidReport/index.tsx

@@ -44,7 +44,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle}) => {
           tempObject.memberName = item.memberName
           for(let j = 0; j < item.evaluationTenderList.length; j++) {
             let _item = item['evaluationTenderList'][j]
-            tempObject.expertExtractRecordId = _item['expertExtractRecord']['id']
+            tempObject.expertExtractRecordId = _item.expertExtractRecord?.id || _item['sort']
             tempObject.score = _item['score']
             tempObject.sort = _item['sort']
             tempObject.standard = _item['standard']

src/pages/procurement/components/remarkBidReport/index.tsx

@@ -46,7 +46,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle}) => {
           if(item.evaluationTenderList)
           for(let j = 0; j < item.evaluationTenderList.length; j++) {
             let _item = item['evaluationTenderList'][j]
-            tempObject.expertExtractRecordId = _item['expertExtractRecord']['id']
+            tempObject.expertExtractRecordId = _item.expertExtractRecord?.id || _item['sort']
             tempObject.score = _item['score']
             tempObject.sort = _item['sort']
             tempObject.standard = _item['standard']

src/pages/transaction/components/orderDeleveRecord/index.tsx

@@ -186,6 +186,7 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
       dataIndex: 'createTime',
       align: 'center',
       key: 'createTime',
+      render: text => formatTimeString(text, 'YYYY-MM-DD')
     },
     {
       title: '物流单号',

src/pages/transaction/components/orderSaleRecord/index.tsx

@@ -191,7 +191,7 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
       dataIndex: 'createTime',
       align: 'center',
       key: 'createTime',
-      // render: text => formatTimeString(text)
+      render: text => formatTimeString(text, 'YYYY-MM-DD')
     },
     {
       title: '物流单号',

src/pages/transaction/purchaseRules/components/RuleSetting.tsx

@@ -286,7 +286,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
       if(!data.allContracts) {
         const res = await getBindingContracts({id: id.toString(), current: '1', pageSize: '1000', digest: ''})
         addSchemaAction.setFieldState('contracts', state => {
-          state.value = processFields(res.data, false)
+          state.value = res.data
         })
         setProductsLength(res.totalCount)
       }

src/pages/transaction/purchaseRules/components/selectProcesss/index.tsx

 import React, { useState, useRef, useEffect } from 'react'
 import styled from 'styled-components'
-import { ISchemaFormProps, ISchemaFieldProps, ISchemaFieldComponentProps, createFormActions, useFieldState } from '@formily/antd'
-import { Button, Space, Row, Col, Tag } from 'antd'
-import { PlusOutlined, DeleteColumnOutlined, EditOutlined, DeleteOutlined, CaretUpOutlined, CaretDownOutlined, EyeOutlined } from '@ant-design/icons'
+import { ISchemaFieldComponentProps, useFieldState } from '@formily/antd'
+import { Row, Col, Tag } from 'antd'
+import { CaretUpOutlined, CaretDownOutlined } from '@ant-design/icons'
 import cx from 'classnames'
 import { PublicApi } from '@/services/api'
 
@@ -62,7 +62,7 @@ const SelectProcesss = (props: ISchemaFieldComponentProps) => {
   const { value, mutators, editable } = props
 
   useEffect(() => {
-    PublicApi.getOrderTradeProcessBaseList().then(res => {
+    PublicApi.getOrderPurchaseProcessBaseList().then(res => {
       setFieldState({
         dataSource: res.data,
         showMore

src/pages/transaction/purchaseRules/index.tsx

@@ -69,7 +69,7 @@ const PurchaseRules: React.FC<{}> = () => {
           >
             <Button
               type="link"
-              style={record.status ? { color: '#00B37A' } : { color: 'red' }}>{record.state ? <>有效 <PlayCircleOutlined /></> : <>无效 <PauseCircleOutlined /></>}</Button>
+              style={record.status ? { color: '#00B37A' } : { color: 'red' }}>{record.status ? <>有效 <PlayCircleOutlined /></> : <>无效 <PauseCircleOutlined /></>}</Button>
           </Popconfirm>
         )
         return component