Merge branch 'dev' into test

src/pages/transaction/common/statusList.ts

@@ -111,7 +111,7 @@ export const filterExternalState = [
   },
   {
     text: '询价不通过', value: 4
-  }
+  },
 ] 
 
 /**
@@ -181,4 +181,53 @@ export const filterInternalStateLabelList = [
 ]
 
 
+/**
+ * @description: 确认询价报价外部状态筛选
+ * @param {type} 
+ * @return {type} 1.待提交询价单 2.待提交报价单 3.待确认报价单 4.报价通过 5.报价不通过
+ */
+export const confirmFilterExternalState = [
+  {
+    text: '待提交询价单', value: 1
+  },
+  {
+    text: '待提交报价单', value: 2
+  },
+  {
+    text: '待确认报价单', value: 3
+  },
+  {
+    text: '报价通过', value: 4
+  },
+  {
+    text: '报价不通过', value: 5
+  }
+] 
+
+/**
+ * @description: 确认询价报价内部状态筛选
+ * @param {type} 
+ * @return {type} 1.待提交审核 2.待审核 3.待审核 4.审核通过 5.完成 6.审核不通过
+ */
+export const confirmFilterInteriorState = [
+  {
+    text: '待提交审核', value: 1
+  },
+  {
+    text: '待审核', value: 2
+  },
+  {
+    text: '待审核', value: 3
+  },
+  {
+    text: '审核通过', value: 4
+  },
+  {
+    text: '完成', value: 5
+  },
+  {
+    text: '审核不通过', value: 6
+  }
+]
+
 

src/pages/transaction/common/tableStatusList.tsx

