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

config/routes/tranactionRoute.ts

 /*
  * @Author: LeeJiancong
  * @Date: 2020-07-31 19:56:22
- * @LastEditors: XieZhiXiong
+ * @LastEditors: LeeJiancong
  * @Copyright: 1549414730@qq.com
- * @LastEditTime: 2020-09-16 15:37:06
+ * @LastEditTime: 2020-09-17 11:12:24
  */
 
 const TranactionRoute = {
@@ -141,13 +141,26 @@ const TranactionRoute = {
           name:'toAddSubmitList',
           component: '@/pages/transaction/enquiryOffer/toAddSubmit'
         },
-        //新增
+        //新增编辑详情
         {
           path:'/memberCenter/tranactionAbility/enquiryOffer/addEnquiry',
           name:'addEnquiry',
           component: '@/pages/transaction/enquiryOffer/toAddSubmit/detail',
           hideInMenu: true,
         },
+        //报价一级
+        {
+          path:'/memberCenter/tranactionAbility/enquiryOffer/enquiryOne',
+          name:'enquiryOne',
+          component: '@/pages/transaction/enquiryOffer/enquiryOne'
+        },
+        //报价二级
+        {
+          path:'/memberCenter/tranactionAbility/enquiryOffer/enquiryTwo',
+          name:'enquiryTwo',
+          component: '@/pages/transaction/enquiryOffer/enquiryTwo'
+        },
+        
         
       ]
     },

src/locales/zh-CN/menu.ts

 /*
  * @Author: LeeJiancong
  * @Date: 2020-07-13 14:08:50
- * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-09-15 11:48:29
+ * @LastEditors: LeeJiancong
+ * @LastEditTime: 2020-09-17 11:01:06
  */
 
 export default {
@@ -130,8 +130,8 @@ export default {
   'menu.tranactionAbility.enquirySubmit.toAddSubmitList': '待新增需求单',
   'menu.tranactionAbility.enquirySubmit.addEnquiry': '新增需求单',
   'menu.tranactionAbility.enquirySubmit.viewEnquiryDetail': '需求单详情',
-  'menu.tranactionAbility.enquirySubmit.enquiryOne': '待审核报价单（一级）',
-  'menu.tranactionAbility.enquirySubmit.enquiryTwo': '待审核报价单（二级）',
+  'menu.tranactionAbility.enquirySubmit.enquiryOne': '待审核需求单（一级）',
+  'menu.tranactionAbility.enquirySubmit.enquiryTwo': '待审核需求单（二级）',
   'menu.tranactionAbility.enquirySubmit.toSubmit': '待提交需求单',
   'menu.tranactionAbility.purchaseOrder': '采购订单',
   'menu.tranactionAbility.purchaseOrder.purchaseOrderSearch': '订单查询',
@@ -153,6 +153,8 @@ export default {
   'menu.tranactionAbility.enquiryOffer.toAddSubmitList': '待新增报价单',
   'menu.tranactionAbility.enquiryOffer.addEnquiry': '新增报价',
   'menu.tranactionAbility.enquiryOffer.viewEnquiryDetail': '报价单详情',
+  'menu.tranactionAbility.enquiryOffer.enquiryOne': '待审核报价单（一级）',
+  'menu.tranactionAbility.enquiryOffer.enquiryTwo': '待审核报价单（二级）',
 
 
 

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

@@ -3,7 +3,7 @@
  * @Date: 2020-08-24 11:39:11
  * @LastEditors: LeeJiancong
  * @Copyright: 1549414730@qq.com
- * @LastEditTime: 2020-09-16 16:28:24
+ * @LastEditTime: 2020-09-17 11:05:24
  */
 /**
  * @description: 组件描述: 一级 二级 待提交报价单
@@ -43,7 +43,7 @@ import { createFormActions, FormEffectHooks } from '@formily/antd';
 import {PageStatus} from '@/hooks/usePageStatus'
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
-import { enquierySchema } from '../schema';
+import { commonEnquieryOfferSchema } from '../schema';
 import { PublicApi } from '@/services/api';
 import { values, action } from 'mobx';
 /**
@@ -313,12 +313,12 @@ const List:React.FC<listParams> = (props) => {
               actions={formActions}
               onSubmit={values => handleSumbit(values)}
               effects={($,actions) => {
-                useStateFilterSearchLinkageEffect($,actions,'requisitionFormNo',FORM_FILTER_PATH)
+                useStateFilterSearchLinkageEffect($,actions,'quotationNo',FORM_FILTER_PATH)
               }}
               expressionScope={{
                 controllerBtns
               }}
-              schema={enquierySchema}
+              schema={commonEnquieryOfferSchema}
             >
 
             </NiceForm>

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

+import React, { Component } from 'react'
+import OrderList from "../components/index"
+const List = ()  => {
+  return (
+    <OrderList des='待审核报价单(一级)' type={1}/>
+  )
+}
+export default List
\ No newline at end of file

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

+import React, { Component } from 'react'
+import OrderList from "../components/index"
+const List = ()  => {
+  return (
+    <OrderList des='待审核报价单(二级)' type={2}/>
+  )
+}
+export default List
\ No newline at end of file

src/pages/transaction/enquiryOffer/toAddSubmit/detail.tsx

@@ -3,7 +3,7 @@
  * @Date: 2020-08-24 11:39:29
  * @LastEditors: LeeJiancong
  * @Copyright: 1549414730@qq.com
- * @LastEditTime: 2020-09-16 18:15:58
+ * @LastEditTime: 2020-09-17 10:27:52
  */
 import React, { Component, useState, useEffect,useRef } from 'react'
 import ReactDOM from 'react-dom'
@@ -519,7 +519,7 @@ const Detail: React.FC<{}> = () => {
   
    //选择需求单操作
    const selectBtn = (
-    <Button style={{ backgroundColor: '#6B778C', borderColor: '#6B778C', color: 'white' }} onClick={() => inquiryRef.current.setVisible(true)}>
+    <Button disabled={ id ? true: false} style={{ backgroundColor: '#6B778C', borderColor: '#6B778C', color: 'white' }} onClick={() => inquiryRef.current.setVisible(true)}>
       <LinkOutlined />选择
     </Button>
   )

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

@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import OrderList from "../components/index"
 const List = ()  => {
   return (
-    <OrderList des='待审核报价单(一级)' type={1}/>
+    <OrderList des='待审核需求单(一级)' type={1}/>
   )
 }
 export default List
\ No newline at end of file

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

@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import OrderList from "../components/index"
 const List = ()  => {
   return (
-    <OrderList des='待审核报价单(二级)' type={2}/>
+    <OrderList des='待审核需求单(二级)' type={2}/>
   )
 }
 export default List
\ No newline at end of file