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

config/routes/procurementRoute/purchaseInquiry.ts

@@ -25,6 +25,14 @@ export const purchaseInquiryRoute =  [
          noMargin: true,
       },
       {
+        // 采购需求单详情
+         path: '/memberCenter/procurementAbility/purchaseInquiry/inquiry/detail',
+         name: '采购需求单详情',
+         component: '@/pages/transaction/purchaseAbility/purchaseInquiry/detail',
+         hideInMenu: true,
+         noMargin: true,
+      },
+      {
         // 待新增采购需求单
         path: '/memberCenter/procurementAbility/purchaseInquiry/addInquiry',
         name: '待新增采购需求单',
@@ -39,6 +47,14 @@ export const purchaseInquiryRoute =  [
          noMargin: true,
       },
       {
+        // 待新增采购需求单详情
+         path: '/memberCenter/procurementAbility/purchaseInquiry/addInquiry/detail',
+         name: '待新增采购需求单详情',
+         component: '@/pages/transaction/purchaseAbility/purchaseInquiry/detail',
+         hideInMenu: true,
+         noMargin: true,
+      },
+      {
         // 新增采购需求单
         path: '/memberCenter/procurementAbility/purchaseInquiry/add',
         name: '新增采购需求单',
@@ -60,6 +76,14 @@ export const purchaseInquiryRoute =  [
          noMargin: true,
       },
       {
+        // 待审核采购需求单(一级)详情
+         path: '/memberCenter/procurementAbility/purchaseInquiry/auditInquiryOne/detail',
+         name: '待审核采购需求单(一级)详情',
+         component: '@/pages/transaction/purchaseAbility/purchaseInquiry/detail',
+         hideInMenu: true,
+         noMargin: true,
+      },
+      {
         // 待审核采购需求单(二级)
         path: '/memberCenter/procurementAbility/purchaseInquiry/auditInquiryTwo',
         name: '待审核采购需求单(二级)',
@@ -74,6 +98,14 @@ export const purchaseInquiryRoute =  [
          noMargin: true,
       },
       {
+        // 待审核采购需求单(二级)详情
+         path: '/memberCenter/procurementAbility/purchaseInquiry/auditInquiryTwo/detail',
+         name: '待审核采购需求单(二级)详情',
+         component: '@/pages/transaction/purchaseAbility/purchaseInquiry/detail',
+         hideInMenu: true,
+         noMargin: true,
+      },
+      {
         // 待提交采购需求单
         path: '/memberCenter/procurementAbility/purchaseInquiry/submitInquiry',
         name: '待提交采购需求单',
@@ -87,6 +119,14 @@ export const purchaseInquiryRoute =  [
          hideInMenu: true,
          noMargin: true,
       },
+      {
+        // 待提交采购需求单详情
+         path: '/memberCenter/procurementAbility/purchaseInquiry/submitInquiry/detail',
+         name: '待提交采购需求单详情',
+         component: '@/pages/transaction/purchaseAbility/purchaseInquiry/detail',
+         hideInMenu: true,
+         noMargin: true,
+      },
     ]
   },
 ]

src/pages/transaction/inquiryQuote/addInquiryOrder/components/tradingConditions.tsx

-import React, { useState, useEffect } from 'react';
+import React, { useEffect } from 'react';
 import styles from './index.less';
-import { Form, Input, Row, Col, } from 'antd';
-import { PublicApi } from '@/services/api';
+import { Form, Input, Row, Col, InputNumber } from 'antd';
 
 interface queryProps {
   currentRef?: any,
@@ -76,7 +75,7 @@ const TradingConditions: React.FC<queryProps> = (props) => {
       <Row gutter={70}>
         <Col span={12}>
           <Form.Item label='最小起订' name='minimumOrder' rules={[{ required: true, message: '请输入最小起订' }]}>
-            <Input placeholder='最长100个字符，50个汉字' />
+            <InputNumber min={1} placeholder='请输入数量' />
           </Form.Item>
           <Form.Item label='交付说明' name='deliveryInstructions'>
             <Input.TextArea placeholder='最长100个字符，50个汉字' />

src/pages/transaction/purchaseAbility/constants/index.ts

@@ -39,6 +39,6 @@ export const OFFTER_INTERNALSTATE_COLOR = {
   4: 'warning',
   5: 'success',
   6: 'success',
-  7: 'success',
-  8: 'success',
+  7: 'error',
+  8: 'error',
 }

src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/index.tsx

@@ -60,7 +60,7 @@ const AddInquiry = () => {
     dataIndex: 'operate',
     render: (text: any, record: any) => (
       <>
-        <Button type='link'>提交审核</Button>
+        <Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/purchaseInquiry/addInquiry/detail?id=${record.id}&number=${record.purchaseInquiryNo}`)}>提交审核</Button>
         <Button type='link'>修改</Button>
         <Button type='link'>删除</Button>
       </>

src/pages/transaction/purchaseAbility/purchaseInquiry/auditInquiryOne/index.tsx

 import React from 'react';
 import Table from '../../components/table'
+import { history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment';
@@ -58,7 +59,12 @@ const AuditInquiryOne = () => {
     dataIndex: 'operate',
     render: (text: any, record: any) => (
       <>
-        <Button type='link'>审核</Button>
+        <Button
+          type='link'
+          onClick={() => history.push(`/memberCenter/procurementAbility/purchaseInquiry/auditInquiryOne/detail?id=${record.id}&number=${record.purchaseInquiryNo}`)}
+        >
+          审核
+        </Button>
       </>
     )
   }];

src/pages/transaction/purchaseAbility/purchaseInquiry/auditInquiryTwo/index.tsx

 import React from 'react';
 import Table from '../../components/table'
+import { history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment';
@@ -58,7 +59,12 @@ const AuditInquiryTwo = () => {
     dataIndex: 'operate',
     render: (text: any, record: any) => (
       <>
-        <Button type='link'>审核</Button>
+        <Button
+          type='link'
+          onClick={() => history.push(`/memberCenter/procurementAbility/purchaseInquiry/auditInquiryTwo/detail?id=${record.id}&number=${record.purchaseInquiryNo}`)}
+        >
+          审核
+        </Button>
       </>
     )
   }];

src/pages/transaction/purchaseAbility/purchaseInquiry/inquiry/index.tsx

 import React from 'react';
 import Table from '../../components/table'
+import { history } from 'umi';
 import { Button, Tag, Badge } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
@@ -56,7 +57,14 @@ const Inquiry = () => {
     title: '操作',
     key: 'operate',
     dataIndex: 'operate',
-    render: (text: any, record: any) => <Button type='link'>作废</Button>
+    render: (text: any, record: any) => (
+      <Button
+        type='link'
+        onClick={() => history.push(`/memberCenter/procurementAbility/purchaseInquiry/inquiry/detail?id=${record.id}&number=${record.purchaseInquiryNo}`)}
+      >
+        作废
+      </Button>
+    )
   }];
   return (
     <Table

src/pages/transaction/purchaseAbility/purchaseInquiry/submitInquiry/index.tsx

 import React from 'react';
 import Table from '../../components/table'
+import {  history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment';
@@ -58,7 +59,12 @@ const SubmitInquiry = () => {
     dataIndex: 'operate',
     render: (text: any, record: any) => (
       <>
-        <Button type='link'>审核</Button>
+        <Button
+          type='link'
+          onClick={() => history.push(`/memberCenter/procurementAbility/purchaseInquiry/submitInquiry/detail?id=${record.id}&number=${record.purchaseInquiryNo}`)}
+        >
+          审核
+        </Button>
       </>
     )
   }];