Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

config/routes/tranactionRoute.ts

@@ -3,7 +3,7 @@
  * @Date: 2020-07-31 19:56:22
  * @LastEditors: LeeJiancong
  * @Copyright: 1549414730@qq.com
- * @LastEditTime: 2020-09-10 14:38:35
+ * @LastEditTime: 2020-09-10 17:07:48
  */
 
 const TranactionRoute = {
@@ -131,7 +131,13 @@ const TranactionRoute = {
           key:'enquirySearch',
           component: '@/pages/transaction/enquiryOffer/enquirySearch'
         },
-
+        {//需求单详情
+          path:'/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail',
+          name:'viewEnquiryDetail',
+          key:'viewEnquiryDetail',
+          component: '@/pages/transaction/enquiryOffer/components/detail',
+          hideInMenu: true,
+        }
         
       ]
     },

src/pages/transaction/enquiryOffer/enquirySearch/index.tsx

@@ -3,7 +3,7 @@
  * @Date: 2020-08-24 11:39:11
  * @LastEditors: LeeJiancong
  * @Copyright: 1549414730@qq.com
- * @LastEditTime: 2020-09-10 15:57:19
+ * @LastEditTime: 2020-09-10 17:26:47
  */
 /**
  * @description: 组件描述: 
@@ -64,7 +64,7 @@ const List:React.FC<{listParams}> = (props) => {
     return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>
   }
   const fetchData = async (params: any) => {
-    const res = await PublicApi.getOrderRequisitionFormList(params);
+    const res = await PublicApi.getOrderQuotationRequisitionFormList(params);
     return res.data
     
   }
@@ -75,7 +75,7 @@ const List:React.FC<{listParams}> = (props) => {
    * @return {type} 
    */
   const handleToDetail= (id)  => {
-    history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
+    history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${6}&id=${id}`)
   }
 
   const columns : ColumnType<any>[] = [

src/pages/transaction/enquiryOffer/schema/index.tsx

@@ -109,7 +109,7 @@ export const enquierySchema: ISchema = {
 }
 
 /**
- * @description: 需求发布查询
+ * @description: 需求报价查询
  * @param {type} 
  * @return {type} 
  */
@@ -156,6 +156,13 @@ export const enquierySearchSchema: ISchema = {
             inline: true
           },
           properties:{
+            demandMembers:{
+              type:'string',
+              "x-component":'Search',
+              "x-component-props":{
+                placeholder:'需求会员'
+              }
+            },
             category:{
               type:'string',
               'x-component': 'CustomInputSearch',

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

@@ -3,7 +3,7 @@
  * @Date: 2020-08-24 11:32:05
  * @LastEditors: LeeJiancong
  * @Copyright: 1549414730@qq.com
- * @LastEditTime: 2020-09-10 14:35:02
+ * @LastEditTime: 2020-09-10 17:43:18
  */
 import React, { Component, useEffect, useState, ReactNode, useRef } from 'react';
 import { Row, Col, Modal, Table, Tooltip, Input, Select,Switch, Button, Popconfirm, Card, Tag, Badge, Steps, Tabs, } from 'antd'
@@ -97,6 +97,10 @@ const detailInfo: React.FC<{}> = () => {
         {
           title: '采购商',
           desc: '确认报价单',
+        },
+        {
+          title: '完成',
+          desc: ''
         }
 
       ]
@@ -443,6 +447,25 @@ const detailInfo: React.FC<{}> = () => {
     }
   }
 
+  //外部状态
+  const renderExternalState = () => {
+    return <Steps
+    style={{ padding: '34px 0' }}
+    progressDot
+    current={Number(dataInfo.externalState)-1}
+  >
+    {detailData.externalStateStep.items.map((item, index) => {
+      return (
+        <Step
+          key={index}
+          title={item.title}
+          description={item.desc}
+        />
+      );
+    })}
+  </Steps>
+  }
+
   return (
     <PageHeaderWrapper
       onBack={() => window.history.back()}
@@ -540,44 +563,37 @@ const detailInfo: React.FC<{}> = () => {
     >
       <Row>
         <Col className={style['mainCol']} span={24}>
-          <Tabs type="line" defaultActiveKey='1'>
-          {/* Number(dataInfo.externalState)-1 */}
-            <TabPane tab='外部流转' key="1">
-              <Steps
-                style={{ padding: '34px 0' }}
-                progressDot
-                current={0}
-              >
-                {detailData.externalStateStep.items.map((item, index) => {
-                  return (
-                    <Step
-                      key={index}
-                      title={item.title}
-                      description={item.desc}
-                    />
-                  );
-                })}
-              </Steps>
-            </TabPane>
-            <TabPane tab='内部流转' key="2">
-            
-              <Steps
-                style={{ padding: '34px 0' }}
-                progressDot
-                current={Number(dataInfo.interiorState) - 1}
-              >
-                {detailData.interiorStateStep.items.map((item, index) => {
-                  return (
-                    <Step
-                      key={index}
-                      title={item.title}
-                      description={item.desc}
-                    />
-                  );
-                })}
-              </Steps>
-            </TabPane>
-          </Tabs>
+          {
+            pagetype == 6? 
+            <>
+            <div className={style['mainCol-title']}>外部流转</div>
+              {renderExternalState()}
+            </>
+            :
+            <Tabs type="line" defaultActiveKey='1'>
+              <TabPane tab='外部流转' key="1">
+                {renderExternalState()}
+              </TabPane>
+              <TabPane tab='内部流转' key="2">
+              
+                <Steps
+                  style={{ padding: '34px 0' }}
+                  progressDot
+                  current={Number(dataInfo.interiorState) - 1}
+                >
+                  {detailData.interiorStateStep.items.map((item, index) => {
+                    return (
+                      <Step
+                        key={index}
+                        title={item.title}
+                        description={item.desc}
+                      />
+                    );
+                  })}
+                </Steps>
+              </TabPane>
+            </Tabs>
+          }
         </Col>
         <Col className={style['mainCol']} span={24}>
           <div className={style['mainCol-title']}>
@@ -672,22 +688,23 @@ const detailInfo: React.FC<{}> = () => {
           />
         </Col>
         <Col className={style['mainCol']} span={24}>
-          <Tabs type="line" defaultActiveKey='1'>
-            <TabPane tab='外部流转记录' key="1">
+          {
+            //需求报价-需求单详情
+            pagetype == 6 ?
+            <>
+              <div className={style['mainCol-title']}>外部流转记录</div>
               <Table rowKey={'id'} dataSource={dataInfo.externalRequisitionForms || []}  columns={externalColumn(formTime,externalTextState)}  />
-            </TabPane>
-            <TabPane tab='内部流转记录' key="2">
-              {/* <StandardTable
-                tableProps={{ rowKey: 'id' }}
-                currentRef={ref}
-                columns={interiorColumn(formTime)}
-                fetchTableData={(params: any) => fetchData(params)}
-
-              /> */}
-            <Table rowKey={'id'} dataSource={dataInfo.interiorRequisitionForms || []}  columns={interiorColumn(formTime,interiorTextState)}  />
-            {/* pagination={pagination} */}
-            </TabPane>
-          </Tabs>
+            </>
+            :
+            <Tabs type="line" defaultActiveKey='1'>
+              <TabPane tab='外部流转记录' key="1">
+                <Table rowKey={'id'} dataSource={dataInfo.externalRequisitionForms || []}  columns={externalColumn(formTime,externalTextState)}  />
+              </TabPane>
+              <TabPane tab='内部流转记录' key="2">
+              <Table rowKey={'id'} dataSource={dataInfo.interiorRequisitionForms || []}  columns={interiorColumn(formTime,interiorTextState)}  />
+              </TabPane>
+            </Tabs>
+          }
 
 
         </Col>