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

src/constants/regExp.ts

@@ -2,7 +2,7 @@
  * @Author: LeeJiancong
  * @Date: 2020-07-22 09:54:50
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-10-09 10:54:23
+ * @LastEditTime: 2020-10-12 18:13:49
  */ 
 /**
  * 正则表达式集合
@@ -13,7 +13,7 @@ export const PATTERN_MAPS = {
   password: /^(?=.*[a-z])(?=.*[A-Z])[a-zA-Z\d]{8,20}$/,
   email: /^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$/,
   phone: /^1[3|4|5|6|7|8|9][0-9]{9}$/,
-  tel: /^(0\d{2,3}-\d{7,8})(-\d{1,4})?$/,//座机
+  tel: /^(0\d{2,3}-\d{7,8})(-\d{1,4})?$/,//座机 
   smsCode: /^\d{6}$/,
   money:/^\d*(?:\.\d{0,2})?$/,
   weight:/^\d*(?:\.\d{0,3})?$/, 

src/pages/logistics/list/components/templateForm.tsx

@@ -2,7 +2,7 @@
  * @Author: LeeJiancong
  * @Date: 2020-07-15 10:31:55
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-09-17 17:22:21
+ * @LastEditTime: 2020-10-14 15:16:33
  */
 import React, { Component, useState, useEffect } from 'react';
 import ReactDOM from 'react-dom'
@@ -108,7 +108,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
     PublicApi.getManageAreaByPcodeAll({ pcode: '100000' }).then(res => {
       let list = []
       res.data.forEach((item: any, index: number) => {
-        list.push({ label: item.name, value: Number(item.code) })
+        list.push({ label: item.name, value: item.code })
       })
       setProvinceList(list)
     })

src/pages/logistics/logisticsSubmit/toOrderSubmitDetail.tsx

@@ -3,7 +3,7 @@
  * @Date: 2020-07-28 11:25:30
  * @LastEditors: LeeJiancong
  * @Copyright: 1549414730@qq.com
- * @LastEditTime: 2020-09-29 11:47:41
+ * @LastEditTime: 2020-10-14 16:23:57
  */
 
 import React, { Component, useEffect, useRef, useState, ReactNode } from 'react'
@@ -49,6 +49,7 @@ import {
 import ReturnEle from '@/components/ReturnEle'
 import style from '../components/index.less'
 import { history } from 'umi'
+import moment from 'moment'
 import { values, action } from 'mobx'
 import Search from '@/components/NiceForm/components/Search'
 const actions = createFormActions()
@@ -180,8 +181,7 @@ const Deatail: React.FC<{}> = () => {
       align: 'center',
       dataIndex: 'createTime',
       key: 'createTime',
-      render: (text, redcord) =>
-        <>{text}</>
+      render: (text: any) => <>{moment(text).format('YYYY-MM-DD  HH:mm:ss')}</>
 
     }
   ]
@@ -201,32 +201,33 @@ const Deatail: React.FC<{}> = () => {
     {
       title: '对应订单号',
       align: 'center',
-      dataIndex: 'id2',
-      key: 'id2',
+      dataIndex: 'invoicesNo',
+      key: 'invoicesNo',
     },
     {
       title: '单据摘要',
       align: 'center',
-      dataIndex: 'orderThe',
-      key: 'orderThe'
+      dataIndex: 'invoicesAbstract',
+      key: 'invoicesAbstract'
     },
     {
       title: '对应仓库',
       align: 'center',
-      dataIndex: '',
-      key: '',
+      dataIndex: 'inventory',
+      key: 'inventory',
     },
     {
       title: '单据类型',
       align: 'center',
-      dataIndex: '',
-      key: '',
+      dataIndex: 'invoicesType',
+      key: 'invoicesType',
     },
     {
       title: '单据时间',
       align: 'center',
-      dataIndex: 'createTime',
-      key: 'createTime',
+      dataIndex: 'transactionTime',
+      key: 'transactionTime',
+      render: (text: any) => <>{moment(text).format('YYYY-MM-DD  HH:mm:ss')}</>
     }
 
   ]