Commit 1414f7f8 authored by XieZhiXiong's avatar XieZhiXiong

fix: 添加 合同订单手工发货相关 判断

parent 29fab658
......@@ -306,11 +306,11 @@ export const REFUND_OUTER_STATUS_TAG_MAP = {
// 工作流相关
/**
* 售后退货外部流转
* 售后退货默认流程
*/
export const RETURN_GOODS_OUTER_DELIVERY = 18;
/**
* 售后换货外部流转
* 售后换货默认流程
*/
export const EXCHANGE_GOODS_OUTER_DELIVERY = 20;
/**
......@@ -320,4 +320,20 @@ export const EXCHANGE_GOODS_MANUAL_DELIVERY = 30;
/**
* 售后退货手工发货
*/
export const RETURN_GOODS_MANUAL_DELIVERY = 31;
\ No newline at end of file
export const RETURN_GOODS_MANUAL_DELIVERY = 31;
/**
* 售后退货默认流程-合同订单
*/
export const RETURN_GOODS_OUTER_DELIVERY_CONTRACT = 43;
/**
* 售后退货手工发货-合同订单
*/
export const RETURN_GOODS_MANUAL_DELIVERY_CONTRACT = 44;
/**
* 售后换货默认流程-合同订单
*/
export const EXCHANGE_GOODS_OUTER_DELIVERY_CONTRACT = 45;
/**
* 售后换货手工发货-合同订单
*/
export const EXCHANGE_GOODS_MANUAL_DELIVERY_CONTRACT = 46;
\ No newline at end of file
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-01-06 11:36:34
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-02-20 17:18:35
* @LastEditTime: 2021-06-07 17:08:04
* @Description:
*/
import React, { useState } from 'react';
......@@ -11,12 +11,12 @@ import { history } from 'umi';
import { PublicApi } from '@/services/api';
import { SettingOutlined } from '@ant-design/icons';
import { usePageStatus } from '@/hooks/usePageStatus';
import { EXCHANGE_GOODS_MANUAL_DELIVERY } from '../../constants';
import { EXCHANGE_GOODS_MANUAL_DELIVERY, EXCHANGE_GOODS_MANUAL_DELIVERY_CONTRACT } from '../../constants';
import ManualDeliveryModal from '../../components/ManualDeliveryModal';
import DetailInfo from '../components/DetailInfo';
const ExchangePrDeliverVerify: React.FC = () => {
const { id, creditId } = usePageStatus();
const { id } = usePageStatus();
const [modalVisible, setModalVisible] = useState(false);
const [submitLoading, setSubmitLoading] = useState(false);
......@@ -47,7 +47,7 @@ const ExchangePrDeliverVerify: React.FC = () => {
id={id}
headExtra={info => (
<>
{(info && info.taskType === EXCHANGE_GOODS_MANUAL_DELIVERY) && (
{(info && (info.taskType === EXCHANGE_GOODS_MANUAL_DELIVERY || info.taskType === EXCHANGE_GOODS_MANUAL_DELIVERY_CONTRACT)) && (
<Button
type="default"
icon={<SettingOutlined />}
......
......@@ -11,12 +11,12 @@ import { history } from 'umi';
import { PublicApi } from '@/services/api';
import { SettingOutlined } from '@ant-design/icons';
import { usePageStatus } from '@/hooks/usePageStatus';
import { EXCHANGE_GOODS_MANUAL_DELIVERY } from '../../constants';
import { EXCHANGE_GOODS_MANUAL_DELIVERY, EXCHANGE_GOODS_MANUAL_DELIVERY_CONTRACT } from '../../constants';
import ManualDeliveryModal from '../../components/ManualDeliveryModal';
import DetailInfo from '../components/DetailInfo';
const ExchangePrReceivedVerify: React.FC = () => {
const { id, creditId } = usePageStatus();
const { id } = usePageStatus();
const [modalVisible, setModalVisible] = useState(false);
const [submitLoading, setSubmitLoading] = useState(false);
......@@ -51,7 +51,7 @@ const ExchangePrReceivedVerify: React.FC = () => {
return (
<>
{(info && info.taskType === EXCHANGE_GOODS_MANUAL_DELIVERY) && (
{(info && (info.taskType === EXCHANGE_GOODS_MANUAL_DELIVERY || info.taskType === EXCHANGE_GOODS_MANUAL_DELIVERY_CONTRACT)) && (
<>
<Button
type="default"
......
......@@ -4,12 +4,12 @@ import { history } from 'umi';
import { PublicApi } from '@/services/api';
import { SettingOutlined } from '@ant-design/icons';
import { usePageStatus } from '@/hooks/usePageStatus';
import { EXCHANGE_GOODS_MANUAL_DELIVERY } from '../../constants';
import { EXCHANGE_GOODS_MANUAL_DELIVERY, EXCHANGE_GOODS_MANUAL_DELIVERY_CONTRACT } from '../../constants';
import ManualDeliveryModal from '../../components/ManualDeliveryModal';
import DetailInfo from '../components/DetailInfo';
const ExchangePrDeliverVerify: React.FC = () => {
const { id, creditId } = usePageStatus();
const { id } = usePageStatus();
const [modalVisible, setModalVisible] = useState(false);
const [submitLoading, setSubmitLoading] = useState(false);
......@@ -40,7 +40,7 @@ const ExchangePrDeliverVerify: React.FC = () => {
id={id}
headExtra={info => (
<>
{(info && info.taskType === EXCHANGE_GOODS_MANUAL_DELIVERY) && (
{(info && (info.taskType === EXCHANGE_GOODS_MANUAL_DELIVERY || info.taskType === EXCHANGE_GOODS_MANUAL_DELIVERY_CONTRACT)) && (
<Button
type="default"
icon={<SettingOutlined />}
......
......@@ -11,12 +11,12 @@ import { history } from 'umi';
import { PublicApi } from '@/services/api';
import { SettingOutlined } from '@ant-design/icons';
import { usePageStatus } from '@/hooks/usePageStatus';
import { EXCHANGE_GOODS_MANUAL_DELIVERY } from '../../constants';
import { EXCHANGE_GOODS_MANUAL_DELIVERY, EXCHANGE_GOODS_MANUAL_DELIVERY_CONTRACT } from '../../constants';
import ManualDeliveryModal from '../../components/ManualDeliveryModal';
import DetailInfo from '../components/DetailInfo';
const ExchangePrReceivedVerify: React.FC = () => {
const { id, creditId } = usePageStatus();
const { id } = usePageStatus();
const [modalVisible, setModalVisible] = useState(false);
const [submitLoading, setSubmitLoading] = useState(false);
......@@ -51,7 +51,7 @@ const ExchangePrReceivedVerify: React.FC = () => {
return (
<>
{(info && info.taskType === EXCHANGE_GOODS_MANUAL_DELIVERY) && (
{(info && (info.taskType === EXCHANGE_GOODS_MANUAL_DELIVERY || info.taskType === EXCHANGE_GOODS_MANUAL_DELIVERY_CONTRACT)) && (
<>
<Button
type="default"
......
......@@ -4,7 +4,7 @@ import { history } from 'umi';
import { PublicApi } from '@/services/api';
import { SettingOutlined } from '@ant-design/icons';
import { usePageStatus } from '@/hooks/usePageStatus';
import { RETURN_GOODS_MANUAL_DELIVERY } from '../../constants';
import { RETURN_GOODS_MANUAL_DELIVERY, RETURN_GOODS_MANUAL_DELIVERY_CONTRACT } from '../../constants';
import ManualDeliveryModal from '../../components/ManualDeliveryModal';
import DetailInfo from '../components/DetailInfo';
......@@ -40,7 +40,7 @@ const ReturnPrDeliverVerify: React.FC = () => {
id={id}
headExtra={info => (
<>
{(info && info.taskType === RETURN_GOODS_MANUAL_DELIVERY) && (
{(info && (info.taskType === RETURN_GOODS_MANUAL_DELIVERY || info.taskType === RETURN_GOODS_MANUAL_DELIVERY_CONTRACT)) && (
<Button
type="default"
icon={<SettingOutlined />}
......
......@@ -8,16 +8,15 @@
import React, { useState } from 'react';
import { Button } from 'antd';
import { history } from 'umi';
import moment from 'moment';
import { PublicApi } from '@/services/api';
import { SettingOutlined } from '@ant-design/icons';
import { usePageStatus } from '@/hooks/usePageStatus';
import { RETURN_GOODS_MANUAL_DELIVERY } from '../../constants';
import { RETURN_GOODS_MANUAL_DELIVERY, RETURN_GOODS_MANUAL_DELIVERY_CONTRACT } from '../../constants';
import ManualDeliveryModal from '../../components/ManualDeliveryModal';
import DetailInfo from '../components/DetailInfo';
const ReturnPrReceivedVerify: React.FC = () => {
const { id, creditId } = usePageStatus();
const { id } = usePageStatus();
const [modalVisible, setModalVisible] = useState(false);
const [submitLoading, setSubmitLoading] = useState(false);
......@@ -52,7 +51,7 @@ const ReturnPrReceivedVerify: React.FC = () => {
return (
<>
{(info && info.taskType === RETURN_GOODS_MANUAL_DELIVERY) && (
{(info && (info.taskType === RETURN_GOODS_MANUAL_DELIVERY || info.taskType === RETURN_GOODS_MANUAL_DELIVERY_CONTRACT)) && (
<>
<Button
type="default"
......
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