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

src/components/ModalTable/schema/index.ts

@@ -660,13 +660,12 @@ export const logisticsDeliverySearchSchema: ISchema = {
             }
           }
         },
-        invoicesType: {
+        invoicesTypeId: {
           type: 'string',
-          // fetchSearch: PublicApi.getWarehouseInvoicesTypeAll,
-          // "x-component": 'SearchSelect',
+          "x-component": 'SearchSelect',
           'x-component-props': {
             placeholder: '单据类型',
-
+            fetchSearch: PublicApi.getWarehouseInvoicesTypeAll,
             style: {
               width: 160
             }

src/constants/index.ts

@@ -1024,7 +1024,7 @@ export const PurchaseOrderOutWorkStateTexts = {
   14: '完成订单',
   20: '不接受订单',
   21: '确认没到账',
-  22: '货品未全部发货',
+  22: '待新增销售发货单',
   23: '待支付尾款',
   24: '待确认支付结果',
   25: '确认未到账',
@@ -1067,7 +1067,7 @@ export const SaleOrderInsideWorkStateTexts = {
 
   16: '支付结果确认到账',
   17: '支付结果没到账',
-  18: '发货单待创建',
+  18: '待审核销售发货单',
   19: '待新增物流单',
   20: '订单发货待确认',
   23: '待确认回单',

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

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-11-05 18:02:18
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-01-06 15:05:32
+ * @LastEditTime: 2021-01-14 20:35:08
  * @Description: 退款明细
  */
 import React, { useState } from 'react';
@@ -237,7 +237,7 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
   const handleConfirmResult = record => {
     setCurrentDetailItem({
       id: record.refundId, 
-      fileList: record.payProveList.map(item => normalizeFiledata(item.proveUrl)), 
+      fileList: record.payProve.fileList ? record.payProve.fileList.map(item => normalizeFiledata(item.proveUrl)) : [], 
     });
     setVisibleResult(true);
   };
@@ -245,7 +245,7 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
   const handleCheck = record => {
     setCurrentDetailItem({ 
       id: record.refundId, 
-      fileList: record.payProveList.map(item => normalizeFiledata(item.proveUrl)), 
+      fileList: record.payProve.fileList ? record.payProve.fileList.map(item => normalizeFiledata(item.proveUrl)) : [], 
     });
   };
 

src/pages/handling/assign/processStock/index.tsx

@@ -184,7 +184,7 @@ const processStock: React.FC<{}> = () => {
             </Popconfirm>
           ),
           [OuterAndInnerStatus.pending_add_logistics]: <Link to={`${ADD_LOGISTICS_PATH}?createType=3&id=${record.id}`}>新增物流单</Link>,
-          [OuterAndInnerStatus.pending_confirm_logistics]: <Link to={`${DETAIL_LOGISTICS_PATH}?id=${record.id}`}>查看物流单</Link>,
+          [OuterAndInnerStatus.pending_confirm_logistics]: <Link to={`${DETAIL_LOGISTICS_PATH}?id=${record.logisticsOrderId}`}>查看物流单</Link>,
           [OuterAndInnerStatus.pending_confirm_deliver]: <Link to={`${PENDING_DELIVERD_PATH}/detail?id=${record.id}`}>发货</Link>,
           [OuterAndInnerStatus.pending_add_process_in_warehouse]: (
             <Link

src/pages/handling/components/Circulation/index.tsx

@@ -43,7 +43,7 @@ const Circulation: React.FC<Iprops> = (props) => {
           {
             innerTaskList && innerTaskList.map((item: Istatus) => {
               return (
-                <Step title={item.taskName} status={item.isExecute == 1 ? 'finish' : 'wait'} description={item.roleName}  key={item.step} />
+                <Step title={item.taskName} status={item.isExecute == 1 ? 'finish' : 'wait'} description={""}  key={item.step} />
               )
             })
           }

src/pages/handling/components/ProcessProducts/index.tsx

 import React, { useState, useEffect, useCallback } from 'react';
 import { Modal, Spin } from 'antd';
 import { PublicApi } from '@/services/api';
-import EyePreview from '@/components/EyePreview';
-import { BasicForm, TablePagination, SearchForm } from '../ModalForTable'
+import { SearchForm } from '../ModalForTable'
 import {  createAsyncFormActions, FormEffectHooks } from '@formily/antd';
 import { schema } from './schema';
 import { getAuth } from '@/utils/auth';
 import { useDebounceFn } from '@umijs/hooks';
+import { Cascader } from 'antd';
 
 const { onFieldInit$ } = FormEffectHooks
 
@@ -22,13 +22,14 @@ const MALL_NAME = {
 const ProcessProducts = ({visible, cancel, rowSelection, loading, ...restProps}) => {
   const authInfo = getAuth();
   const fetchData = useCallback(async (params: any)  => {
-    console.log(params);
+    const customerCategoryId = params.customerCategoryId && Array.isArray(params.customerCategoryId) &&  params.customerCategoryId.pop();
     // /product/commodity/common/getCommodityListByBuyer
     const postData = {
       shopType: ENTERPRISE_MALL[authInfo.memberType],
       environment: 1,
       memberId:authInfo.memberId,
       ...params,
+      customerCategoryId: customerCategoryId,
     }
     let res = await PublicApi.getProductCommodityCommonGetCommodityListByBuyer(postData);
     return res;
@@ -55,11 +56,11 @@ const ProcessProducts = ({visible, cancel, rowSelection, loading, ...restProps})
   }
 
   const effects = () => {
-    onFieldInit$('branchId').subscribe((fieldState) => {
+    onFieldInit$('brandId').subscribe((fieldState) => {
       changeBrand({name: ''})
     });
-    onFieldInit$('categoryId').subscribe((fieldState) => {
-      changeCategory({name: ''});
+    onFieldInit$('customerCategoryId').subscribe((fieldState) => {
+      changeCategory();
     })
   }
 
@@ -69,30 +70,19 @@ const ProcessProducts = ({visible, cancel, rowSelection, loading, ...restProps})
       if(res.code === 1000) {
         options = res.data.map((item) => {return { label: item.name, value: item.id }})
       }
-      actions.setFieldState("branchId", (state) => {
+      actions.setFieldState("brandId", (state) => {
         state.props["x-component-props"]["options"] = options;
       })
     })
   }
-  const changeCategory = (params) => {
-    PublicApi.getProductSelectGetSelectCustomerCategory(params).then(res => {
-      let options = []
-      if(res.code === 1000) {
-        options = res.data.map((item) => {return { label: item.name, value: item.id }})
-      }
-      actions.setFieldState("categoryId", (state) => {
-        state.props["x-component-props"]["options"] = options;
+  const changeCategory = () => {
+    PublicApi.getProductCustomerGetCustomerCategoryTree().then(res => {
+      actions.setFieldState("customerCategoryId", (state) => {
+        state.props["x-component-props"]["options"] = res.data;
       })
     })
   }
 
-  const filterCategroyOption = (input, option) => {
-    return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-  }
-
-  const onCategory = useDebounceFn((value) => {
-    changeCategory({name: value});
-  }, 500)
 
   const filterBrandOption = (input, option) => {
     return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -116,14 +106,13 @@ const ProcessProducts = ({visible, cancel, rowSelection, loading, ...restProps})
           <Spin spinning={loading}>
             <SearchForm
               request={fetchData}
+              components={{Cascader}}
               schema={schema}
               actions={actions}
               effects={effects}
               expressionScope={{
                 rowSelection: rowSelection,
                 columns: columns,
-                filterCategroyOption : filterCategroyOption,
-                onCategory: onCategory.run,
                 filterBrandOption: filterBrandOption,
                 onBrandSearch: onBrandSearch.run
               }}

src/pages/handling/components/ProcessProducts/schema.tsx

@@ -62,7 +62,7 @@ export const schema = {
               properties: {
                 customerCategoryId: {
                   type: 'string',
-                  'x-component': 'Select',
+                  'x-component': 'Cascader',
                   'x-component-props': {
                     placeholder: '请选择商品品类',
                     allowClear:true,
@@ -70,16 +70,10 @@ export const schema = {
                       width: '200px',
                       margin: '0 20px 0 0'
                     },
-                    showSearch: true,
-                    optionFilterProp: "children",
-                    filterOption: "{{filterCategroyOption}}",
-                    onSearch: "{{onCategory}}"
-                    // filterOption: {(input, option) =>
-                    //   option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                    // }
+                    fieldNames: { label: 'title', value: 'id', children: 'children' }
                   }
                 },
-                branchId: {
+                brandId: {
                   type: 'string',
                   'x-component': 'Select',
                   'x-component-props': {

src/pages/logistics/addLogistics/constants.ts

+import {
+  REPAIR_OUTER_STATUS_UNCOMMITTED,
+  REPAIR_OUTER_STATUS_UNCONFIRMED,
+  REPAIR_OUTER_STATUS_FAILED,
+  REPAIR_OUTER_STATUS_SUCCESS,
+  REPAIR_OUTER_STATUS_FINISHED,
+
+  REPAIR_INNER_STATUS_UNCOMMITTED,
+  REPAIR_INNER_STATUS_COMMITTED,
+  REPAIR_INNER_STATUS_SUCCESS_1,
+  REPAIR_INNER_STATUS_SUCCESS_2,
+  REPAIR_INNER_STATUS_FAILED,
+  REPAIR_INNER_STATUS_CONFIRM_SUCCESS,
+  REPAIR_INNER_STATUS_CONFIRM_FAILED,
+  REPAIR_INNER_STATUS_FINISHED,
+
+  EXCHANGE_OUTER_STATUS_UNCOMMITTED,
+  EXCHANGE_OUTER_UNCONFIRMED,
+  EXCHANGE_OUTER_STATUS_FAILED,
+  EXCHANGE_OUTER_STATUS_SUCCESS,
+  EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_DELIVERY,
+  EXCHANGE_OUTER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS,
+  EXCHANGE_OUTER_STATUS_RETURN_DELIVERY,
+  EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_STORAGE,
+  EXCHANGE_OUTER_STATUS_RETURN_RECEIVE,
+  EXCHANGE_OUTER_STATUS_UNCONFIRMED_RETURN_RECEIPT,
+  EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_DELIVERY,
+  EXCHANGE_OUTER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS,
+  EXCHANGE_OUTER_STATUS_REPLACE_DELIVERY,
+  EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_STORAGE,
+  EXCHANGE_OUTER_STATUS_REPLACE_RECEIVE,
+  EXCHANGE_OUTER_STATUS_UNCONFIRMED_REPLACE_RECEIPT,
+  EXCHANGE_OUTER_STATUS_UNCONFIRMED_FINISHED,
+  EXCHANGE_OUTER_STATUS_FINISHED,
+
+  EXCHANGE_INNER_STATUS_UNCOMMITTED,
+  EXCHANGE_INNER_STATUS_COMMITTED,
+  EXCHANGE_INNER_STATUS_SUCCESS_1,
+  EXCHANGE_INNER_STATUS_SUCCESS_2,
+  EXCHANGE_INNER_STATUS_FAILED,
+  EXCHANGE_INNER_STATUS_CONFIRM_SUCCESS,
+  EXCHANGE_INNER_STATUS_CONFIRM_FAILED,
+  EXCHANGE_INNER_STATUS_NOT_ADDED_RETURN_DELIVERY,
+  EXCHANGE_INNER_STATUS_UNREVIEWED_RETURN_DELIVERY,
+  EXCHANGE_INNER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS,
+  EXCHANGE_INNER_STATUS_CONSUMER_UNCONFIRMED_LOGISTICS,
+  EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_DELIVERY,
+  EXCHANGE_INNER_STATUS_NOT_ADDED_RETURN_STORAGE,
+  EXCHANGE_INNER_STATUS_UNREVIEWED_RETURN_STORAGE,
+  EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIVE,
+  EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT,
+  EXCHANGE_INNER_STATUS_NOT_ADDED_REPLACE_DELIVERY,
+  EXCHANGE_INNER_STATUS_UNREVIEWED_REPLACE_DELIVERY,
+  EXCHANGE_INNER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS,
+  EXCHANGE_INNER_STATUS_SUPPLIER_UNCONFIRMED_LOGISTICS,
+  EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_DELIVERY,
+  EXCHANGE_INNER_STATUS_NOT_ADDED_REPLACE_STORAGE,
+  EXCHANGE_INNER_STATUS_UNREVIEWED_REPLACE_STORAGE,
+  EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIVE,
+  EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIPT,
+  EXCHANGE_INNER_STATUS_UNCONFIRMED_FINISHED,
+  EXCHANGE_INNER_STATUS_FINISHED,
+
+  RETURN_INNER_STATUS_UNCOMMITTED,
+  RETURN_INNER_STATUS_COMMITTED,
+  RETURN_INNER_STATUS_SUCCESS_1,
+  RETURN_INNER_STATUS_SUCCESS_2,
+  RETURN_INNER_STATUS_FAILED,
+  RETURN_INNER_STATUS_CONFIRM_SUCCESS,
+  RETURN_INNER_STATUS_CONFIRM_FAILED,
+  RETURN_INNER_STATUS_NOT_ADDED_RETURN_DELIVERY,
+  RETURN_INNER_STATUS_UNREVIEWED_RETURN_DELIVERY,
+  RETURN_INNER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS,
+  RETURN_INNER_STATUS_CONSUMER_UNCONFIRMED_LOGISTICS,
+  RETURN_INNER_STATUS_UNCONFIRMED_RETURN_DELIVERY,
+  RETURN_INNER_STATUS_NOT_ADDED_RETURN_STORAGE,
+  RETURN_INNER_STATUS_UNREVIEWED_RETURN_STORAGE,
+  RETURN_INNER_STATUS_UNCONFIRMED_RETURN_RECEIVE,
+  RETURN_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT,
+  RETURN_INNER_STATUS_TO_BE_REFUNDED,
+  RETURN_INNER_STATUS_UNCONFIRMED_REFUNDED,
+  RETURN_INNER_STATUS_REFUNDED_FAIL,
+  RETURN_INNER_STATUS_REFUNDED_SUCCESS,
+  RETURN_INNER_STATUS_UNCONFIRMED_FINISHED,
+  RETURN_INNER_STATUS_FINISHED,
+
+  RETURN_OUTER_STATUS_UNCOMMITTED,
+  RETURN_OUTER_UNCONFIRMED,
+  RETURN_OUTER_STATUS_FAILED,
+  RETURN_OUTER_STATUS_SUCCESS,
+  RETURN_OUTER_STATUS_NOT_ADDED_RETURN_DELIVERY,
+  RETURN_OUTER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS,
+  RETURN_OUTER_STATUS_RETURN_DELIVERY,
+  RETURN_OUTER_STATUS_NOT_ADDED_RETURN_STORAGE,
+  RETURN_OUTER_STATUS_RETURN_RECEIVE,
+  RETURN_OUTER_STATUS_UNCONFIRMED_RETURN_RECEIPT,
+  RETURN_OUTER_STATUS_TO_BE_REFUNDED,
+  RETURN_OUTER_STATUS_UNCONFIRMED_REFUNDED,
+  RETURN_OUTER_STATUS_NOT_RECEIVED,
+  RETURN_OUTER_STATUS_UNCONFIRMED_FINISHED,
+  RETURN_OUTER_STATUS_FINISHED,
+} from '@/constants';
+
+// 售后维修外部状态 StatusTag map
+export const REPAIR_OUTER_STATUS_TAG_MAP = {
+  [REPAIR_OUTER_STATUS_UNCOMMITTED]: 'default',
+  [REPAIR_OUTER_STATUS_UNCONFIRMED]: 'success',
+  [REPAIR_OUTER_STATUS_FAILED]: 'danger',
+  [REPAIR_OUTER_STATUS_SUCCESS]: 'primary',
+  [REPAIR_OUTER_STATUS_FINISHED]: 'success',
+};
+
+// 售后维修内部部状态 Badge map
+export const REPAIR_INNER_STATUS_BADGE_MAP = {
+  [REPAIR_INNER_STATUS_UNCOMMITTED]: '#669EDE',
+  [REPAIR_INNER_STATUS_COMMITTED]: '#41CC9E',
+  [REPAIR_INNER_STATUS_SUCCESS_1]: '#41CC9E',
+  [REPAIR_INNER_STATUS_SUCCESS_2]: '#41CC9E',
+  [REPAIR_INNER_STATUS_FAILED]: '#EF6260',
+  [REPAIR_INNER_STATUS_CONFIRM_SUCCESS]: '#6C9CEB',
+  [REPAIR_INNER_STATUS_CONFIRM_FAILED]: '#EF6260',
+  [REPAIR_INNER_STATUS_FINISHED]: '#41CC9E',
+};
+
+// 售后换货外部状态 StatusTag map
+export const EXCHANGE_OUTER_STATUS_TAG_MAP = {
+  [EXCHANGE_OUTER_STATUS_UNCOMMITTED]: 'default',
+  [EXCHANGE_OUTER_UNCONFIRMED]: 'primary',
+  [EXCHANGE_OUTER_STATUS_FAILED]: 'danger',
+  [EXCHANGE_OUTER_STATUS_SUCCESS]: 'primary',
+  [EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_DELIVERY]: 'danger',
+  [EXCHANGE_OUTER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS]: 'warning',
+  [EXCHANGE_OUTER_STATUS_RETURN_DELIVERY]: 'danger',
+  [EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_STORAGE]: 'danger',
+  [EXCHANGE_OUTER_STATUS_RETURN_RECEIVE]: 'danger',
+  [EXCHANGE_OUTER_STATUS_UNCONFIRMED_RETURN_RECEIPT]: 'danger',
+  [EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_DELIVERY]: 'nobility',
+  [EXCHANGE_OUTER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS]: 'success',
+  [EXCHANGE_OUTER_STATUS_REPLACE_DELIVERY]: 'nobility',
+  [EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_STORAGE]: 'nobility',
+  [EXCHANGE_OUTER_STATUS_REPLACE_RECEIVE]: 'nobility',
+  [EXCHANGE_OUTER_STATUS_UNCONFIRMED_REPLACE_RECEIPT]: 'primary',
+  [EXCHANGE_OUTER_STATUS_UNCONFIRMED_FINISHED]: 'primary',
+  [EXCHANGE_OUTER_STATUS_FINISHED]: 'success',
+};
+
+// 售后换货内部状态 Badge map
+export const EXCHANGE_INNER_STATUS_BADGE_MAP = {
+  [EXCHANGE_INNER_STATUS_UNCOMMITTED]: '#669EDE',
+  [EXCHANGE_INNER_STATUS_COMMITTED]: '#41CC9E',
+  [EXCHANGE_INNER_STATUS_SUCCESS_1]: '#41CC9E',
+  [EXCHANGE_INNER_STATUS_SUCCESS_2]: '#41CC9E',
+  [EXCHANGE_INNER_STATUS_FAILED]: '#EF6260',
+  [EXCHANGE_INNER_STATUS_CONFIRM_SUCCESS]: '#41CC9E',
+  [EXCHANGE_INNER_STATUS_CONFIRM_FAILED]: '#EF6260',
+  [EXCHANGE_INNER_STATUS_NOT_ADDED_RETURN_DELIVERY]: '#E63F3B',
+  [EXCHANGE_INNER_STATUS_UNREVIEWED_RETURN_DELIVERY]: '#FF991F',
+  [EXCHANGE_INNER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS]: '#E63F3B',
+  [EXCHANGE_INNER_STATUS_CONSUMER_UNCONFIRMED_LOGISTICS]: '#6C9CEB',
+  [EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_DELIVERY]: '#6C9CEB',
+  [EXCHANGE_INNER_STATUS_NOT_ADDED_RETURN_STORAGE]: '#E63F3B',
+  [EXCHANGE_INNER_STATUS_UNREVIEWED_RETURN_STORAGE]: '#FF991F',
+  [EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIVE]: '#6C9CEB',
+  [EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT]: '#6C9CEB',
+  [EXCHANGE_INNER_STATUS_NOT_ADDED_REPLACE_DELIVERY]: '#E63F3B',
+  [EXCHANGE_INNER_STATUS_UNREVIEWED_REPLACE_DELIVERY]: '#FF991F',
+  [EXCHANGE_INNER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS]: '#E63F3B',
+  [EXCHANGE_INNER_STATUS_SUPPLIER_UNCONFIRMED_LOGISTICS]: '#6C9CEB',
+  [EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_DELIVERY]: '#6C9CEB',
+  [EXCHANGE_INNER_STATUS_NOT_ADDED_REPLACE_STORAGE]: '#E63F3B',
+  [EXCHANGE_INNER_STATUS_UNREVIEWED_REPLACE_STORAGE]: '#FF991F',
+  [EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIVE]: '#6C9CEB',
+  [EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIPT]: '#6C9CEB',
+  [EXCHANGE_INNER_STATUS_UNCONFIRMED_FINISHED]: '#6C9CEB',
+  [EXCHANGE_INNER_STATUS_FINISHED]: '#41CC9E',
+};
+
+// 退货明细内部状态
+/**
+ * 未确认发货
+ */
+export const MAIL_INNER_STATUS_UNCONFIRMED_DELIVER = 1;
+/**
+ * 已确认发货
+ */
+export const MAIL_INNER_STATUS_CONFIRMED_DELIVER = 2;
+/**
+ * 已确认收货
+ */
+export const MAIL_INNER_STATUS_CONFIRMED_RECEIVING = 3;
+/**
+ * 确认回单
+ */
+export const MAIL_INNER_STATUS_CONFIRMED_BACK = 4;
+
+// 售后退货外部状态 StatusTag map
+export const RETURN_OUTER_STATUS_TAG_MAP = {
+  [RETURN_OUTER_STATUS_UNCOMMITTED]: 'default',
+  [RETURN_OUTER_UNCONFIRMED]: 'primary',
+  [RETURN_OUTER_STATUS_FAILED]: 'danger',
+  [RETURN_OUTER_STATUS_SUCCESS]: 'primary',
+  [RETURN_OUTER_STATUS_NOT_ADDED_RETURN_DELIVERY]: 'danger',
+  [RETURN_OUTER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS]: 'warning',
+  [RETURN_OUTER_STATUS_RETURN_DELIVERY]: 'danger',
+  [RETURN_OUTER_STATUS_NOT_ADDED_RETURN_STORAGE]: 'danger',
+  [RETURN_OUTER_STATUS_RETURN_RECEIVE]: 'danger',
+  [RETURN_OUTER_STATUS_UNCONFIRMED_RETURN_RECEIPT]: 'danger',
+  [RETURN_OUTER_STATUS_TO_BE_REFUNDED]: 'danger',
+  [RETURN_OUTER_STATUS_UNCONFIRMED_REFUNDED]: 'primary',
+  [RETURN_OUTER_STATUS_NOT_RECEIVED]: 'warning',
+  [RETURN_OUTER_STATUS_UNCONFIRMED_FINISHED]: 'primary',
+  [RETURN_OUTER_STATUS_FINISHED]: 'success',
+};
+
+// 售后退货内部状态 Badge map
+export const RETURN_INNER_STATUS_BADGE_MAP = {
+  [RETURN_INNER_STATUS_UNCOMMITTED]: '#669EDE',
+  [RETURN_INNER_STATUS_COMMITTED]: '#41CC9E',
+  [RETURN_INNER_STATUS_SUCCESS_1]: '#41CC9E',
+  [RETURN_INNER_STATUS_SUCCESS_2]: '#41CC9E',
+  [RETURN_INNER_STATUS_FAILED]: '#EF6260',
+  [RETURN_INNER_STATUS_CONFIRM_SUCCESS]: '#41CC9E',
+  [RETURN_INNER_STATUS_CONFIRM_FAILED]: '#EF6260',
+  [RETURN_INNER_STATUS_NOT_ADDED_RETURN_DELIVERY]: '#E63F3B',
+  [RETURN_INNER_STATUS_UNREVIEWED_RETURN_DELIVERY]: '#FF991F',
+  [RETURN_INNER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS]: '#E63F3B',
+  [RETURN_INNER_STATUS_CONSUMER_UNCONFIRMED_LOGISTICS]: '#6C9CEB',
+  [RETURN_INNER_STATUS_UNCONFIRMED_RETURN_DELIVERY]: '#6C9CEB',
+  [RETURN_INNER_STATUS_NOT_ADDED_RETURN_STORAGE]: '#E63F3B',
+  [RETURN_INNER_STATUS_UNREVIEWED_RETURN_STORAGE]: '#FF991F',
+  [RETURN_INNER_STATUS_UNCONFIRMED_RETURN_RECEIVE]: '#6C9CEB',
+  [RETURN_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT]: '#6C9CEB',
+  [RETURN_INNER_STATUS_TO_BE_REFUNDED]: '#E63F3B',
+  [RETURN_INNER_STATUS_UNCONFIRMED_REFUNDED]: '#6C9CEB',
+  [RETURN_INNER_STATUS_REFUNDED_FAIL]: '#EF6260',
+  [RETURN_INNER_STATUS_REFUNDED_SUCCESS]: '#41CC9E',
+  [RETURN_INNER_STATUS_UNCONFIRMED_FINISHED]: '#6C9CEB',
+  [RETURN_INNER_STATUS_FINISHED]: '#41CC9E',
+};
+
+// 退款内部状态
+/**
+ * 未退款
+ */
+export const REFUND_INNER_STATUS_NO_REFUND = 1;
+/**
+ * 退款失败
+ */
+export const REFUND_INNER_STATUS_REFUND_FAILED = 2;
+/**
+ * 退款成功
+ */
+export const REFUND_INNER_STATUS_REFUND_SUCCESS = 3;
+
+// 退款外部状态
+/**
+ * 未退款
+ */
+export const REFUND_OUTER_STATUS_NO_REFUND = 1;
+/**
+ * 待确认退款
+ */
+export const REFUND_OUTER_STATUS_UNCONFIRMED_REFUND = 2;
+/**
+ * 退款未到账
+ */
+export const REFUND_OUTER_STATUS_NOT_RECEIVED = 3;
+/**
+ * 退款到账
+ */
+export const REFUND_OUTER_STATUS_RECEIVED = 4;
+
+// 退款外部状态 StatusTag map
+export const REFUND_OUTER_STATUS_TAG_MAP = {
+  [REFUND_OUTER_STATUS_NO_REFUND]: 'danger',
+  [REFUND_OUTER_STATUS_UNCONFIRMED_REFUND]: 'primary',
+  [REFUND_OUTER_STATUS_NOT_RECEIVED]: 'warning',
+  [REFUND_OUTER_STATUS_RECEIVED]: 'success',
+};
+
+
+// 工作流相关
+/**
+ * 售后退货外部流转
+ */
+export const RETURN_GOODS_OUTER_DELIVERY = 18;
+/**
+ * 售后换货外部流转
+ */
+export const EXCHANGE_GOODS_OUTER_DELIVERY = 20;
+/**
+ * 售后换货手工发货
+ */
+export const EXCHANGE_GOODS_MANUAL_DELIVERY = 30;
+/**
+ * 售后退货手工发货
+ */
+export const RETURN_GOODS_MANUAL_DELIVERY = 31;

src/pages/logistics/addLogistics/index.tsx

@@ -12,6 +12,11 @@ import { SelectGoodsColumns, ExternalListColumns, AfterSalesSelectGoodsColumns }
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
 import moment from 'moment';
 import ModalTableOrder from './components/ModalTableOrder';
+import StatusTag from '@/components/StatusTag';
+import {
+  EXCHANGE_OUTER_STATUS_TAG_MAP,
+  EXCHANGE_INNER_STATUS_BADGE_MAP,
+} from './constants';
 const { TabPane } = Tabs;
 const { Search } = Input;
 const { Option } = Select;
@@ -341,7 +346,7 @@ const AddLogistics: React.FC<{}> = () => {
       obj.companyId = option.value
       obj.companyName = option.children
       setmemberInfo({ memberId: option.memberid, roleId: option.roleid })
-    }else {
+    } else {
       obj.companyId = ''
       obj.companyName = ''
     }
@@ -748,14 +753,21 @@ const AddLogistics: React.FC<{}> = () => {
                 </Select>
               </Form.Item>
               <Form.Item label="单据时间" name='voucherTime'><span>{query.voucherTime && moment(query.voucherTime).format('YYYY-MM-DD  HH:mm:ss')} </span></Form.Item>
-              {createType !== 1 &&
+              {(createType === 2 || createType === 3 ) ?
                 <Form.Item label="外部状态" name='externalState'>
-                  {query.externalState === 1 ? <Badge status="warning" text='待提交' /> :
+                  {
+                    query.externalState === 1 ? <Badge status="warning" text='待提交' /> :
                     query.externalState === 2 ? <Badge status="processing" text='待确认' /> :
                     query.externalState === 3 ? <Badge status="error" text='不接收物流单' /> :
                     query.externalState === 4 ? <Badge status="success" text='接收物流单' /> : ''
                   }
                 </Form.Item>
+                :
+                (createType === 4 || createType === 5 || createType === 6) ?
+                <Form.Item label="外部状态" name='externalState'>
+                  {/* <StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} /> */}
+                </Form.Item>
+                : <></>
               }
             </Form>
           </TabPane>

src/pages/logistics/components/index.less

@@ -43,6 +43,7 @@
   margin-bottom   : 24px;
   padding         : 0 24px;
   box-sizing      : border-box;
+  border-radius: 8px;
 
   &-title {
     font-size  : 16px;

src/pages/logistics/components/orderSearchDetail.tsx

@@ -346,7 +346,7 @@ const detailInfo: React.FC<{}> = () => {
                         {item.title}
                       </div>
                       <div className={style['cols-main-options']}>
-                        <a>{item.value}</a>
+                        <div>{item.value}</div>
                       </div>
                     </div>
                   );

src/pages/logistics/list/addCompany.tsx

@@ -76,6 +76,7 @@ const company: React.FC<parmas> = (props) => {
   const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
   const [excludeList, setExcludeList] = useState<Array<any>>([])
   useEffect(() => {
+    console.log(pageStatus, 1008611)
     let _title = pageStatus === PageStatus.PREVIEW ? '查看' : id ? '编辑' : '新建'
     setHeaderTitle(`${_title}物流公司`)
     if (id) {
@@ -181,7 +182,7 @@ const company: React.FC<parmas> = (props) => {
   const fetchData = (params) => {
     if (visible) {
       return new Promise(resolve => {
-        PublicApi.postMemberManageLogisticsPage({ ...params, excludeList }).then(res => {
+        PublicApi.postMemberManageLogisticsPage({ ...params, excludeList }, {ctlType: 'none'}).then(res => {
           resolve(res.data)
         })
       })
@@ -279,7 +280,7 @@ const company: React.FC<parmas> = (props) => {
                     </Form.Item>
                   </Col>
                   {
-                    (pageStatus !== PageStatus.PREVIEW) &&
+                    (pageStatus !== 'PREVIEW') &&
                     <Col span={18}>
                       <Row>
                         <Col span={6}></Col>

src/pages/payandSettle/paySetting/index.tsx

@@ -98,27 +98,43 @@ const PayWaySetTemplate: React.FC<{}> = () => {
   const onHnadleSubmit = () => {
     let conditions = false;
     let wayName = '';
+    try {
       payItem.forEach(item => {
         if (item.id === 2 && item.isPitchOn === 1) {
-        if(item.payParametersAddListRequests.length > 0) {
+          console.log(1)
+          if (item.payParametersAddListRequests.length > 0) {
             conditions = true
           } else {
             conditions = false
-          wayName = item.way
-          return
+            wayName = `${item.way}缺少支付参数配置`
+            throw new Error
           }
         } else if (item.id === 1 && item.isPitchOn === 1) {
-        if(item.payParametersAddListRequests.length > 0 && item.payParametersList.length > 0) {
+          if (item.payParametersAddListRequests.length > 0 && item.payParametersList.length > 0) {
             conditions = true
           } else {
             conditions = false
-          wayName = item.way
-          return
+            wayName = `${item.way}缺少支付参数配置`
+            throw new Error
+          }
+        } else if (item.id === 6 && item.isPitchOn === 1) {
+          if (item.payParametersAddListRequests.length > 0) {
+            const data = item.payParametersAddListRequests[0]
+            if (data.code && data.value && data.describe) {
+              conditions = true
+            } else {
+              conditions = false
+              wayName = `请配置${item.way}的参数`
+              throw new Error
+            }
           }
         } else {
           conditions = true
         }
       })
+    } catch {
+      message.error(wayName)
+    }
     if (conditions) {
       PublicApi.postPayMemberQueryPlatformUpdate({
         platformPayWays: payItem
@@ -127,8 +143,6 @@ const PayWaySetTemplate: React.FC<{}> = () => {
           history.push('/memberCenter/payandSettle/paySetting/payParamsSetting')
         }
       })
-    } else {
-      message.error(`请新增${wayName}的支付参数配置`)
     }
   }