@@ -88,13 +88,6 @@ export const enquiryOfferSearchInteriorState = (text:any) =>  {
 //外部
 export const enquiryOfferSearchexternalState = (text:any) =>  {  
   let component: ReactNode = null;
-  // text === 1 ? component = <Badge status='default' text="提交需求单" />:
-  // text === 2 ? component = <Badge color="#FFC400" text="审核需求单" />:
-  // text === 3 ? component = <Badge status='default' text="待提交报价单" />:
-  // text === 4 ? component = <Badge status='processing' text="确认报价单" />:
-  // text === 5 ? component = <Badge status='success' text="完成" />:
-  // text === 6 ? component = <Badge status='error' text="审核不通过" />:
-  // component = <Badge status="default" text="取消报价单" />
   // 外部状态:1.提交需求单 2.审核需求单  3.提交报价单  4.确认报价单 5.完成 6.审核不通过 7.取消报价单
   text === 1 ? component = <span style={statuStyle.default}>待提交需求单</span>:
   text === 2 ? component = <span style={statuStyle.default}>审核需求单</span>:
@@ -159,4 +152,36 @@ export const inquiryQuoteOuterState = (text:any) => {
   text === 4 ? component = <Tag color="success">报价通过</Tag>:
   component = <Tag color="error">报价不通过</Tag>
   return component;
+}
+
+/************************************确认询价报价************************************ */
+/**
+ * @description: 外部状态查询
+ * @param {type} 
+ * @return {type}  1.待提交询价单 2.待提交报价单 3.待确认报价单 4.报价通过 5.报价不通过
+ */
+export const confirmExternalState = (text:any) => {
+  let component: ReactNode = null;
+  text === 1 ? component = <Tag color="default">待提交询价单</Tag>:
+  text === 2 ? component = <Tag color="default">待提交报价单</Tag>:
+  text === 3 ? component = <Tag color="processing">待确认报价单</Tag>:
+  text === 4 ? component = <Tag color="success">报价通过</Tag>:
+  component = <Tag color="error">报价不通过</Tag>
+  return component;
+}
+/**
+ * @description: 确认询价报价-报价单查询-内部状态查询
+ * @param {type} 
+ * @return {type} 1.待提交审核 2.待审核 3.待审核 4.审核通过 5.完成 6.审核不通过
+ */
+export const confirmInteriorState = (text:any) => {
+  let component: ReactNode = null;
+  text === 1 ? component = <Badge status='default' text="待提交审核" />:
+  text === 2 ? component = <Badge status='warning' text="待审核" />:
+  text === 3 ? component = <Badge status='warning' text="待审核" />:
+  text === 4 ? component = <Badge status='processing' text="审核通过" />:
+  text === 5 ? component = <Badge status='processing' text="完成" />:
+  component = <Badge status='error' text="审核不通过" />
+  return component;
+  
 }
\ No newline at end of file

src/pages/transaction/confirmInquiryQuote/components/reviewList.tsx

@@ -9,8 +9,8 @@ import { ColumnType } from 'antd/lib/table/interface';
 import NiceForm from '@/components/NiceForm';
 import { createFormActions, FormEffectHooks } from '@formily/antd';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
-import { filterInternalState, filterExternalState } from './../../common/statusList';
-import { quoteOrderInternalState, inquiryQuoteOuterState } from '../../common/tableStatusList';
+import { confirmFilterInteriorState, confirmFilterExternalState } from './../../common/statusList';
+import { confirmExternalState, confirmInteriorState } from '../../common/tableStatusList';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { pendingReviewSchema } from '../schema/pendingReview';
 import { PageStatus } from '@/hooks/usePageStatus';
@@ -61,34 +61,37 @@ const ReviewList: React.FC<parmas> = (props) => {
       title: '被询价会员',
       key: 'memberName',
       dataIndex: 'memberName',
+      render: (text: any, record: any) => format(text)
     },
     {
       title: '报价截止时间',
       key: 'quotationAsTime',
       dataIndex: 'quotationAsTime',
+      render: (text: any, record: any) => format(text)
     },
     {
       title: '询价时间',
       key: 'voucherTime',
       dataIndex: 'voucherTime',
+      render: (text: any, record: any) => format(text)
     },
     {
       title: '外部状态',
       key: 'externalState',
       dataIndex: 'externalState',
-      filters: filterExternalState,
+      filters: confirmFilterExternalState,
       filterMultiple: false,
       onFilter: (value, record) => record.externalState === value,
-      render: text => inquiryQuoteOuterState(text)
+      render: text => confirmExternalState(text)
     }, {
       title: '内部状态',
       key: 'interiorState',
       dataIndex: 'interiorState',
-      filters: filterInternalState,
+      filters: confirmFilterInteriorState,
       filterMultiple: false,
       onFilter: (value, record) => record.interiorState === value,
       render: (text: any) =>
-        quoteOrderInternalState(text)
+      confirmInteriorState(text)
     },
     {
       title: '操作',
@@ -127,9 +130,9 @@ const ReviewList: React.FC<parmas> = (props) => {
   // 单个审核
   const handleModalOK = () => {
     setvisible(false)
-    setTimeout(()=> {
-      ref.current.reload()
-    },1000)
+    setTimeout(() => {
+      ref.current.reload();
+    }, 500)
   }
 
 

src/pages/transaction/confirmInquiryQuote/pendingReviewOne/index.tsx

@@ -15,41 +15,12 @@ const PendingReviewOne: React.FC<{}> = () => {
     console.log(values, '我是多选的id')
   }
   // 列表数据
-  const data = { // 模拟的数据
-    totalCount: 6,
-    data: [{
-      id: 1,
-      quotationNo: 'BPTY12',
-      inquiryListNo: 'SZX125KJS',
-      details: '模拟的数据',
-      memberName: '冰红茶',
-      memberId: 10,
-      quotationAsTime: '2020-10-13 23:59:00',
-      voucherTime: '2020-10-13 13:59:00',
-      externalState: 1,
-      interiorState: 2
-    }, {
-      id: 2,
-      quotationNo: 'BPTY12',
-      inquiryListNo: 'SZX125LIP',
-      details: '模拟的数据10086',
-      memberName: '打喷嚏',
-      memberId: 1,
-      quotationAsTime: '2020-10-14 23:59:00',
-      voucherTime: '2020-10-12 13:59:00',
-      externalState: 1,
-      interiorState: 1
-    }]
-  }
   const fetchData = (params?: any) => {
     console.log(params)//可以直接打印参数
     return new Promise((resolve, reject) => {
       PublicApi.getOrderNotarizeEnquiryQuotedPriceAuditList({...params}).then(res => {
         resolve(res.data)
       })
-      // setTimeout(() => {
-      //   resolve(data)
-      // }, 500)
     })
   }
   // 批量操作

src/pages/transaction/confirmInquiryQuote/pendingSubmit/index.tsx

@@ -12,8 +12,8 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import EyePreview from '@/components/EyePreview';
 import { pendingReviewSchema } from '../schema/pendingReview';
-import { filterInternalState, filterExternalState } from './../../common/statusList';
-import { quoteOrderInternalState } from '../../common/tableStatusList';
+import { confirmFilterInteriorState, confirmFilterExternalState } from './../../common/statusList';
+import { confirmExternalState, confirmInteriorState } from '../../common/tableStatusList';
 import StatusColors from '@/pages/transaction/components/StatusColors';
 import AuditModal from '../components/auditModel';
 import { PublicApi } from '@/services/api';
@@ -49,33 +49,35 @@ const PendingSubmit: React.FC<{}> = () => {
     title: '报价截止时间',
     key: 'quotationAsTime',
     dataIndex: 'quotationAsTime',
+    render: (text: any, record: any) => format(text)
   }, {
     title: '单据时间',
     key: 'voucherTime',
     dataIndex: 'voucherTime',
+    render: (text: any, record: any) => format(text)
   }, {
     title: '外部状态',
     key: 'externalState',
     dataIndex: 'externalState',
-    filters: filterExternalState,
+    filters: confirmFilterExternalState,
     filterMultiple: false,
     onFilter: (value, record) => record.externalState === value,
-    render: text => <StatusColors status={text} type='inquiry' />
+    render: text => confirmExternalState(text)
   }, {
     title: '内部状态',
     key: 'interiorState',
     dataIndex: 'interiorState',
-    filters: filterInternalState,
+    filters: confirmFilterInteriorState,
     filterMultiple: false,
     onFilter: (value, record) => record.interiorState === value,
     render: (text: any) =>
-      quoteOrderInternalState(text)
+    confirmInteriorState(text)
   },
   {
     title: '操作',
     key: 'options',
     dataIndex: 'options',
-    render: (text: any, record: any) => <Button disabled={record.interiorState !== 1 || record.interiorState !== 2} type='link' onClick={() => { setId(record.id); setvisible(true)}}>提交报价单</Button>
+    render: (text: any, record: any) => <Button disabled={record.interiorState !== 4 && record.interiorState !== 6} type='link' onClick={() => { setId(record.id); setvisible(true)}}>提交报价单</Button>
   }]
   const format = (text) => {
     return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>
@@ -97,31 +99,12 @@ const PendingSubmit: React.FC<{}> = () => {
   </Row>
 
   /**列表数据 */
-  // const data = {
-  //   totalCount: 2,
-  //   data: [{
-  //     id: 1,
-  //     quotationNo: 'BPTY12',
-  //     inquiryListNo: 'SZX125KJS',
-  //     details: '模拟的数据',
-  //     memberName: '冰红茶',
-  //     memberId: 10,
-  //     deliveryTime: '2020-10-13 13:59:00',
-  //     quotationAsTime: '2020-10-13 23:59:00',
-  //     voucherTime: '2020-10-13 13:59:00',
-  //     externalState: 1,
-  //     interiorState: 1
-  //   }]
-  // }
   const fetchData = (params?: any) => {
     console.log(params)//可以直接打印参数
     return new Promise((resolve, reject) => {
       PublicApi.getOrderNotarizeEnquiryQuotedPriceAffirmList({ ...params }).then(res => {
         resolve(res.data)
       })
-      // setTimeout(() => {
-      //   resolve(data)
-      // }, 500)
     })
 
   }
@@ -149,8 +132,8 @@ const PendingSubmit: React.FC<{}> = () => {
   const handleModalOK = () => {
     setvisible(false)
     setTimeout(() => {
-      history.goBack()
-    }, 1000)
+      ref.current.reload();
+    }, 500)
   }
   return (
     <PageHeaderWrapper>

src/pages/transaction/confirmInquiryQuote/pendingSubmitReview/index.tsx

@@ -3,8 +3,8 @@ import { history, Link } from 'umi';
 import { Button, Card, Space, Row, Col, message} from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { StandardTable } from 'god';
-import { filterInternalState, filterExternalState } from './../../common/statusList';
-import { quoteOrderInternalState,inquiryQuoteOuterState } from '../../common/tableStatusList';
+import { confirmFilterInteriorState, confirmFilterExternalState } from './../../common/statusList';
+import { confirmExternalState, confirmInteriorState } from '../../common/tableStatusList';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment';
 import { timeRange } from '@/utils/index';
@@ -48,27 +48,29 @@ const PendingSubmitReview: React.FC<{}> = () => {
     title: '报价截止时间',
     key: 'quotationAsTime',
     dataIndex: 'quotationAsTime',
+    render: (text: any, record: any) => format(text)
   }, {
     title: '单据时间',
     key: 'voucherTime',
     dataIndex: 'voucherTime',
+    render: (text: any, record: any) => format(text)
   }, {
     title: '外部状态',
     key: 'externalState',
     dataIndex: 'externalState',
-    filters: filterExternalState,
+    filters: confirmFilterExternalState,
     filterMultiple: false,
     onFilter: (value, record) => record.externalState === value,
-    render: text => inquiryQuoteOuterState(text)
+    render: text => confirmExternalState(text)
   }, {
     title: '内部状态',
     key: 'interiorState',
     dataIndex: 'interiorState',
-    filters: filterInternalState,
+    filters: confirmFilterInteriorState,
     filterMultiple: false,
     onFilter: (value, record) => record.interiorState === value,
     render: (text: any) =>
-      quoteOrderInternalState(text)
+    confirmInteriorState(text)
   },{
     title: '操作',
     key: 'options',
@@ -112,47 +114,18 @@ const PendingSubmitReview: React.FC<{}> = () => {
     }
   }
   // 列表数据
-  const data = { // 模拟的数据
-    totalCount: 6,
-    data: [{
-      id: 100,
-      quotationNo: 'BPTY12',
-      inquiryListNo: 'SZX125KJS',
-      details: '模拟的数据',
-      memberName: '冰红茶',
-      memberId: 10,
-      quotationAsTime: '2020-10-13 23:59:00',
-      voucherTime: '2020-10-13 13:59:00',
-      externalState: 1,
-      interiorState: 1
-    }, {
-      id: 2,
-      quotationNo: 'BPTY12',
-      inquiryListNo: 'SZX125LIP',
-      details: '模拟的数据10086',
-      memberName: '打喷嚏',
-      memberId: 1,
-      quotationAsTime: '2020-10-14 23:59:00',
-      voucherTime: '2020-10-12 13:59:00',
-      externalState: 1,
-      interiorState: 2
-    }]
-  }
   const fetchData = (params?: any) => {
     return new Promise((resolve, reject) => {
       PublicApi.getOrderNotarizeEnquiryQuotedPriceList({...params}).then(res => {
         resolve(res.data)
       })
-      // setTimeout(() => {
-      //   resolve(data)
-      // }, 500)
     })
   }
   const handleModalOK = () => {
     setvisible(false)
     setTimeout(() => {
-      history.goBack()
-    }, 1000)
+      ref.current.reload();
+    }, 500)
   }
   return (
     <PageHeaderWrapper>

src/pages/transaction/confirmInquiryQuote/quoteOrder/index.tsx

@@ -9,15 +9,19 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { searchSelectGetSelectCategoryOptionEffect } from '../../effect/index'
 import { ColumnType } from 'antd/lib/table/interface';
-import { filterInternalState, filterExternalState } from './../../common/statusList';
-import { quoteOrderInternalState,inquiryQuoteOuterState } from '../../common/tableStatusList';
+import { confirmFilterInteriorState, confirmFilterExternalState } from './../../common/statusList';
+import { confirmExternalState, confirmInteriorState } from '../../common/tableStatusList';
 import EyePreview from '@/components/EyePreview';
+import moment from 'moment';
 import { timeRange } from '@/utils/index';
 import { PublicApi } from '@/services/api';
 
 const formActions = createFormActions();
 const EnquiryOrder: React.FC<{}> = (props) => {
   const ref = useRef<any>({});
+  const format = (text) => {
+    return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>
+  }
   const columns: ColumnType<any>[] = [{
     title: '报价单号',
     key: 'quotationNo',
@@ -42,27 +46,29 @@ const EnquiryOrder: React.FC<{}> = (props) => {
     title: '报价截止时间',
     key: 'quotationAsTime',
     dataIndex: 'quotationAsTime',
+    render: (text: any, record: any) => format(text)
   }, {
     title: '单据时间',
     key: 'voucherTime',
     dataIndex: 'voucherTime',
+    render: (text: any, record: any) => format(text)
   }, {
     title: '外部状态',
     key: 'externalState',
     dataIndex: 'externalState',
-    filters: filterExternalState,
+    filters: confirmFilterExternalState,
     filterMultiple: false,
     onFilter: (value, record) => record.externalState === value,
-    render: text => inquiryQuoteOuterState(text)
+    render: text => confirmExternalState(text)
   }, {
     title: '内部状态',
     key: 'interiorState',
     dataIndex: 'interiorState',
-    filters: filterInternalState,
+    filters: confirmFilterInteriorState,
     filterMultiple: false,
     onFilter: (value, record) => record.interiorState === value,
     render: (text: any) =>
-      quoteOrderInternalState(text)
+    confirmInteriorState(text)
   }];
   //交易能力 询价报价 询价单查询
   const fetchData = (params?: any) => {

src/pages/transaction/goodsOffer/components/reviewList.tsx

@@ -133,9 +133,9 @@ const ReviewList: React.FC<parmas> = (props) => {
   // 单个审核
   const handleModalOK = () => {
     setvisible(false)
-    setTimeout(()=> {
-      ref.current.reload()
-    },1000)
+    setTimeout(() => {
+      ref.current.reload();
+    }, 500)
   }
 
   return (

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

@@ -105,30 +105,12 @@ const PendingSubmit: React.FC<{}> = () => {
   </Row>
 
   /**列表数据 */
-  // const data = {
-  //   totalCount: 2,
-  //   data: [{
-  //     id: 1,
-  //     inquiryListNo: 'SZX125KJS',
-  //     details: '模拟的数据',
-  //     memberName: '冰红茶',
-  //     memberId: 10,
-  //     deliveryTime: '2020-10-13 13:59:00',
-  //     quotationAsTime: '2020-10-13 23:59:00',
-  //     voucherTime: '2020-10-13 13:59:00',
-  //     externalState: 1,
-  //     interiorState: 1
-  //   }]
-  // }
   const fetchData = (params?: any) => {
     console.log(params)//可以直接打印参数
     return new Promise((resolve, reject) => {
       PublicApi.getOrderSubmitInquirySheetList({ ...params }).then(res => {
         resolve(res.data)
       })
-      // setTimeout(() => {
-      //   resolve(data)
-      // }, 500)
     })
 
   }
@@ -151,8 +133,8 @@ const PendingSubmit: React.FC<{}> = () => {
   const handleModalOK = () => {
     setvisible(false)
     setTimeout(() => {
-      history.goBack()
-    }, 1000)
+      ref.current.reload();
+    }, 500)
   }
   return (
     <PageHeaderWrapper>

src/pages/transaction/inquiryQuote/components/reviewList.tsx

@@ -127,9 +127,9 @@ const ReviewList: React.FC<parmas> = (props) => {
   // 单个审核
   const handleModalOK = () => {
     setvisible(false)
-    setTimeout(()=> {
-      ref.current.reload()
-    },1000)
+    setTimeout(() => {
+      ref.current.reload();
+    }, 500)
   }
 
 

src/pages/transaction/inquiryQuote/pendingSubmit/index.tsx

@@ -133,7 +133,7 @@ const PendingSubmit: React.FC<{}> = () => {
     setvisible(false)
     setTimeout(() => {
       ref.current.reload();
-    }, 1000)
+    }, 500)
   }
 
   return (

src/pages/transaction/inquiryQuote/quoteOrder/index.tsx

@@ -71,29 +71,11 @@ const EnquiryOrder: React.FC<{}> = (props) => {
       quoteOrderInternalState(text)
   }];
   //交易能力 询价报价 询价单查询
-  // const data = {
-  //   totalCount: 1,
-  //   data: [{
-  //     id: 91,
-  //     quotationNo: 'BPTY12',
-  //     inquiryListNo: 'SD2015PPLJ',
-  //     details: '阿珍爱上阿强',
-  //     memberName: 'wutiaoren',
-  //     memberId: 5,
-  //     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.getOrderProductQuotationList({...params}).then(res => {
         resolve(res.data)
       })
-      // setTimeout(() => {
-      //   resolve(data)
-      // }, 1000)
     })
   }
   // 搜索