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

src/constants/index.ts

@@ -1058,4 +1058,53 @@ export const RETURN_OUTER_STATUS = {
   [REPAIR_OUTER_STATUS_FAILED]: '不接受申请', 
   [REPAIR_OUTER_STATUS_SUCCESS]: '接受申请', 
   [REPAIR_OUTER_STATUS_FINISHED]: '售后完成', 
-};
\ No newline at end of file
+};
+
+// 售后换货内部状态
+export const EXCHANGE_INNER_STATUS_UNCOMMITTED = 1;                         // 待提交换货
+export const EXCHANGE_INNER_STATUS_COMMITTED = 2;                           // 已提交
+export const EXCHANGE_INNER_STATUS_SUCCESS_1 = 3;                           // 一级审核通过
+export const EXCHANGE_INNER_STATUS_SUCCESS_2 = 4;                           // 二级审核通过
+export const EXCHANGE_INNER_STATUS_FAILED = 5;                              // 审核不通过（不接受申请）
+export const EXCHANGE_INNER_STATUS_CONFIRM_SUCCESS = 6;                     // 确认审核通过
+export const EXCHANGE_INNER_STATUS_CONFIRM_FAILED = 7;                      // 确认审核不通过
+export const EXCHANGE_INNER_STATUS_NOT_ADDED_RETURN_DELIVERY = 8;           // 待新增退货发货单
+export const EXCHANGE_INNER_STATUS_UNREVIEWED_RETURN_DELIVERY = 9;          // 待审核退货发货单
+export const EXCHANGE_INNER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS = 10;       // 采购商待新增物流单
+export const EXCHANGE_INNER_STATUS_CONSUMER_UNCONFIRMED_LOGISTICS = 11;     // 采购商待确认物流单
+export const EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_DELIVERY = 12;        // 待确认退货发货
+export const EXCHANGE_INNER_STATUS_NOT_ADDED_RETURN_STORAGE = 13;           // 待新增退货入库单
+export const EXCHANGE_INNER_STATUS_UNREVIEWED_RETURN_STORAGE = 14;          // 待审核退货入库单
+export const EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIVE = 15;         // 待确认退货收货
+export const EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT = 16;         // 待确认退货回单
+export const EXCHANGE_INNER_STATUS_NOT_ADDED_REPLACE_DELIVERY = 17;         // 待新增换货发货单
+export const EXCHANGE_INNER_STATUS_UNREVIEWED_REPLACE_DELIVERY = 18;        // 待审核换货发货单
+export const EXCHANGE_INNER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS = 19;       // 供应商待新增物流单
+export const EXCHANGE_INNER_STATUS_SUPPLIER_UNCONFIRMED_LOGISTICS = 20;     // 供应商待确认物流单
+export const EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_DELIVERY = 21;       // 待确认换货发货
+export const EXCHANGE_INNER_STATUS_NOT_ADDED_REPLACE_STORAGE = 22;          // 待新增换货入库单
+export const EXCHANGE_INNER_STATUS_UNREVIEWED_REPLACE_STORAGE = 23;         // 待审核换货入库单
+export const EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIVE = 24;        // 待确认换货收货
+export const EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIPT = 25;        // 待确认换货回单
+export const EXCHANGE_INNER_STATUS_UNCONFIRMED_FINISHED = 26;               // 待确认售后完成
+export const EXCHANGE_INNER_STATUS_FINISHED = 27;                           // 已确认售后完成
+
+// 售后换货外部状态
+export const EXCHANGE_OUTER_STATUS_UNCOMMITTED = 1;                         // 待提交
+export const EXCHANGE_OUTER_UNCONFIRMED = 2;                                // 待确认申请单
+export const EXCHANGE_OUTER_STATUS_FAILED = 3;                              // 不接受申请
+export const EXCHANGE_OUTER_STATUS_SUCCESS = 4;                             // 接受申请
+export const EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_DELIVERY = 5;           // 待新增退货发货单
+export const EXCHANGE_OUTER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS = 6;        // 采购商待新增物流单
+export const EXCHANGE_OUTER_STATUS_RETURN_DELIVERY = 7;                     // 待退货发货
+export const EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_STORAGE = 8;            // 待新增退货入库单
+export const EXCHANGE_OUTER_STATUS_RETURN_RECEIVE = 9;                      // 待退货收货
+export const EXCHANGE_OUTER_STATUS_UNCONFIRMED_RETURN_RECEIPT = 10;         // 待确认退货回单
+export const EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_DELIVERY = 11;         // 待新增换货发货单
+export const EXCHANGE_OUTER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS = 12;       // 供应商待新增物流单
+export const EXCHANGE_OUTER_STATUS_REPLACE_DELIVERY = 13;                   // 待换货发货
+export const EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_STORAGE = 14;          // 待新增换货入库单
+export const EXCHANGE_OUTER_STATUS_UNCONFIRMED_REPLACE_RECEIVE = 15;        // 待换货收货
+export const EXCHANGE_OUTER_STATUS_UNCONFIRMED_REPLACE_RECEIPT = 16;        // 待确认换货回单
+export const EXCHANGE_OUTER_STATUS_UNCONFIRMED_FINISHED = 17;               // 待确认售后完成
+export const EXCHANGE_OUTER_STATUS_FINISHED = 18;                           // 售后完成
\ No newline at end of file

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

@@ -211,7 +211,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
   );
 
   const beforeUpload = file => {
-    if (file.size / 1024 < 20) {
+    if (file.size / (1024 * 2) > 20) {
       message.warning('图片大小超过20M');
       return Promise.reject();
     }

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

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-11-05 14:25:41
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-11-17 18:21:27
+ * @LastEditTime: 2020-11-19 10:04:28
  * @Description: 换货申请单查询
  */
 import React, { useState, useRef } from 'react';
@@ -89,65 +89,56 @@ const ExchangeQuery: React.FC = () => {
 
   const fetchListData = (params: any) => {
     const { startTime, endTime, ...rest } = params; 
-    // return new Promise((resolve, reject) => {
-    //   PublicApi.getAsReturnGoodsPageBySupplier({
-    //     startTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null, 
-    //     endTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null, 
-    //     ...rest, 
-    //   })
-    //     .then(res => {
-    //       if (res.code === 1000) {
-    //         resolve(res.data);
-    //       }
-    //       reject();
-    //     })
-    //     .catch(() => {
-    //       reject();
-    //     });
-    // });
-    return Promise.resolve({
-      totalCount: 10, 
-      data: [
-        {
-          applyNo: '123', 
-          replaceId: 1, 
-        }
-      ], 
+    return new Promise((resolve, reject) => {
+      PublicApi.getAsReplaceGoodsPageByConsumer({
+        startTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null, 
+        endTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null, 
+        ...rest, 
+      })
+        .then(res => {
+          if (res.code === 1000) {
+            resolve(res.data);
+          }
+          reject();
+        })
+        .catch(() => {
+          reject();
+        });
     });
   };
 
   // 初始化高级筛选选项
   const fetchSearchItems = async () => {
-    // const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
+    const res = await PublicApi.getAsReplaceGoodsPageItems();
     
-    // if (res.code === 1000) {
-    //   const { data } = res;
-    //   const { 
-    //     outerStatusList = [], 
-    //     innerStatusList = [], 
-    //   } = data;
+    if (res.code === 1000) {
+      const { data } = res;
+      const { 
+        outerStatusList = [], 
+        innerStatusList = [], 
+      } = data;
 
-    //   const newColumns = columns.slice();
+      const newColumns = columns.slice();
 
-    //   // filter 0 过滤掉全部选项
-    //   coverColFiltersItem(
-    //     newColumns, 
-    //     'outerStatusName', 
-    //     outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
-    //   );
-    //   coverColFiltersItem(
-    //     newColumns, 
-    //     'innerStatusName', 
-    //     innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
-    //   );
+      // filter 0 过滤掉全部选项
+      coverColFiltersItem(
+        newColumns, 
+        'outerStatusName', 
+        outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
+      );
+      coverColFiltersItem(
+        newColumns, 
+        'innerStatusName', 
+        innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
+      );
 
-    //   setColumns(newColumns);
+      setColumns(newColumns);
 
-    //   return {
-    //     outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value), 
-    //     innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value), 
-    //   };
-    // }
+      return {
+        outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value), 
+        innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value), 
+      };
+    }
     return {};
   };
 

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

@@ -245,7 +245,7 @@ const RepairForm: React.FC<BillsFormProps> = ({
   );
 
   const beforeUpload = file => {
-    if (file.size / 1024 < 20) {
+    if (file.size / (1024 * 2) > 20) {
       message.warning('图片大小超过20M');
       return Promise.reject();
     }

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

@@ -217,7 +217,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
   );
 
   const beforeUpload = file => {
-    if (file.size / 1024 < 20) {
+    if (file.size / (1024 * 2) > 20) {
       message.warning('图片大小超过20M');
       return Promise.reject();
     }

src/pages/payandSettle/creditApplication/components/QuotaApplicationInfo/index.tsx

@@ -118,7 +118,7 @@ const QuotaApplicationInfo: React.FC<QuotaApplicationInfo> = ({
   );
 
   const beforeUpload = file => {
-    if (file.size / 1024 < 20) {
+    if (file.size / (1024 * 2) > 20) {
       message.warning('图片大小超过20M');
       return Promise.reject();
     }

src/pages/transaction/purchaserEvaluation/received/detail/index.tsx

@@ -103,7 +103,7 @@ const ReceivedDetail: React.FC = () => {
   };
 
   const beforeUpload = file => {
-    if (file.size / 1024 < 10) {
+    if (file.size / (1024 * 2) > 10) {
       message.warning('图片大小超过10M');
       return Promise.reject();
     }

src/pages/transaction/purchaserEvaluation/sent/components/DetailInfo/index.tsx

@@ -146,7 +146,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
   };
 
   const beforeUpload = file => {
-    if (file.size / 1024 < 10) {
+    if (file.size / (1024 * 2) > 10) {
       message.warning('图片大小超过10M');
       return Promise.reject();
     }

src/pages/transaction/purchaserEvaluation/unevaluated/evaluate/index.tsx

@@ -122,7 +122,7 @@ const EvaluateOrder: React.FC = () => {
   };
 
   const beforeUpload = file => {
-    if (file.size / 1024 > 10) {
+    if (file.size / (1024 * 2) > 10) {
       message.warning('图片大小超过10M');
       return Promise.reject();
     }

src/pages/transaction/supplierEvaluation/received/detail/index.tsx

@@ -103,7 +103,7 @@ const ReceivedDetail: React.FC = () => {
   };
 
   const beforeUpload = file => {
-    if (file.size / 1024 < 10) {
+    if (file.size / (1024 * 2) > 10) {
       message.warning('图片大小超过10M');
       return Promise.reject();
     }

src/pages/transaction/supplierEvaluation/sent/components/DetailInfo/index.tsx

@@ -145,7 +145,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
   };
 
   const beforeUpload = file => {
-    if (file.size / 1024 < 10) {
+    if (file.size / (1024 * 2) > 10) {
       message.warning('图片大小超过10M');
       return Promise.reject();
     }

src/pages/transaction/supplierEvaluation/unevaluated/evaluate/index.tsx

@@ -122,7 +122,7 @@ const EvaluateOrder: React.FC = () => {
   };
 
   const beforeUpload = file => {
-    if (file.size / 1024 > 10) {
+    if (file.size / (1024 * 2) > 10) {
       message.warning('图片大小超过10M');
       return Promise.reject();
     }