chore: 补全冲突文件

src/pages/transaction/components/DetailLayout/components/recordLyout/index.tsx

+/** 详情通用 - 流转进度 */
+import React, { useContext, useState } from 'react';
+import { Radio, Table } from 'antd';
+import { Context } from '../context';
+import Card from '../../../card';
+import {
+  EXTERNALLOGS,
+  INTERNALLOGS,
+} from './columns';
+
+const LOGSTATESTYPE = {
+  /** 外部流转 */
+  EXTERNALSTATES: 1,
+  /** 内部流转 */
+  INTERIORSTATES: 2
+}
+
+export interface ProgressProps {
+  /** 选中哪个radio */
+  logstate?: number,
+}
+
+const RecordLayout: React.FC<ProgressProps> = (props: any) => {
+  const { logstate } = props;
+  const context = useContext(Context);
+  const [logStatus, setLogStatus] = useState<number>(logstate || LOGSTATESTYPE.EXTERNALSTATES);
+
+  return (
+    <Card
+      id='recordLyout'
+      title='流转进度'
+      extra={
+        <Radio.Group
+          onChange={(e) => setLogStatus(e.target.value)}
+          defaultValue={logStatus}
+        >
+          {context.externalLogs && <Radio.Button value={LOGSTATESTYPE.EXTERNALSTATES}>外部流转</Radio.Button>}
+          {context.interiorLogs && <Radio.Button value={LOGSTATESTYPE.INTERIORSTATES}>内部流转</Radio.Button>}
+        </Radio.Group>
+      }
+    >
+      <Table
+        columns={logStatus === LOGSTATESTYPE.EXTERNALSTATES ? EXTERNALLOGS : INTERNALLOGS}
+        dataSource={
+          logStatus === LOGSTATESTYPE.EXTERNALSTATES ?
+            context.externalLogs :
+            context.interiorLogs
+        }
+        rowKey={(record) => record.id}
+        pagination={{
+          hideOnSinglePage: true
+        }}
+      />
+    </Card>
+  )
+}
+
+export default RecordLayout