Commit 2a6d1e50 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix: 售后能力常量分离

parent 4d7a0681
This diff is collapsed.
This diff is collapsed.
......@@ -131,3 +131,29 @@ export const MEMBER_INNER_STATUS = {
[MEMBER_LEVEL_TYPE_MERCHANT]: '商户会员',
[MEMBER_LEVEL_TYPE_CHANNEL]: '渠道会员',
};
/* --------------------------------- 会员规则类型 -------------------------------- */
/**
* 交易
*/
export const VIP_RULE_TRANSACTION = 1;
/**
* 登录
*/
export const VIP_RULE_LOGIN = 2;
/**
* 评论
*/
export const VIP_RULE_COMMENT = 3;
/* --------------------------------- 会员角色类型 -------------------------------- */
/**
* 服务提供者
*/
export const MEMBER_ROLE_TYPE_SERVICE_PROVIDER = 1;
/**
* 服务消费者
*/
export const MEMBER_ROLE_TYPE_SERVICE_CONSUMER = 2;
......@@ -653,3 +653,124 @@ export enum DeliverySideState {
*/
CONFIRM_RETURN_ORDER
}
// 订单支付外部状态
export enum PayOutWorkState {
READY_PAY = 1,
READY_CONFIRM_RESULT,
CONFIRM_ACCOUNT,
CONFIRM_NOT_ACCOUNT
}
// 订单流转记录外部状态
export const OrderTransformOutWorkStateTexts = {
"-1": '取消订单',
0: '订单完成',
1: '待确认',
2: '待确认电子合同',
3: '待支付',
4: '待确认支付结果',
5: '待新增销售发货单',
6: '待新增物流单',
7: '待确认发货订单',
8: '待新增采购入库单',
9: '待确认收货订单',
10: '待确认收货订单',
11: '待确认回单',
12: '待归档',
13: '待归档',
14: '不接受订单',
15: '确认未到账',
16: '待新增采购入库单',
17: '手工确认发货',
}
// 采购订单流转记录内部状态
export const PurchaseOrderTransformInsideWorkStateTexts = {
"-1": '取消订单',
0: '订单完成',
1: '待提交审核',
2: '提交审核通过',
3: '审核通过(一级)',
4: '审核通过(二级)',
5: '审核通过',
6: '已确认电子合同',
7: '审核不通过(一级)',
8: '审核不通过(二级)',
9: '支付成功',
10: '支付失败',
11: '已审核采购入库单',
12: '已确认收货',
13: '订单归档完成',
14: '修改订单',
15: '手工收货'
}
// 销售订单流转记录内部状态
export const SaleOrderTransformInsideWorkStateTexts = {
"-1": '取消订单',
0: '完成订单',
1: '审核通过',
2: '审核通过(一级)',
3: '审核通过(二级)',
4: '接受订单',
5: '确认到账',
6: '已审核销售发货单',
7: '接受物流单',
8: '已确认发货',
9: '已确认回单',
10: '已归档',
11: '审核不通过(一级)',
12: '审核不通过(二级)',
13: '不接受订单',
14: '确认未到账',
15: '审核不通过',
16: '不接受物流单',
17: '审核不通过',
}
export const PayOutWorkStateTexts = {
1: '待支付',
2: '待确认支付结果',
3: '确认到账',
4: '确认未到账'
}
// 收货/发货内部状态文案
export const DeliverySideStateTexts = {
1: '新增销售发货单',
2: '待确认发货订单',
3: '待新增入库单', // 采购-新增入库单
4: '待确认收货订单',
5: '待回单订单',
6: '已回单',
}
// 询价外部状态
export const InquiryStateTexts = {
1: '待提交',
2: '待确认',
3: '接受报价',
4: '不接受报价',
}
......@@ -233,3 +233,49 @@ export const BILL_TRADE_OPERATION = {
[PAY_CHANNEL_CREDIT]: '授信',
[PAY_CHANNEL_COD]: '货到付款',
};
// 支付方式
/**
* 线上支付
*/
export const PAY_WAY_ONLINE = 1;
/**
* 线下支付
*/
export const PAY_WAY_OFFLINE = 2;
/**
* 授信支付
*/
export const PAY_WAY_CREDIT = 3;
/**
* 货到付款
*/
export const PAY_WAY_COD = 4;
/**
* 账期
*/
export const PAY_WAY_DEADLINE = 5;
/**
* 月结
*/
export const PAY_WAY_MONTH = 6;
/**
* 合同内清算
*/
export const PAY_WAY_CONTRACT = 7;
/**
* 支付方式对应中文
*/
export const PAYWAY = {
[PAY_WAY_ONLINE]: '线上支付',
[PAY_WAY_OFFLINE]: '线下支付',
[PAY_WAY_CREDIT]: '授信支付',
[PAY_WAY_COD]: '货到付款',
[PAY_WAY_DEADLINE]: '账期',
[PAY_WAY_MONTH]: '月结',
[PAY_WAY_CONTRACT]: '合同内清算',
};
import { ISchema } from '@formily/antd'
import { FORM_FILTER_PATH } from '@/formSchema/const'
import { OrderTypeMap, PurchaseOrderInsideWorkStateTexts, PurchaseOrderOutWorkStateTexts } from '@/constants'
import { OrderTypeMap, PurchaseOrderInsideWorkStateTexts, PurchaseOrderOutWorkStateTexts } from '@/constants/order'
export const orderTypeLabel = ['',
......
import React from 'react'
import { Tag } from 'antd'
import { PurchaseOrderInsideWorkStateTexts, PurchaseOrderOutWorkStateTexts, PurchaseOrderInsideWorkState, PurchaseOrderOutWorkState, SaleOrderInsideWorkState, SaleOrderInsideWorkStateTexts, PayOutWorkStateTexts, DeliverySideState, DeliverySideStateTexts, InquiryStateTexts, OrderTransformOutWorkStateTexts, PurchaseOrderTransformInsideWorkStateTexts, SaleOrderTransformInsideWorkStateTexts } from '@/constants'
import {
PurchaseOrderInsideWorkStateTexts,
PurchaseOrderOutWorkStateTexts,
PurchaseOrderInsideWorkState,
PurchaseOrderOutWorkState,
SaleOrderInsideWorkStateTexts,
PayOutWorkStateTexts,
DeliverySideStateTexts,
InquiryStateTexts,
OrderTransformOutWorkStateTexts,
PurchaseOrderTransformInsideWorkStateTexts,
SaleOrderTransformInsideWorkStateTexts
} from '@/constants/order'
export interface IStatusColor {
[key: string]: {
......
......@@ -5,7 +5,7 @@ import { formatTimeString } from '@/utils'
import { OrderDetailContext } from '../../_public/order/context'
import MellowCard from '@/components/MellowCard'
import NestTable from '@/components/NestTable'
import { SaleOrderInsideWorkState, DeliverySideState } from '@/constants'
import { DeliverySideState } from '@/constants/order'
import { PublicApi } from '@/services/api'
import { history } from 'umi'
......
......@@ -8,7 +8,7 @@ import OrderMergeInfo from '../../components/orderMergeInfo'
import OrderDeleveRecord from '../../components/orderDeleveRecord'
import OrderTransformRecord from '../../components/orderTransformRecord'
import OrderSaleRecord from '../orderSaleRecord'
import { ORDER_TYPE2_BIDDING_CONTRACT, ORDER_TYPE2_ENQUIRY_CONTRACT, ORDER_TYPE2_TENDER_CONTRACT } from '@/constants'
import { ORDER_TYPE2_BIDDING_CONTRACT, ORDER_TYPE2_ENQUIRY_CONTRACT, ORDER_TYPE2_TENDER_CONTRACT } from '@/constants/order'
export interface OrderDetailSectionProps {
formContext: any,
......
......@@ -3,11 +3,10 @@ import { Row, Col, Tag, Modal } from 'antd'
import MellowCard from '@/components/MellowCard'
import { OrderDetailContext } from '../../_public/order/context'
import { formatTimeString } from '@/utils'
import { DELIVERY_TYPE } from '@/constants'
import { DELIVERY_TYPE } from '@/constants/order'
import style from './index.less'
import ContractList from '../ContractList'
import cx from 'classnames'
import { PublicApi } from '@/services/api'
export interface OrderMergeInfoProps { }
const payInfo = [
......
import React, { useState, useEffect, useContext, useRef } from 'react'
import { Modal, List, Avatar, Button, Space } from 'antd'
import { Modal, List, Button, Space } from 'antd'
import { usePageStatus } from '@/hooks/usePageStatus'
import { OrderDetailContext } from '../../_public/order/context'
import { PayOutWorkState } from '@/constants'
import { PayOutWorkState } from '@/constants/order'
import { PublicApi } from '@/services/api'
import { history, Link } from 'umi'
import { history } from 'umi'
import OverflowText from '@/components/OverflowText'
import { useHttpRequest } from '@/hooks/useHttpRequest'
import ImagePreview from '@/components/ImagePreview'
......
......@@ -5,7 +5,7 @@ import { OrderDetailContext } from '../../_public/order/context'
import MellowCard from '@/components/MellowCard'
import StatusColors from '../StatusColors'
import moment from 'moment'
import { PayOutWorkState } from '@/constants'
import { PayOutWorkState } from '@/constants/order'
import OverflowText from '@/components/OverflowText'
import { QuestionCircleOutlined } from '@ant-design/icons'
......
import React, { useContext, useState, useRef, useEffect } from 'react'
import { StandardTable } from 'god'
import { Card, Table, Form, Input, Row, Col, Button, Modal } from 'antd'
import { Table, Form, Input, Row, Col } from 'antd'
import { OrderDetailContext } from '../../_public/order/context'
import { EditOutlined, SettingOutlined } from '@ant-design/icons'
import style from './index.less'
import { EditOutlined } from '@ant-design/icons'
import { PublicApi } from '@/services/api'
import styled from 'styled-components'
import ModalForm from '@/components/ModalForm'
import { createFormActions } from '@formily/antd'
import MellowCard from '@/components/MellowCard'
import { AddressPop } from '../../purchaseOrder/orderCollect/components/productModalTable'
import { DELIVERY_TYPE, OrderModalType } from '@/constants'
import { DELIVERY_TYPE, OrderModalType } from '@/constants/order'
export interface OrderProductTableProps {
editable: boolean
......
import React, { useCallback, useContext, useEffect, useRef, useState } from 'react'
import React, { useCallback, useContext, useRef, useState } from 'react'
import { Tabs, Table, Button, Space,Modal } from 'antd'
import StatusColors from '@/pages/transaction/components/StatusColors'
import { formatTimeString } from '@/utils'
import { OrderDetailContext } from '../../_public/order/context'
import MellowCard from '@/components/MellowCard'
import NestTable from '@/components/NestTable'
import { DeliverySideState } from '@/constants'
import { DeliverySideState } from '@/constants/order'
import { PublicApi } from '@/services/api'
import { history } from 'umi'
import { ExclamationCircleOutlined } from '@ant-design/icons'
......
import React, { useContext, useState, useRef, useEffect, useCallback } from 'react'
import { Card, Table, Form, Input, Row, Col, Button, Modal } from 'antd'
import { Table, Form, Input, Row, Col, Button } from 'antd'
import { OrderDetailContext } from '../../_public/order/context'
import { EditOutlined, SettingOutlined } from '@ant-design/icons'
import style from './index.less'
import { PublicApi } from '@/services/api'
import styled from 'styled-components'
import ModalForm from '@/components/ModalForm'
import { createFormActions } from '@formily/antd'
import MellowCard from '@/components/MellowCard'
import { SALE_ORDER_STATUS } from '../../_public/order/constant'
import { usePageStatus } from '@/hooks/usePageStatus'
import ModalTable from '@/components/ModalTable'
import { formatTimeString } from '@/utils'
import { AddressPop } from '../../purchaseOrder/orderCollect/components/productModalTable'
import { DELIVERY_TYPE, OrderModalType, ORDER_TYPE2_BIDDING_CONTRACT, ORDER_TYPE2_ENQUIRY_CONTRACT, ORDER_TYPE2_TENDER_CONTRACT, SaleOrderInsideWorkStateTexts } from '@/constants'
import {
DELIVERY_TYPE,
OrderModalType,
ORDER_TYPE2_BIDDING_CONTRACT,
ORDER_TYPE2_ENQUIRY_CONTRACT,
ORDER_TYPE2_TENDER_CONTRACT,
SaleOrderInsideWorkStateTexts
} from '@/constants/order'
export interface OrderProductTableProps {}
......
import React from 'react'
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { GlobalConfig } from '@/global/config';
import { PublicApi } from '@/services/api';
import { SHOP_TYPES } from '@/constants';
import { padRequiredMessage } from '@/utils';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment