修改询价报价时间没解析问题

src/pages/transaction/goodsOffer/addEnquiryOrder/components/flowRecord.tsx

@@ -3,6 +3,7 @@ import styles from './index.less';
 import { Radio } from 'antd';
 import PolymericTable from '@/components/PolymericTable';
 import { EditableColumns } from '@/components/PolymericTable/interface';
+import moment from 'moment';
 
 export interface parmas {
   editData?: any
@@ -11,6 +12,38 @@ export interface parmas {
 const FlowRecord: React.FC<parmas> = (props) => {
   const { editData } = props;
   const [radio, setRadio] = useState<string>('outer'); //切换单据
+  const format = (text) => {
+    return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>
+  }
+  /**
+   * @description: 外部流转记录
+   * @param {type} 
+   * @return {type} 
+   */
+  const externalTextState = (text) => {
+    let name = ''
+    editData.externalInquiryListStateResponses.forEach(element => {
+      if (element.state === text) {
+        name = element.operationalProcess
+      }
+    })
+    return <>{name}</>
+  }
+
+  /**
+   * @description: 内部流转记录
+   * @param {type} 
+   * @return {type} 
+   */
+  const interiorTextState = (text) => {
+    let name = ''
+    editData.interiorInquiryListLogResponses.forEach(element => {
+      if (element.state === text) {
+        name = element.operationalProcess
+      }
+    })
+    return <>{name}</>
+  }
   const outerColumns: EditableColumns[] = [{
     title: '序号',
     dataIndex: 'inquiryListId',
@@ -20,12 +53,14 @@ const FlowRecord: React.FC<parmas> = (props) => {
   }, {
     title: '状态',
     dataIndex: 'state',
+    render: (text: any, record: any) => externalTextState(text)
   }, {
     title: '操作',
     dataIndex: 'operation',
   }, {
     title: '操作时间',
     dataIndex: 'operationTime',
+    render: (text: any, record: any) => interiorTextState(text)
   }, {
     title: '审核意见',
     dataIndex: 'auditOpinion',
@@ -45,12 +80,14 @@ const FlowRecord: React.FC<parmas> = (props) => {
   }, {
     title: '状态',
     dataIndex: 'state',
+    render: (text: any, record: any) => format(text)
   }, {
     title: '操作',
     dataIndex: 'operation',
   }, {
     title: '操作时间',
     dataIndex: 'operationTime',
+    render: (text: any, record: any) => format(text)
   }, {
     title: '审核意见',
     dataIndex: 'auditOpinion',

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

@@ -58,6 +58,7 @@ const BasicInfo: React.FC<queryProps> = (props) => {
       title: '单据时间',
       dataIndex: 'documentTime',
       key: 'documentTime',
+      render: (text: any, record: any) => format(text)
     }
   ]
   const formSearch: ISchema = {

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

@@ -3,7 +3,7 @@ import styles from './index.less';
 import { Radio } from 'antd';
 import PolymericTable from '@/components/PolymericTable';
 import { EditableColumns } from '@/components/PolymericTable/interface';
-
+import moment from 'moment';
 export interface parmas {
   editData?: any
 }
@@ -11,6 +11,9 @@ export interface parmas {
 const FlowRecord: React.FC<parmas> = (props) => {
   const { editData } = props;
   const [radio, setRadio] = useState<string>('outer'); //切换单据
+  const format = (text) => {
+    return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>
+  }
   const outerColumns: EditableColumns[] = [{
     title: '序号',
     dataIndex: 'inquiryListId',
@@ -20,12 +23,14 @@ const FlowRecord: React.FC<parmas> = (props) => {
   }, {
     title: '状态',
     dataIndex: 'state',
+    render: (text: any, record: any) => externalTextState(text)
   }, {
     title: '操作',
     dataIndex: 'operation',
   }, {
     title: '操作时间',
     dataIndex: 'operationTime',
+    render: (text: any, record: any) => format(text)
   }, {
     title: '审核意见',
     dataIndex: 'auditOpinion',
@@ -45,12 +50,14 @@ const FlowRecord: React.FC<parmas> = (props) => {
   }, {
     title: '状态',
     dataIndex: 'state',
+    render: (text: any, record: any) => interiorTextState(text)
   }, {
     title: '操作',
     dataIndex: 'operation',
   }, {
     title: '操作时间',
     dataIndex: 'operationTime',
+    render: (text: any, record: any) => format(text)
   }, {
     title: '审核意见',
     dataIndex: 'auditOpinion',
@@ -58,6 +65,35 @@ const FlowRecord: React.FC<parmas> = (props) => {
   const onChange = (e: any) => {
     setRadio(e.target.value)
   }
+  /**
+   * @description: 外部流转记录
+   * @param {type} 
+   * @return {type} 
+   */
+  const externalTextState = (text) => {
+    let name = ''
+    editData.externalInquiryListStateResponses.forEach(element => {
+      if (element.state === text) {
+        name = element.operationalProcess
+      }
+    })
+    return <>{name}</>
+  }
+
+  /**
+   * @description: 内部流转记录
+   * @param {type} 
+   * @return {type} 
+   */
+  const interiorTextState = (text) => {
+    let name = ''
+    editData.interiorRequisitionFormStateResponses.forEach(element => {
+      if (element.state === text) {
+        name = element.operationalProcess
+      }
+    })
+    return <>{name}</>
+  }
   return (
     <div className={styles.revise_style}>
       <Radio.Group defaultValue="outer" buttonStyle="solid" onChange={onChange}>
@@ -66,14 +102,14 @@ const FlowRecord: React.FC<parmas> = (props) => {
       </Radio.Group>
       {radio === 'outer' ?
         <PolymericTable
-          dataSource={editData.interiorInquiryListLogResponses}
+          dataSource={editData.externalInquiryListLogResponses}
           columns={outerColumns}
           loading={false}
           pagination={null}
         />
         :
         <PolymericTable
-          dataSource={editData.externalInquiryListLogResponses}
+          dataSource={editData.interiorInquiryListLogResponses}
           columns={insideColumns}
           loading={false}
           pagination={null}

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

@@ -49,10 +49,13 @@ const AddInquiryOrder: 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',

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

-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, ReactNode } from 'react';
 import style from './index.less'
 import { history } from 'umi';
 import { Button, Card, Tabs, Steps, Table } from 'antd';
@@ -7,6 +7,7 @@ import { StopOutlined, CheckSquareOutlined, LinkOutlined } from '@ant-design/ico
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { quoteOrderInternalState, inquiryQuoteOuterState } from '../../common/tableStatusList';
 import AuditModal from '../components/auditModel';
+import moment from 'moment';
 import { PublicApi } from '@/services/api';
 
 const { TabPane } = Tabs;
@@ -33,6 +34,40 @@ const Details: React.FC<parmas> = (props) => {
   //view: 1.询价单号,2.报价单号
   const { id, page_type, view } = props;
   const [headerWrapperData, setheaderWrapperData] = useState<Array<any>>([]);
+  // 模拟数据
+  const [data, setdata] = useState<any>([]);
+  const format = (text) => {
+    return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>
+  }
+  /**
+   * @description: 外部流转记录
+   * @param {type} 
+   * @return {type} 
+   */
+  const externalTextState = (text) => {
+    let name = ''
+    data.externalInquiryListStateResponses.forEach(element => {
+      if (element.state === text) {
+        name = element.operationalProcess
+      }
+    })
+    return <>{name}</>
+  }
+
+  /**
+   * @description: 内部流转记录
+   * @param {type} 
+   * @return {type} 
+   */
+  const interiorTextState = (text) => {
+    let name = ''
+    data.interiorRequisitionFormStateResponses.forEach(element => {
+      if (element.state === text) {
+        name = element.operationalProcess
+      }
+    })
+    return <>{name}</>
+  }
   // steps 切换
   const [detailData, setDetailData] = useState<any>({
     externalStateStep: {
@@ -87,63 +122,6 @@ const Details: React.FC<parmas> = (props) => {
       ]
     }
   })
-  // 模拟数据
-  const [data, setdata] = useState<any>({
-    id: 91,
-    inquiryListNo: 'SD2015PPLJ',
-    quotationNo: 'BPTY12',
-    details: '阿珍爱上阿强',
-    memberName: 'wutiaoren',
-    deliveryTime: '2020-10-14 15:37:00',
-    quotationAsTime: '2020-10-13 15:37:00',
-    voucherTime: '2020-10-13 15:37:00',
-    externalState: 1,
-    interiorState: 3,
-    fullAddress: '东莞市石龙镇西葫芦53号',
-    offer: '报价要求',
-    paymentType: '付款方式',
-    taxes: '税费要求',
-    logistics: '物流要求',
-    packRequire: '包装要求',
-    otherRequire: '其他要求',
-    minimumOrder: 1000,
-    inquiryListProductRequests: [{
-      id: 1,
-      productId: 10,
-      productName: 'APPLE Pro Max 12',
-      inquiryListNo: '智能手机',
-      brand: 'APPLE',
-      nuit: '台',
-      purchaseQuantity: 1,
-      productQuotationId: 20,
-      money: 8699,
-      pric: 8699
-    }],
-    externalInquiryListLogResponses: [{
-      id: 200,
-      inquiryListId: 63,
-      roleName: '管理员',
-      state: 1,
-      operation: '操作',
-      operationTime: '2020-10-13 15:37:00',
-      auditOpinion: '通过'
-    }],
-    interiorInquiryListLogResponses: [{
-      id: 200,
-      inquiryListId: 63,
-      roleName: '管理员',
-      state: 1,
-      operation: '操作',
-      operationTime: '2020-10-13 15:37:00',
-      auditOpinion: '通过',
-      department: '销售部',
-      position: '经理'
-    }],
-    enclosureUrls: [{
-      name: '我是附件.doc',
-      url: 'http://www.hao123.com'
-    }]
-  });
   // 询价商品
   const inquiryGoods: ColumnType<any>[] = [{
     title: 'ID',
@@ -175,12 +153,12 @@ const Details: React.FC<parmas> = (props) => {
     base: {
       title: '交易条件',
       leftElem: [
-        { title: '交付日期', key: '', value: data.deliveryTime },
+        { title: '交付日期', key: '', value: format(data.deliveryTime) },
         { title: '交付地址', key: '', value: data.fullAddress },
         { title: '物流要求', key: '', value: data.logistics }
       ],
       centerElem: [
-        { title: '报价截止日期', key: '', value: data.quotationAsTime },
+        { title: '报价截止日期', key: '', value: format(data.quotationAsTime) },
         { title: '报价要求', key: '', value: data.offer },
         { title: '包装要求', key: '', value: data.packRequire },
       ],
@@ -221,6 +199,7 @@ const Details: React.FC<parmas> = (props) => {
       title: '状态',
       key: 'state',
       dataIndex: 'state',
+      render: (text: any, record: any) => externalTextState(text)
     }, {
       title: '操作',
       key: 'operation',
@@ -229,6 +208,7 @@ const Details: React.FC<parmas> = (props) => {
       title: '操作时间',
       key: 'operationTime',
       dataIndex: 'operationTime',
+      render: (text: any, record: any) => format(text)
     }, {
       title: '审核意见',
       key: 'auditOpinion',
@@ -254,6 +234,7 @@ const Details: React.FC<parmas> = (props) => {
       title: '状态',
       key: 'state',
       dataIndex: 'state',
+      render: (text: any, record: any) => interiorTextState(text)
     }, {
       title: '操作',
       key: 'operation',
@@ -262,6 +243,7 @@ const Details: React.FC<parmas> = (props) => {
       title: '操作时间',
       key: 'operationTime',
       dataIndex: 'operationTime',
+      render: (text: any, record: any) => format(text)
     }, {
       title: '审核意见',
       key: 'auditOpinion',
@@ -315,6 +297,27 @@ const Details: React.FC<parmas> = (props) => {
     }, 1000)
   }
 
+  const analyticalFn = (key: any, value: any) => {
+    let name: ReactNode = null;
+    switch (key) {
+      case 'voucherTime':
+      case 'quotationAsTime':
+      case 'deliveryTime':
+        name = format(value);
+        break;
+      case 'externalState':
+        name = quoteOrderInternalState(value);
+        break;
+      case 'interiorState':
+        name = inquiryQuoteOuterState(value);
+        break;
+      default:
+        name = value;
+        break;
+    }
+    return name;
+  }
+
   return (
     <PageHeaderWrapper
       className={style.header}
@@ -368,14 +371,7 @@ const Details: React.FC<parmas> = (props) => {
             {headerWrapperData && headerWrapperData.map(item => (
               <div key={item.name} className={style['headerMain-left-option']}>
                 <div>{item.label}：</div>
-                <div>
-                  {item.name === 'externalState' ?
-                    inquiryQuoteOuterState(item.value) :
-                    item.name === 'interiorState' ?
-                      quoteOrderInternalState(item.value) :
-                      item.value
-                  }
-                </div>
+                <div>{analyticalFn(item.name,item.value)}</div>
               </div>
             ))}
           </div>
@@ -500,10 +496,10 @@ const Details: React.FC<parmas> = (props) => {
       </Card>
       <Card className={style.item_wrap}>
         <div className={style.mainCol_title}>附件</div>
-        {/* <div className={style.upload_data}>
+        <div className={style.upload_data}>
           {
             data.enclosureUrls &&
-            data.enclosureUrls.map((v,i) => (
+            data.enclosureUrls.map((v, i) => (
               <div key={i} className={style.upload_item}>
                 <div className={style.upload_left}>
                   <LinkOutlined />
@@ -512,7 +508,7 @@ const Details: React.FC<parmas> = (props) => {
               </div>
             ))
           }
-        </div> */}
+        </div>
       </Card>
       <Card className={style.item_wrap}>
         {

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

@@ -64,11 +64,13 @@ const ReviewList: React.FC<parmas> = (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: '外部状态',

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

@@ -14,11 +14,15 @@ import { filterExternalState } from './../../common/statusList';
 import { inquiryQuoteOuterState } from '../../common/tableStatusList';
 import EyePreview from '@/components/EyePreview';
 import { timeRange } from '@/utils/index';
+import moment from 'moment';
 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: 'inquiryListNo',
@@ -37,14 +41,17 @@ const EnquiryOrder: React.FC<{}> = (props) => {
     title: '交付日期',
     key: 'deliveryTime',
     dataIndex: 'deliveryTime',
+    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',
@@ -60,28 +67,11 @@ const EnquiryOrder: React.FC<{}> = (props) => {
     render: (text: any, record: any) => <Button type='link'><Link to={`/memberCenter/tranactionAbility/inquiryQuote/addInquiryOrder/quote?id=${record.id}`}>报价</Link></Button>
   }];
   //交易能力 询价报价 询价单查询
-  // 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,
-  //   }]
-  // }
   const fetchData = (params?: any) => {
     return new Promise((resolve, reject) => {
       PublicApi.getOrderProductInquiryList({...params}).then(res => {
         resolve(res.data)
       })
-      // setTimeout(() => {
-      //   resolve(data)
-      // }, 1000)
     })
   }
   // 搜索

src/pages/transaction/inquiryQuote/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.getOrderAuditProductQuotationList({...params}).then(res => {
         resolve(res.data)
       })
-      // setTimeout(() => {
-      //   resolve(data)
-      // }, 500)
     })
   }
   // 批量操作

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

@@ -48,10 +48,12 @@ 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',

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

@@ -13,23 +13,27 @@ import { filterInternalState, filterExternalState } from './../../common/statusL
 import { quoteOrderInternalState, inquiryQuoteOuterState } from '../../common/tableStatusList';
 import EyePreview from '@/components/EyePreview';
 import { timeRange } from '@/utils/index';
+import moment from 'moment';
 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',
     dataIndex: 'quotationNo',
     render: (text: any, record: any) => <EyePreview
-      url={`/memberCenter/tranactionAbility/confirmInquiryQuote/quoteOrder/details?id=${record.id}&view=2`}>{text}</EyePreview>
+      url={`/memberCenter/tranactionAbility/inquiryQuote/quoteOrder/details?id=${record.id}&view=2`}>{text}</EyePreview>
   },{
     title: '询价单号',
     key: 'inquiryListNo',
     dataIndex: 'inquiryListNo',
     render: (text: any, record: any) => <EyePreview
-      url={`/memberCenter/tranactionAbility/confirmInquiryQuote/quoteOrder/details?id=${record.id}&view=1`}>{text}</EyePreview>
+      url={`/memberCenter/tranactionAbility/inquiryQuote/quoteOrder/details?id=${record.id}&view=1`}>{text}</EyePreview>
   }, {
     title: '询价单摘要',
     key: 'details',
@@ -42,10 +46,12 @@ 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',