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/logistics/addLogistics/components/columns.ts

@@ -22,3 +22,37 @@ export const SelectGoodsColumns: ColumnType<any>[] = [
     dataIndex: 'brand',
   }
 ]
+
+export const ExternalListColumns: ColumnType<any>[] = [
+  {
+    title: '流转顺序号',
+    key: 'number',
+    dataIndex: 'number',
+    render:(text:any, record:any, index:number) => {return index + 1;}
+  },
+  {
+    title: '操作角色',
+    key: 'roleName',
+    dataIndex: 'roleName',
+  },
+  {
+    title: '状态',
+    key: 'status',
+    dataIndex: 'status',
+  },
+  {
+    title: '操作',
+    key: 'operationalProcess',
+    dataIndex: 'operationalProcess',
+  },
+  {
+    title: '操作时间',
+    key: 'brand',
+    dataIndex: 'brand',
+  },
+  {
+    title: '审核意见',
+    key: 'brand',
+    dataIndex: 'brand',
+  }
+]

src/pages/logistics/addLogistics/index.tsx

@@ -8,7 +8,7 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { LinkOutlined, PlusOutlined } from '@ant-design/icons';
 import { PublicApi } from '@/services/api';
 import ModalTable from '@/components/ModalTable';
-import { SelectGoodsColumns } from './components/columns';
+import { SelectGoodsColumns, ExternalListColumns } from './components/columns';
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
 import moment from 'moment';
 import ModalTableOrder from './components/ModalTableOrder';
@@ -201,12 +201,14 @@ const AddLogistics: React.FC<{}> = () => {
               receiverName: res.data.receiveUserName,
               receiverPhone: res.data.receiveUserTel,
               receiverFullAddress: res.data.receiveAddress,
+              shipperAddressId: res.data.deliveryAddressId,
+              shipperFullAddress: res.data.deliveryAddress,
               shipmentOrderCode: res.data.deliveryNo,
-              relevanceOrderCode: res.data.orderNo,
-              voucherTime: res.data.transactionTime,
-              externalState: res.data.state,
+              relevanceOrderCode: res.data.noticeNo,
               shipmentOrderId: res.data.deliveryId,
               relevanceOrderId: res.data.id,
+              voucherTime: res.data.createTime,
+              externalState: res.data.outerStatus,
             }
             form.setFieldsValue(obj);
             setQuery({ ...obj })
@@ -224,7 +226,7 @@ const AddLogistics: React.FC<{}> = () => {
               voucherTime: res.data.applyTime,
               relevanceOrderId: res.data.applyId,
               externalState: res.data.state,
-              digest: res.data.applyAbstract
+              digest: res.data.applyAbstract,
             }
             form.setFieldsValue(obj);
             setQuery({ ...obj })
@@ -294,7 +296,9 @@ const AddLogistics: React.FC<{}> = () => {
             externalState: res.data.status,
             shipperAddressId: res.data.shipperAddressId,
             shipperFullAddress: res.data.shipperFullAddress,
+            externalList: res.data.externalList
           }
+          form.setFieldsValue(obj)
           setQuery(obj)
           setId(query.id)
           setCreateType(res.data.createType)
