修改需求发布bug

config/routes/tranactionRoute/index.ts

@@ -48,21 +48,21 @@ const TranactionRoute: RouterChild = {
           path: '/memberCenter/tranactionAbility/electronicContracts/template/add',
           name: 'addTemplate',
           hideInMenu: true,
-          component: '@/pages/transaction/electronicContracts/addContract/index',
+          component: '@/pages/transaction/electronicContracts/addContract/add',
         }, 
         // 合同模板-编辑
         {
           path: '/memberCenter/tranactionAbility/electronicContracts/template/edit',
           name: 'editTemplate',
           hideInMenu: true,
-          component: '@/pages/transaction/electronicContracts/addContract/index',
+          component: '@/pages/transaction/electronicContracts/addContract/edit',
         }, 
         // 合同模板-详情
         {
           path: '/memberCenter/tranactionAbility/electronicContracts/template/detail',
           name: 'templateDetail',
           hideInMenu: true,
-          component: '@/pages/transaction/electronicContracts/addContract/index',
+          component: '@/pages/transaction/electronicContracts/addContract/details',
         }, 
       ]
     }, 

src/pages/transaction/electronicContracts/addContract/add.tsx

+import React from 'react';
+import { history } from 'umi';
+import ContractComponents from './index';
+
+const AddContract:React.FC<{}> = () => {
+  const { id } = history.location.query;
+  return(
+    <ContractComponents
+      page_type={'add'}
+      id={id}
+    />
+  )
+}
+
+export default AddContract;
\ No newline at end of file

src/pages/transaction/electronicContracts/addContract/details.tsx

+import React from 'react';
+import { history } from 'umi';
+import ContractComponents from './index';
+
+const DetailsContract:React.FC<{}> = () => {
+  const { id } = history.location.query;
+  return(
+    <ContractComponents
+      id={id}
+    />
+  )
+}
+
+export default DetailsContract;
\ No newline at end of file

src/pages/transaction/electronicContracts/addContract/edit.tsx

+import React from 'react';
+import { history } from 'umi';
+import ContractComponents from './index';
+
+const EditContract:React.FC<{}> = () => {
+  const { id } = history.location.query;
+  return(
+    <ContractComponents
+      page_type={'edit'}
+      id={id}
+    />
+  )
+}
+
+export default EditContract;
\ No newline at end of file

src/pages/transaction/electronicContracts/addContract/index.tsx

 import React, { useEffect, useState } from 'react'
-import { history } from 'umi'
+import { history } from 'umi';
 import { Form, Input, Upload, Card, Tooltip, Button, message, Badge, Popconfirm } from 'antd'
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import ReutrnEle from '@/components/ReturnEle';
@@ -9,8 +9,13 @@ import { UPLOAD_TYPE } from '@/constants'
 import { QuestionCircleOutlined, StarOutlined, FileWordFilled, UploadOutlined, DeleteOutlined } from '@ant-design/icons';
 import styles from './index.less'
 
-const AddContract: React.FC<{}> = (props) => {
-  const { page_type, id } = history.location.query
+export interface parmas {
+  page_type?: string,
+  id?: any 
+}
+
+const AddContract: React.FC<parmas> = (props) => {
+  const { page_type, id } = props;
   const { TextArea } = Input;
   const [form] = Form.useForm();
   const [fileExampleUrl, setFileExampleUrl] = useState<any>({});

src/pages/transaction/electronicContracts/template/index.tsx

@@ -68,7 +68,7 @@ const Template: React.FC<{}> = () => {
       let component: ReactNode = null
       component = (
         <>
-          <Button disabled={record.state === 1} style={{padding: '0px', marginRight: '24px'}} type='link'><Link to={`/memberCenter/tranactionAbility/electronicContracts/template/edit?page_type=edit&id=${record.id}`}>编辑</Link></Button>
+          <Button disabled={record.state === 1} style={{padding: '0px', marginRight: '24px'}} type='link'><Link to={`/memberCenter/tranactionAbility/electronicContracts/template/edit?id=${record.id}`}>编辑</Link></Button>
           <Popconfirm
             title="确定要执行这个操作?"
             onConfirm={() => confirmDel(record)}
@@ -102,10 +102,7 @@ const Template: React.FC<{}> = () => {
   const handleJumpAdd = () => {
     history.push({
       pathname:
-        '/memberCenter/tranactionAbility/electronicContracts/template/add',
-      query: {
-        page_type: 'add',
-      },
+        '/memberCenter/tranactionAbility/electronicContracts/template/add'
     });
   };
 

src/pages/transaction/enquirySubmit/components/detail.tsx

@@ -37,7 +37,7 @@ const data = [
     status: 2,
   },
 ];
-interface dataInfoType {
+interface parmas {
   status: any;
   digest?: any;
   logisticsOrderNo: string;
@@ -49,12 +49,14 @@ interface dataInfoType {
   totalVolume: number,
   totalWeight: number,
   freightPrice: number,
-  settlementWay: string
+  settlementWay: string,
+  pagetype?: any
 }
 
-const detailInfo: React.FC<{}> = () => {
+const detailInfo: React.FC<parmas> = (props) => {
   const ref = useRef<any>({})
-  const [pagetype, setpagetype] = useState(history.location.query.page_type)
+  const { pagetype } = props;
+  // const [pagetype, setpagetype] = useState(history.location.query.page_type)
   let interiorStateList = []
   let [isextraOption, setIsextraOption] = useState(false)
   const [platType, setplatType] = useState(1) //需求对接类型

src/pages/transaction/enquirySubmit/enquiryOne/detail/index.tsx

 import React from 'react';
+import AuditComponents from '../../components/detail'
 
-const EnquiryOneDetail: React.FC = () => {
+const EnquiryOneDetail: React.FC<{}> = () => {
   return (
-    <div>
-      待审核需求单（一级）详情
-    </div>
+    <AuditComponents 
+      pagetype={1}
+    />
   );
 };
 

src/pages/transaction/enquirySubmit/enquiryTwo/detail/index.tsx

 import React from 'react';
+import AuditComponents from '../../components/detail';
 
-const EnquiryTwoDetail: React.FC = () => {
+const EnquiryTwoDetail: React.FC<{}> = () => {
   return (
-    <div>
-      待审核需求单（二级）详情
-    </div>
+    <AuditComponents 
+      pagetype={2}
+    />
   );
 };
 

src/pages/transaction/enquirySubmit/toSubmit/detail/index.tsx

 import React from 'react';
-
+import AuditComponents from '../../components/detail';
 const ToSubmitDetail: React.FC = () => {
   return (
-    <div>
-      待提交需求单详情
-    </div>
+    <AuditComponents 
+      pagetype={3}
+    />
   );
 };
 

src/pages/transaction/goodsOffer/enquiryOrder/index.tsx

@@ -63,29 +63,29 @@ const EnquiryOrder: React.FC<{}> = (props) => {
         quoteOrderInternalState(text)
   }];
   //交易能力 询价报价 询价单查询
-  const data = {
-    totalCount: 1,
-    data: [{
-      id: 91,
-      inquiryListNo: 'SD2015PPLJ',
-      details: '阿珍爱上阿强',
-      memberName: 'wutiaoren',
-      memberId: 5,
-      deliveryTime: '2020-10-14 15:37:00',
-      quotationAsTime: '2020-10-13 15:37:00',
-      voucherTime: '2020-10-13 15:37:00',
-      externalState: 1,
-      interiorState: 2
-    }]
-  }
+  // const data = {
+  //   totalCount: 1,
+  //   data: [{
+  //     id: 91,
+  //     inquiryListNo: 'SD2015PPLJ',
+  //     details: '阿珍爱上阿强',
+  //     memberName: 'wutiaoren',
+  //     memberId: 5,
+  //     deliveryTime: '2020-10-14 15:37:00',
+  //     quotationAsTime: '2020-10-13 15:37:00',
+  //     voucherTime: '2020-10-13 15:37:00',
+  //     externalState: 1,
+  //     interiorState: 2
+  //   }]
+  // }
   const fetchData = (params?: any) => {
     return new Promise((resolve, reject) => {
-      // PublicApi.getOrderProductInquiryList({...params}).then(res => {
-      //   resolve(res.data)
-      // })
-      setTimeout(() => {
-        resolve(data)
-      }, 1000)
+      PublicApi.getOrderProductInquiryList({...params}).then(res => {
+        resolve(res.data)
+      })
+      // setTimeout(() => {
+      //   resolve(data)
+      // }, 1000)
     })
   }
   // 搜索