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

src/pages/afterService/components/FlowRecords/index.tsx

@@ -89,7 +89,7 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({
     },
     {
       title: '状态',
-      dataIndex: 'statusName',
+      dataIndex: 'status',
       align: 'center', 
       render: (text, record) => (
         <StatusTag type={outerStatusMap[record.status] || 'default'} title={text} />

src/pages/afterService/components/GoodsDrawer/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-11-04 15:09:09
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-15 10:08:13
+ * @LastEditTime: 2020-12-17 15:25:03
  * @Description: 维修商品抽屉组件
  */
 import React, { useState, useEffect } from 'react';
@@ -157,6 +157,7 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
       title: '下单时间',
       dataIndex: 'createTime',
       align: 'center',
+      render: text => moment(text).format('YYYY-MM-DD HH:mm:ss'), 
     },
     {
       title: '订单状态',

src/pages/afterService/exchangeApplication/exchangePrAddDeliver/index.tsx

@@ -156,8 +156,8 @@ const ExchangePrAddDeliver: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeAddReturnDeliveryGoods({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeApplication/exchangePrAddLogistics/index.tsx

@@ -132,8 +132,8 @@ const ExchangePrAddLogistics: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeAddLogisticsByConsumer({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeApplication/exchangePrAddWarehousing/index.tsx

@@ -156,8 +156,8 @@ const ExchangePrAddWarehousing: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeAddReplaceGoodsStorage({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeApplication/exchangePrConfirmBack/index.tsx

@@ -113,8 +113,8 @@ const ExchangePrConfirmBack: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeConfirmReturnGoodsReceipt({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeApplication/exchangePrDeliver/index.tsx

@@ -113,8 +113,8 @@ const ExchangePrDeliver: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeReturnDeliveryGoods({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeApplication/exchangePrFinished/index.tsx

@@ -102,8 +102,8 @@ const ExchangePrFinished: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeComplete({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeApplication/exchangePrReceived/index.tsx

@@ -114,8 +114,8 @@ const ExchangePrReceived: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeReplaceReceiveGoods({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeApplication/exchangePrSubmit/index.tsx

@@ -174,8 +174,8 @@ const ExchangePrSubmit: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeSubmitByConsumer({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeApplication/exchangeQuery/index.tsx

@@ -91,8 +91,8 @@ const ExchangeQuery: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageByConsumer({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeManage/exchangePr1/index.tsx

@@ -101,8 +101,8 @@ const ExchangePr1: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeVerifyStepOne({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeManage/exchangePr2/index.tsx

@@ -101,8 +101,8 @@ const ExchangePr2: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeVerifyStepTwo({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeManage/exchangePrAddDeliver/index.tsx

@@ -147,8 +147,8 @@ const ExchangePrAddDeliver: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeAddReplaceDeliveryGoods({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeManage/exchangePrAddLogistics/index.tsx

@@ -132,8 +132,8 @@ const ReturnPrAddLogistics: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeAddLogisticsBySupplier({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeManage/exchangePrAddWarehousing/index.tsx

@@ -156,8 +156,8 @@ const ExchangePrAddWarehousing: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeAddReturnGoodsStorage({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeManage/exchangePrConfirm/index.tsx

@@ -101,8 +101,8 @@ const ExchangePrConfirm: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeConfirmVerify({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeManage/exchangePrConfirmBack/index.tsx

@@ -113,8 +113,8 @@ const ExchangePrConfirmBack: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeConfirmReplaceGoodsReceipt({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeManage/exchangePrDeliver/index.tsx

@@ -113,8 +113,8 @@ const ExchangePrDeliver: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeReplaceDeliveryGoods({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeManage/exchangePrReceived/index.tsx

@@ -115,8 +115,8 @@ const ExchangePrReceived: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeReturnReceiveGoods({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeManage/exchangePrSubmit/index.tsx

@@ -101,8 +101,8 @@ const ExchangePrSubmit: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageToBeSubmitBySupplier({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/exchangeManage/exchangeQuery/index.tsx

@@ -91,8 +91,8 @@ const ExchangeQuery: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReplaceGoodsPageBySupplier({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/repairApplication/repairPrFinished/index.tsx

@@ -102,8 +102,8 @@ const RepairPrFinished: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsRepairGoodsPageToBeConfirmComplete({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/repairApplication/repairPrSubmit/index.tsx

@@ -168,8 +168,8 @@ const RepairPrSubmit: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsRepairGoodsPageToBeSubmitByConsumer({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/repairApplication/repairQuery/index.tsx

@@ -84,8 +84,8 @@ const RepairQuery: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsRepairGoodsPageByConsumer({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/repairManage/repairPr1/index.tsx

@@ -94,8 +94,8 @@ const RepairPr1: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsRepairGoodsPageToBeVerifyStepOne({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/repairManage/repairPr2/index.tsx

@@ -94,8 +94,8 @@ const RepairPr2: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsRepairGoodsPageToBeVerifyStepTwo({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/repairManage/repairPrConfirm/index.tsx

@@ -94,8 +94,8 @@ const RepairPrConfirm: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsRepairGoodsPageToBeConfirm({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/repairManage/repairPrSubmit/index.tsx

@@ -94,8 +94,8 @@ const RepairPrSubmit: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsRepairGoodsPageToBeSubmitBySupplier({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/repairManage/repairQuery/index.tsx

@@ -84,8 +84,8 @@ const RepairManageQuery: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsRepairGoodsPageBySupplier({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnApplication/returnPrAddDeliver/index.tsx

@@ -161,8 +161,8 @@ const ReturnPrAddDeliver: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageToBeAddReturnDeliveryGoods({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnApplication/returnPrAddLogistics/index.tsx

@@ -137,8 +137,8 @@ const ReturnPrAddLogistics: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageToBeAddLogisticsByConsumer({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnApplication/returnPrConfirmBack/index.tsx

@@ -120,8 +120,8 @@ const ReturnPrConfirmBack: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageToBeConfirmReturnGoodsReceipt({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnApplication/returnPrConfirmFinish/index.tsx

@@ -109,8 +109,8 @@ const ReturnPrConfirmFinish: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageToBeComplete({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnApplication/returnPrConfirmResult/index.tsx

@@ -114,8 +114,8 @@ const ReturnPrConfirmResult: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageToBeConfirmRefund({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnApplication/returnPrDeliver/index.tsx

@@ -120,8 +120,8 @@ const ReturnPrDeliver: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageToBeReturnDeliveryGoods({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnApplication/returnPrSubmit/index.tsx

@@ -179,8 +179,8 @@ const ReturnPrSubmit: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageToBeSubmitByConsumer({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnApplication/returnQuery/index.tsx

@@ -96,8 +96,8 @@ const ReturnQuery: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageByConsumer({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnManage/returnPr1/index.tsx

@@ -106,8 +106,8 @@ const ReturnPr1: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageToBeVerifyStepOne({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnManage/returnPr2/index.tsx

@@ -106,8 +106,8 @@ const ReturnPr2: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageToBeVerifyStepTwo({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnManage/returnPrAddWarehousing/index.tsx

@@ -161,8 +161,8 @@ const ReturnPrAddWarehousing: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageToBeAddReturnGoodsStorage({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnManage/returnPrConfirm/index.tsx

@@ -106,8 +106,8 @@ const ReturnPrConfirm: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageToBeConfirmVerify({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnManage/returnPrReceived/index.tsx

@@ -120,8 +120,8 @@ const ReturnPrReceived: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageToBeReturnReceiveGoods({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnManage/returnPrReturn/index.tsx

@@ -111,8 +111,8 @@ const ReturnPrReturn: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageToBeRefund({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnManage/returnPrSubmit/index.tsx

@@ -106,8 +106,8 @@ const ReturnPrSubmit: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageToBeSubmitBySupplier({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/afterService/returnManage/returnQuery/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-11-05 14:25:41
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-10 10:07:08
+ * @LastEditTime: 2020-12-17 18:09:39
  * @Description: 退货申请单查询
  */
 import React, { useState, useRef } from 'react';
@@ -96,8 +96,8 @@ const ReturnQuery: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getAsReturnGoodsPageBySupplier({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/balance/settleRules/corporateAccount/index.tsx

@@ -33,7 +33,7 @@ interface AccountDetal {
 
 const ItemRender: React.FC<Config> = (props) => {
   const { isEdit, name, canEdit, value, image, changeEdit, pattern, message } = props;
-  const [validError, setValidError] = useState(false); 
+  const [validError, setValidError] = useState(false);
   // const [inputValue, setInputValue] = useState(value);
   const handleClick = (name:string) => {
     changeEdit(name, { isEdit: true }, 'change')
@@ -55,7 +55,7 @@ const ItemRender: React.FC<Config> = (props) => {
   // 确定提交
   const handleConfirm = (name: string) => {
     if(validError) {
-      return 
+      return
     }
     changeEdit(name, { isEdit: false }, 'confirm');
   }
@@ -71,7 +71,7 @@ const ItemRender: React.FC<Config> = (props) => {
             {isEdit ? <Input value={value} style={{width: '300px'}} onChange={(e) => handleChange(e.target.value, name)}/> : value}
         </div>
         {
-          canEdit 
+          canEdit
           ? !isEdit
           ? <div className={styles.edit} style={{width: '300px'}} onClick={() => handleClick(name)} >
                 <FormOutlined />
@@ -91,6 +91,12 @@ const ItemRender: React.FC<Config> = (props) => {
   )
 }
 
+const PARAM_TO_TYPE = {
+  name: 1,
+  bankAccount: 2,
+  bankDeposit: 3,
+}
+
 const CorporateAccount = () => {
   const [configs, setConfigs] = useState<Config[]>([]);
   const [unsaved, setUnsaved] = useState<boolean>(false)
@@ -115,17 +121,11 @@ const CorporateAccount = () => {
       }
       setConfigs(temp);
     } else if(type == 'confirm') {
-      const postData = {
-        ...datas,
-        [target.dataIndex]: target.value
-      }
-      console.log(postData);
-      ///settle/accounts/corporate/account/update
-      PublicApi.postSettleAccountsCorporateAccountUpdate(postData)
+      PublicApi.postSettleAccountsCorporateAccountUpdateDetail({itemValue: target.value, itemType: PARAM_TO_TYPE[target.dataIndex]})
       .then((data) => {
         if(data.code == 1000) {
           setUnsaved(false);
-          setDatas(postData);
+          // setDatas(postData);
           temp[index] = {
             ...target,
             ...res,
@@ -135,7 +135,7 @@ const CorporateAccount = () => {
         }
       })
     }
-    
+
   }
 
   useEffect(() => {
@@ -193,11 +193,11 @@ const CorporateAccount = () => {
           return (
             <ItemRender key={item.name} {...item} changeEdit={changeEdit} />
           )
-        }) 
+        })
       }
       <Prompt when={unsaved} message="信息还未保存，确定离开吗？"></Prompt>
     </PageHeaderWrapper>
   )
 }
 
-export default CorporateAccount 
\ No newline at end of file
+export default CorporateAccount

src/pages/payandSettle/creditApplication/quotaFormQuery/index.tsx

@@ -104,8 +104,8 @@ const QuotaFormQuery: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getPayCreditApplyPageCreditApply({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/payandSettle/creditApplication/quotaPrSubmit/index.tsx

@@ -196,8 +196,8 @@ const QuotaPrSubmit: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getPayCreditApplyPageWaitSubmitCreditApply({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         ...rest, 
       })
         .then(res => {

src/pages/payandSettle/creditManage/quotaFormQuery/index.tsx

@@ -106,8 +106,8 @@ const QuotaFormQuery: React.FC = () => {
     const { startTime, endTime, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getPayCreditHandlePageCreditChildApply({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null,  
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null,  
         ...rest, 
       })
         .then(res => {

src/pages/payandSettle/creditManage/quotaPr1/index.tsx

@@ -125,8 +125,8 @@ const QuotaPr1: React.FC = () => {
     const { startTime, endTime, applyType = 0, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getPayCreditHandlePageCreditChildWaitVerifyApplyStepOne({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         applyType, 
         ...rest, 
       })

src/pages/payandSettle/creditManage/quotaPr2/index.tsx

@@ -125,8 +125,8 @@ const QuotaPr1: React.FC = () => {
     const { startTime, endTime, applyType = 0, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getPayCreditHandlePageCreditChildWaitVerifyApplyStepTwo({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         applyType, 
         ...rest, 
       })

src/pages/payandSettle/creditManage/quotaPr3/index.tsx

@@ -125,8 +125,8 @@ const QuotaPr3: React.FC = () => {
     const { startTime, endTime, applyType = 0, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getPayCreditHandlePageCreditChildWaitVerifyApplyStepThree({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         applyType, 
         ...rest, 
       })

src/pages/payandSettle/creditManage/quotaPrConfirm/index.tsx

@@ -125,8 +125,8 @@ const QuotaPrConfirm: React.FC = () => {
     const { startTime, endTime, applyType = 0, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getPayCreditHandlePageCreditChildWaitConfirmVerifyApply({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         applyType, 
         ...rest, 
       })

src/pages/payandSettle/creditManage/quotaPrSubmit/index.tsx

@@ -125,8 +125,8 @@ const QuotaPrSubmit: React.FC = () => {
     const { startTime, endTime, applyType = 0, ...rest } = params; 
     return new Promise((resolve, reject) => {
       PublicApi.getPayCreditHandlePageCreditChildWaitSubmitApply({
-        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD') : null, 
-        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD') : null, 
+        startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+        endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
         applyType, 
         ...rest, 
       })

src/pages/transaction/components/OrderDetailHeader/index.tsx

-import React, { ReactNode } from 'react'
-import { Row, Col, Skeleton } from 'antd'
-import { history } from 'umi'
-import { ArrowLeftOutlined } from '@ant-design/icons'
-import style from './index.less'
-
-export interface OrderDetailHeaderProps {
-  extraRight?: ReactNode,
-  detailList?: { label: string, name: string, render?(text, record?), [key: string]: any }[],
-  detailData?: any
-}
-
-/**
- * 订单详情头部
- */
-const OrderDetailHeader:React.FC<OrderDetailHeaderProps> = ({ extraRight, detailList = [], detailData}) => {
-  const isLoading = !!detailData
-  return (
-    <div className={style.detailHeader}>
-      {
-      isLoading ? 
-        <Row>
-          {
-            <Col>
-              <Row align='middle'>
-                <Col>
-                  <ArrowLeftOutlined onClick={() => history.goBack()}/>
-                </Col>
-                <Col className={style.titleAvator}>单</Col>
-              </Row>
-            </Col>
-          }
-          
-          <Col style={{flex: 1}}>
-            <Row justify='space-between' align='middle' style={{paddingTop: 14}}>
-              <Col style={{flex: 1}}>
-                <div className={style.titleAvatorText}>订单号: {detailData.orderNo}</div>
-                <Row>
-                  {detailList.map(v => {
-                    const { label, render, name, ...colProps } = v
-                    return detailData[name] ? <Col key={label} {...colProps} className={style.detailCol}>
-                      <span className={style.colLabel}>{label}:</span>
-                      {render ? render(detailData[name], detailData) : <span>{detailData[name]}</span>}
-                    </Col> : null
-                  })}
-                </Row>
-              </Col>
-              <Col>{extraRight}</Col>
-            </Row>
-          </Col>
-        </Row>
-      : <Skeleton avatar={{shape: 'square'}} active paragraph={{ rows: 3 }} />
-          }
-    </div> 
-  )
-}
-
-OrderDetailHeader.defaultProps = {}
-
-export default OrderDetailHeader
\ No newline at end of file
+import React, { ReactNode } from 'react'
+import { Row, Col, Skeleton } from 'antd'
+import { history } from 'umi'
+import { ArrowLeftOutlined } from '@ant-design/icons'
+import style from './index.less'
+
+export interface OrderDetailHeaderProps {
+  extraRight?: ReactNode,
+  detailList?: { label: string, name: string, render?(text, record?), [key: string]: any }[],
+  detailData?: any
+}
+
+/**
+ * 订单详情头部
+ */
+const OrderDetailHeader:React.FC<OrderDetailHeaderProps> = ({ extraRight, detailList = [], detailData}) => {
+  const isLoading = !!detailData
+  return (
+    <div className={style.detailHeader}>
+      {
+      isLoading ?
+        <Row>
+          {
+            <Col>
+              <Row align='middle'>
+                <Col>
+                  <ArrowLeftOutlined onClick={() => history.goBack()}/>
+                </Col>
+                <Col className={style.titleAvator}>单</Col>
+              </Row>
+            </Col>
+          }
+
+          <Col style={{flex: 1}}>
+            <Row justify='space-between' align='middle' style={{paddingTop: 14}}>
+              <Col style={{flex: 1}}>
+                <div className={style.titleAvatorText}>订单号: {detailData.orderNo}</div>
+                <Row>
+                  {detailList.map(v => {
+                    const { label, render, name, ...colProps } = v
+                    return (detailData[name] || detailData[name] === 0) ? <Col key={label} {...colProps} className={style.detailCol}>
+                      <span className={style.colLabel}>{label}:</span>
+                      {render ? render(detailData[name], detailData) : <span>{detailData[name]}</span>}
+                    </Col> : null
+                  })}
+                </Row>
+              </Col>
+              <Col>{extraRight}</Col>
+            </Row>
+          </Col>
+        </Row>
+      : <Skeleton avatar={{shape: 'square'}} active paragraph={{ rows: 3 }} />
+          }
+    </div>
+  )
+}
+
+OrderDetailHeader.defaultProps = {}
+
+export default OrderDetailHeader