@@ -328,11 +332,12 @@ const AddLogistics: React.FC<{}> = () => {
         case 1:
         case 2:
         case 3:
-          PublicApi.getWarehouseInvoicesProductList({ ...params, invoicesId: id }).then((res:any) => {
+          PublicApi.getWarehouseInvoicesProductList({ ...params, invoicesId: id }).then((res: any) => {
             if (res.code === 1000) {
               res.data.data.forEach(item => {
                 item.category = item.categoryName
                 item.brand = item.brandName
+                item.unit = item.unitName
               })
               resolve(res.data)
             }
@@ -375,7 +380,7 @@ const AddLogistics: React.FC<{}> = () => {
         productName: item.productName,
         categoryName: item.category,
         brandName: item.brand,
-        unitName: item.unitName,
+        unitName: item.unit,
         amount: item.amount,
         carton: item.carton,
         weight: item.weight,
@@ -532,7 +537,10 @@ const AddLogistics: React.FC<{}> = () => {
   /**打开选择商品 */
   const handleVisible = () => {
     console.log(query)
-    if(query.shipmentOrderId || query.relevanceOrderId) {
+    if (query.shipmentOrderCode || query.relevanceOrderCode) {
+      const list = [...detailList];
+      goodsRowCtl.setSelectRow(list)
+      goodsRowCtl.setSelectedRowKeys(list.map(v => v.productId));
       setvisible(true)
     } else {
       message.error('请先选择要操作的对应发货单号或对应订单号/售后单')
@@ -541,9 +549,11 @@ const AddLogistics: React.FC<{}> = () => {
 
   /** 提交数据 */
   const handleSubmit = async () => {
-    const basicRef = await form.validateFields().then(res => { return true }).catch(error => { return error });
-    const goodsRef = await goodsForm.validateFields().then(res => { return true }).catch(error => { return error });
     const data = [...badge]
+    const params = { ...query };
+    const basicRef = await form.validateFields().then(res => { console.log(res); params.digest = res.digest; return true }).catch(error => { return error });
+    const goodsRef = await goodsForm.validateFields().then(res => { return true }).catch(error => { return error });
+    params.createType = createType;
     if (basicRef.errorFields) {
       data[0] = basicRef.errorFields.length;
       setbadge(data);
@@ -559,10 +569,9 @@ const AddLogistics: React.FC<{}> = () => {
           setbadge(data)
           const { pathname } = history.location;
           const path = pathname.split('/')[pathname.split('/').length - 1];
-          const params = {...query};
           params.detailList = detailList
-          if(path === 'edit') {
-            PublicApi.postLogisticsOrderWaitSubmitUpdate({...params }).then(res => {
+          if (path === 'edit') {
+            PublicApi.postLogisticsOrderWaitSubmitUpdate({ ...params }).then(res => {
               if (res.code === 1000) {
                 history.goBack()
               }
@@ -588,7 +597,7 @@ const AddLogistics: React.FC<{}> = () => {
     if (Object.keys(memberInfo).length > 0) {
       PublicApi.getSettleAccountsPlatformConfigGetSettlementWay({ ...memberInfo }).then(res => {
         if (res.code === 1000) {
-          const data = {...query}
+          const data = { ...query }
           data.settlementWay = res.data;
           setQuery(data)
         }
@@ -597,6 +606,44 @@ const AddLogistics: React.FC<{}> = () => {
       })
     }
   }, [memberInfo])
+
+  /**跳转到售后/订单的详情 */
+  const jumpOrderDetail = (id: any) => {
+    switch (Number(createType)) {
+      case 1:
+        switch (Number(relevanceType)) {
+          case 1:
+            window.open(`/memberCenter/tranactionAbility/saleOrder/readyAddLogisticsOrder/preview?id=${id}`)
+            break;
+          case 2:
+            window.open(`/memberCenter/afterService/exchangeApplication/exchangePrAddLogistics/detail?id=${id}`)
+            break;
+          case 3:
+            window.open(`/memberCenter/afterService/exchangeManage/exchangePrAddLogistics/detail?id=${id}`)
+            break;
+          case 4:
+            window.open(`/memberCenter/afterService/returnApplication/returnPrAddLogistics/detail?id=${id}`)
+            break;
+        }
+        break;
+      case 2:
+        window.open(`/memberCenter/tranactionAbility/saleOrder/readyAddLogisticsOrder/preview?id=${id}`)
+        break;
+      case 3:
+        window.open(`/memberCenter/handling/confirm/pendingDelivered/detail?id=${id}`)
+        break;
+      case 4:
+        window.open(`/memberCenter/afterService/exchangeApplication/exchangePrAddLogistics/detail?id=${id}`)
+        break;
+      case 5:
+        window.open(`/memberCenter/afterService/exchangeManage/exchangePrAddLogistics/detail?id=${id}`)
+        break;
+      case 6:
+        window.open(`/memberCenter/afterService/returnApplication/returnPrAddLogistics/detail?id=${id}`)
+        break;
+    }
+  }
+
   return (
     <PageHeaderWrapper
       onBack={() => history.goBack()}
@@ -627,11 +674,13 @@ const AddLogistics: React.FC<{}> = () => {
               <Form.Item label="物流单号" name='receiverName1'><span></span></Form.Item>
               <Form.Item label='对应发货单号' name='shipmentOrderCode'>
                 <Search disabled={!!history.location.query.createType} readOnly value={Object.keys(query).length > 0 ? query.shipmentOrderCode : undefined} enterButton={<><LinkOutlined /> 选择</>} onSearch={() => setshippingvisible(true)} />
-                {query.shipmentOrderCode && <Button type='link'>查看单号详情</Button>}
+                {query.shipmentOrderCode && <Button type='link'
+                  onClick={() => window.open(`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${query.shipmentOrderId}&preview=1`)}
+                >查看单号详情</Button>}
               </Form.Item>
               <Form.Item label='对应订单号/售后单' name='relevanceOrderCode'>
                 <Search disabled={!!history.location.query.createType} readOnly value={Object.keys(query).length > 0 ? query.relevanceOrderCode : undefined} enterButton={<><LinkOutlined /> 选择</>} onSearch={() => setinvoicesvisible(true)} />
-                {query.relevanceOrderCode && <Button type='link'>查看单号详情</Button>}
+                {query.relevanceOrderCode && <Button type='link' onClick={() => jumpOrderDetail(query.relevanceOrderId)}>查看单号详情</Button>}
               </Form.Item>
               <Form.Item label="收货方" name='receiverName'><span>{query.receiverName}/{query.receiverPhone}</span></Form.Item>
               <Form.Item label="收货地址" name='receiverFullAddress'>
@@ -674,7 +723,12 @@ const AddLogistics: React.FC<{}> = () => {
             </Form>
           </TabPane>
           {/** 流转记录 */}
-          <TabPane key='tab-4' tab='流转记录' forceRender></TabPane>
+          <TabPane key='tab-4' tab='流转记录' forceRender>
+            <Table
+              columns={ExternalListColumns}
+              dataSource={query.externalList}
+            />
+          </TabPane>
         </Tabs>
       </Card>
       {/* 选择对应发货单 - createType === 1的时候才显示 */}

src/pages/logistics/colorTag.ts

-/*
- * @Author: LeeJiancong
- * @Date: 2020-07-30 17:23:48
- * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-07-30 17:24:49
- */ 
-export default {
-  default: {
-    padding: '2px 5px',
-    background: 'rgba(244,245,247,1)',
-    borderRadius: '4px'
-  },
-  confirm: {
-    color: '#3F7ED2',
-    padding: '2px 5px',
-    background: 'rgba(240, 248, 255, 1)',
-    borderRadius: '4px'
-  },
-  success: {
-    color: '#00B37A',
-    padding: '2px 5px',
-    background: 'rgba(235,247,242,1)',
-    borderRadius: '4px'
-  },
-  warn: {
-    color: '#E63F3B',
-    padding: '2px 5px',
-    background: 'rgba(255,235,230,1)',
-    borderRadius: '4px'
-  }
-}
\ No newline at end of file
+/*
+ * @Author: LeeJiancong
+ * @Date: 2020-07-30 17:23:48
+ * @LastEditors: LeeJiancong
+ * @LastEditTime: 2020-07-30 17:24:49
+ */
+export default {
+  default: {
+    padding: '2px 5px',
+    background: 'rgba(244,245,247,1)',
+    borderRadius: '4px'
+  },
+  confirm: {
+    color: '#3F7ED2',
+    padding: '2px 5px',
+    background: 'rgba(240, 248, 255, 1)',
+    borderRadius: '4px'
+  },
+  success: {
+    color: '#00B37A',
+    padding: '2px 5px',
+    background: 'rgba(235,247,242,1)',
+    borderRadius: '4px'
+  },
+  warn: {
+    color: '#E63F3B',
+    padding: '2px 5px',
+    background: 'rgba(255,235,230,1)',
+    borderRadius: '4px'
+  },
+  error: {
+    color: '#ff0404',
+    padding: '2px 5px',
+    background: 'rgba(247,235,235,1)',
+    borderRadius: '4px'
+  }
+}

src/pages/logistics/logisticsSubmit/toOrderSumitList.tsx

@@ -174,7 +174,8 @@ const OrderList: React.FC<ListProps> = (props) => {
       render: (text: any, reconds: any) => {
         let component: ReactNode = null
         if (text == 3) {
-          component = <><span style={statuStyle.success}>不接受物流单</span></>
+          //外部状态1-待提交2-待确认3-不接受物流单4-接受物流单
+          component = <><span style={statuStyle.error}>不接受物流单</span></>
         } else if (text == 4) {
           component = <><span style={statuStyle.warn}>接受物流单</span></>
         } else if (text == 2) {
@@ -194,7 +195,7 @@ const OrderList: React.FC<ListProps> = (props) => {
           <>
 
             {
-              (record.status === 1 || record.status === 4) &&
+              (record.status === 1 || record.status === 3) &&
               <Button type="link" onClick={() => toEdit(record.id)}>编辑</Button>
 
             }

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/payandSettle/paySetting/index.tsx

@@ -4,19 +4,20 @@
  * @LastEditors: HJX
  * @LastEditTime: 2020-11-19 15:25:54
  */
-import React, { useState, useEffect} from 'react';
+import React, { useState, useEffect } from 'react';
+import { history } from 'umi';
 import { Button, Card, Tabs, Space, Input } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { PublicApi } from '@/services/api';
 import PayWayRadio from './components/payWayRadio';
 import PayWayTable from './components/payWayTable';
-import { set } from 'mobx';
 const { TabPane } = Tabs
 
 const PayWaySetTemplate: React.FC<{}> = () => {
   const [config, setconfig] = useState<any>([]);
   const [payItem, setPayItem] = useState<any>([]);
   const [step, setStep] = useState<Array<number>>([]);
+  const [obj, setObj] = useState<any>({});
   const payWayConfigInfo = () => {
     // 支付配置信息
     return new Promise(resolve => {
@@ -107,9 +108,9 @@ const PayWaySetTemplate: React.FC<{}> = () => {
     setPayItem(data);
   }
 
-  const onGet = (value:any, type:number, idx:number) => {
+  const onGet = (value: any, type: number, idx: number) => {
     const data = [...payItem];
-    if(type === 1) {
+    if (type === 1) {
       data[idx].payParametersAddListRequests = [...data[idx].payParametersAddListRequests, value]
     } else {
       data[idx].payParametersList.push(value)
@@ -118,10 +119,10 @@ const PayWaySetTemplate: React.FC<{}> = () => {
   }
 
   /**删除 */
-  const onDel = (value:any, index:number, idx:number) => {
+  const onDel = (value: any, index: number, idx: number) => {
     console.log(value, index, idx, 10086)
     const data = [...payItem];
-    if(Number(value) === 1) {
+    if (Number(value) === 1) {
       data[idx].payParametersAddListRequests.splice(index, 1);
       data[idx].payParametersAddListRequests = [...data[idx].payParametersAddListRequests]
     } else {
@@ -131,14 +132,14 @@ const PayWaySetTemplate: React.FC<{}> = () => {
     setPayItem([...data]);
   }
   /**编辑 */
-  const onEdit = (value:any, type:number, index:number, idx: number) => {
+  const onEdit = (value: any, type: number, index: number, idx: number) => {
     console.log(value, type, index, idx)
     const data = [...payItem];
-    if(type === 1) {
-      data[idx].payParametersAddListRequests[index] = {...value};
+    if (type === 1) {
+      data[idx].payParametersAddListRequests[index] = { ...value };
       data[idx].payParametersAddListRequests = [...data[idx].payParametersAddListRequests]
     } else {
-      data[idx].payParametersList[index] = {...value};
+      data[idx].payParametersList[index] = { ...value };
       data[idx].payParametersList = [...data[idx].payParametersList]
     }
     console.log(data, 10086)
@@ -150,12 +151,22 @@ const PayWaySetTemplate: React.FC<{}> = () => {
     PublicApi.postPayMemberQueryPlatformUpdate({
       platformPayWays: payItem
     }).then(res => {
-      if(res.code === 1000) {
-        location.reload();
+      if (res.code === 1000) {
+        history.push('/memberCenter/payandSettle/paySetting/payParamsSetting')
+        // location.reload();
       }
     })
   }
 
+  /** */
+  const handleBlur = (e, name, idx) => {
+    const data = [...payItem];
+    const assginObj = {...obj, ...{[name]: e.target.value}}
+    setObj(assginObj)
+    const arr: any[] = []
+    arr.push(assginObj)
+    data[idx].payParametersAddListRequests = [...arr]
+  }
   return (
     <PageHeaderWrapper
       extra={<Button type='primary' onClick={onHnadleSubmit}>保存</Button>}
@@ -189,16 +200,14 @@ const PayWaySetTemplate: React.FC<{}> = () => {
                     }
                     {
                       (payItem[idx].id === 6 && !!payItem[idx].isPitchOn) &&
-                      payItem[idx].payParametersAddListRequests.map((item: any, index: number) => (
-                        <div style={{ marginTop: 42 }} key={`space_${index}`}>
-                          <Space direction="horizontal" size={16}>
-                            初始申请额度不超过
-                            <Input value={item.code} addonBefore="￥" />
-                            允许满<Input value={item.value} />
-                            天后申请上调<Input value={item.describe} addonAfter="%" />
-                          </Space>
-                        </div>
-                      ))
+                      <div style={{ marginTop: 42 }}>
+                        <Space direction="horizontal" size={16}>
+                          初始申请额度不超过
+                            <Input onChange={(e) => handleBlur(e, 'code', idx)} value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].code : undefined} addonBefore="￥" />
+                            允许满<Input onChange={(e) => handleBlur(e, 'value', idx)}  value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].value : undefined} />
+                            天后申请上调<Input onChange={(e) => handleBlur(e, 'describe', idx)}  value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].describe : undefined} addonAfter="%" />
+                        </Space>
+                      </div>
                     }
 
                   </>