merge

src/locales/zh-CN/menu.ts

@@ -99,6 +99,7 @@ export default {
   'menu.tranactionAbility.enquirySubmit.addEnquiry': '新增需求单',
   'menu.tranactionAbility.purchaseOrder': '采购订单',
   'menu.tranactionAbility.purchaseOrder.purchaseOrderSearch': '订单查询',
+  'menu.tranactionAbility.purchaseOrder.readyAddOrder': '待新增订单',
 
   //物流能力
   'menu.logisticsAbility': '物流',

src/utils/index.tsx

@@ -13,6 +13,10 @@ export function isObject(obj: any) {
   return Object.prototype.toString.call(obj) === '[object Object]'
 }
 
+export function formatTimeString(date, format: string = 'YYYY-MM-DD HH:MM:SS') {
+  return date ? moment(date).format(format) : ''
+}
+
 export function timeRange(val: number) {
   let st, et;
   switch (val) {