Commit 7035053e authored by XieZhiXiong's avatar XieZhiXiong

feat: 抽离判断是否是合同订单的方法

parent 3a525ab7
...@@ -28,8 +28,6 @@ import { ...@@ -28,8 +28,6 @@ import {
EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIPT, EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIPT,
} from '@/constants/afterService'; } from '@/constants/afterService';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT, ORDER_TYPE_TENDER_CONTRACT,
} from '@/constants/order'; } from '@/constants/order';
import { import {
...@@ -37,6 +35,7 @@ import { ...@@ -37,6 +35,7 @@ import {
MAIL_INNER_STATUS_CONFIRMED_RECEIVING, MAIL_INNER_STATUS_CONFIRMED_RECEIVING,
MAIL_INNER_STATUS_CONFIRMED_DELIVER, MAIL_INNER_STATUS_CONFIRMED_DELIVER,
} from '../../constants'; } from '../../constants';
import { isMaterialOrder } from '../../utils';
import ReturnDeliverDrawer, { AfterType } from '../DeliverDrawer'; import ReturnDeliverDrawer, { AfterType } from '../DeliverDrawer';
import styles from './index.less'; import styles from './index.less';
...@@ -125,11 +124,7 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({ ...@@ -125,11 +124,7 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({
const [submitLoading, setSubmitLoading] = useState(false); const [submitLoading, setSubmitLoading] = useState(false);
const [currentDetailed, setCurrentDetailed] = useState<Detailed | null>(null); const [currentDetailed, setCurrentDetailed] = useState<Detailed | null>(null);
const isMateriel = ( const isMateriel = isMaterialOrder(orderType);
orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| orderType === ORDER_TYPE_BIDDING_CONTRACT
|| orderType === ORDER_TYPE_TENDER_CONTRACT
);
const commonColumns: EditableColumns[] = [ const commonColumns: EditableColumns[] = [
...( ...(
......
...@@ -30,8 +30,6 @@ import { ...@@ -30,8 +30,6 @@ import {
EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT, EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT,
} from '@/constants/afterService'; } from '@/constants/afterService';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT, ORDER_TYPE_TENDER_CONTRACT,
} from '@/constants/order'; } from '@/constants/order';
import { import {
...@@ -39,6 +37,7 @@ import { ...@@ -39,6 +37,7 @@ import {
MAIL_INNER_STATUS_CONFIRMED_DELIVER, MAIL_INNER_STATUS_CONFIRMED_DELIVER,
MAIL_INNER_STATUS_CONFIRMED_RECEIVING, MAIL_INNER_STATUS_CONFIRMED_RECEIVING,
} from '../../constants'; } from '../../constants';
import { isMaterialOrder } from '../../utils';
import ReturnDeliverDrawer, { AfterType } from '../DeliverDrawer'; import ReturnDeliverDrawer, { AfterType } from '../DeliverDrawer';
import styles from './index.less'; import styles from './index.less';
...@@ -127,11 +126,7 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({ ...@@ -127,11 +126,7 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({
const [submitLoading, setSubmitLoading] = useState(false); const [submitLoading, setSubmitLoading] = useState(false);
const [currentDetailed, setCurrentDetailed] = useState<Detailed | null>(null); const [currentDetailed, setCurrentDetailed] = useState<Detailed | null>(null);
const isMateriel = ( const isMateriel = isMaterialOrder(orderType);
orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| orderType === ORDER_TYPE_BIDDING_CONTRACT
|| orderType === ORDER_TYPE_TENDER_CONTRACT
);
const commonColumns: EditableColumns[] = [ const commonColumns: EditableColumns[] = [
...( ...(
......
...@@ -30,8 +30,6 @@ import { ...@@ -30,8 +30,6 @@ import {
RETURN_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT, RETURN_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT,
} from '@/constants/afterService'; } from '@/constants/afterService';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT, ORDER_TYPE_TENDER_CONTRACT,
} from '@/constants/order'; } from '@/constants/order';
import { import {
...@@ -39,6 +37,7 @@ import { ...@@ -39,6 +37,7 @@ import {
MAIL_INNER_STATUS_CONFIRMED_DELIVER, MAIL_INNER_STATUS_CONFIRMED_DELIVER,
MAIL_INNER_STATUS_CONFIRMED_RECEIVING, MAIL_INNER_STATUS_CONFIRMED_RECEIVING,
} from '../../constants'; } from '../../constants';
import { isMaterialOrder } from '../../utils';
import ReturnDeliverDrawer, { AfterType } from '../DeliverDrawer'; import ReturnDeliverDrawer, { AfterType } from '../DeliverDrawer';
import styles from './index.less'; import styles from './index.less';
...@@ -127,11 +126,7 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({ ...@@ -127,11 +126,7 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
const [submitLoading, setSubmitLoading] = useState(false); const [submitLoading, setSubmitLoading] = useState(false);
const [currentDetailed, setCurrentDetailed] = useState<Detailed | null>(null); const [currentDetailed, setCurrentDetailed] = useState<Detailed | null>(null);
const isMateriel = ( const isMateriel = isMaterialOrder(orderType);
orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| orderType === ORDER_TYPE_BIDDING_CONTRACT
|| orderType === ORDER_TYPE_TENDER_CONTRACT
);
const commonColumns: EditableColumns[] = [ const commonColumns: EditableColumns[] = [
...( ...(
......
...@@ -7,11 +7,7 @@ ...@@ -7,11 +7,7 @@
*/ */
import BigNumber from 'bignumber.js'; import BigNumber from 'bignumber.js';
import { FormEffectHooks } from '@formily/antd'; import { FormEffectHooks } from '@formily/antd';
import { import { isMaterialOrder } from '../../../utils';
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT,
} from '@/constants/order';
const { const {
onFieldInputChange$, onFieldInputChange$,
...@@ -39,11 +35,7 @@ export const useBusinessEffects = (context, actions) => { ...@@ -39,11 +35,7 @@ export const useBusinessEffects = (context, actions) => {
const orderTypeValue = await getFieldValue('orderType'); const orderTypeValue = await getFieldValue('orderType');
const payListValue = await getFieldValue('payList') || []; const payListValue = await getFieldValue('payList') || [];
const isMateriel = ( const isMateriel = isMaterialOrder(orderTypeValue);
orderTypeValue === ORDER_TYPE_INQUIRY_CONTRACT
|| orderTypeValue === ORDER_TYPE_BIDDING_CONTRACT
|| orderTypeValue === ORDER_TYPE_TENDER_CONTRACT
);
if (!isMateriel) { if (!isMateriel) {
const newData = [...payListValue].map(item => { const newData = [...payListValue].map(item => {
......
...@@ -11,14 +11,10 @@ import NiceForm from '@/components/NiceForm'; ...@@ -11,14 +11,10 @@ import NiceForm from '@/components/NiceForm';
import { createAsyncFormActions, FormEffectHooks } from '@formily/antd'; import { createAsyncFormActions, FormEffectHooks } from '@formily/antd';
import BigNumber from 'bignumber.js'; import BigNumber from 'bignumber.js';
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT,
} from '@/constants/order';
import schema from './schema'; import schema from './schema';
import { createEffects } from './effects'; import { createEffects } from './effects';
import Stamp from '../Stamp'; import Stamp from '../Stamp';
import { isMaterialOrder } from '../../utils';
import SteamerTicket from './components/SteamerTicket'; import SteamerTicket from './components/SteamerTicket';
const schemaAction = createAsyncFormActions(); const schemaAction = createAsyncFormActions();
...@@ -186,11 +182,7 @@ const ReturnInfoDrawer: React.FC<ReturnInfoDrawerProps> = ({ ...@@ -186,11 +182,7 @@ const ReturnInfoDrawer: React.FC<ReturnInfoDrawerProps> = ({
if (!applyInfo || !applyInfo.orderId) { if (!applyInfo || !applyInfo.orderId) {
return; return;
} }
const isMateriel = ( const isMateriel = isMaterialOrder(applyInfo.orderType);
applyInfo.orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| applyInfo.orderType === ORDER_TYPE_BIDDING_CONTRACT
|| applyInfo.orderType === ORDER_TYPE_TENDER_CONTRACT
);
if (isMateriel) { if (isMateriel) {
schemaAction.setFieldState('productName', state => { schemaAction.setFieldState('productName', state => {
state.title = '物料名称'; state.title = '物料名称';
......
...@@ -21,8 +21,6 @@ import { ...@@ -21,8 +21,6 @@ import {
ORDER_TYPE2_CHANNEL_POINTS, ORDER_TYPE2_CHANNEL_POINTS,
} from '@/constants/order'; } from '@/constants/order';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT, ORDER_TYPE_TENDER_CONTRACT,
ORDER_TYPE, ORDER_TYPE,
} from '@/constants/order'; } from '@/constants/order';
...@@ -36,6 +34,7 @@ import { ...@@ -36,6 +34,7 @@ import {
EXCHANGE_OUTER_STATUS_TAG_MAP, EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP, EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../../constants'; } from '../../../constants';
import { isMaterialOrder } from '../../../utils';
const ProductList = React.lazy(() => import('../../../components/ProductList')); const ProductList = React.lazy(() => import('../../../components/ProductList'));
const ExchangeReceivedInfo = React.lazy(() => import('../../../components/ExchangeReceivedInfo')); const ExchangeReceivedInfo = React.lazy(() => import('../../../components/ExchangeReceivedInfo'));
...@@ -90,11 +89,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -90,11 +89,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
const [infoLoading, setInfoloading] = useState(false); const [infoLoading, setInfoloading] = useState(false);
const isPointsOrder = detailInfo?.orderType === ORDER_TYPE2_POINTS || detailInfo?.orderType === ORDER_TYPE2_CHANNEL_POINTS; const isPointsOrder = detailInfo?.orderType === ORDER_TYPE2_POINTS || detailInfo?.orderType === ORDER_TYPE2_CHANNEL_POINTS;
const isMateriel = ( const isMateriel = isMaterialOrder(detailInfo?.orderType);
detailInfo?.orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| detailInfo?.orderType === ORDER_TYPE_BIDDING_CONTRACT
|| detailInfo?.orderType === ORDER_TYPE_TENDER_CONTRACT
);
const productColumns: EditableColumns[] = [ const productColumns: EditableColumns[] = [
{ {
......
...@@ -12,10 +12,6 @@ import { PublicApi } from '@/services/api'; ...@@ -12,10 +12,6 @@ import { PublicApi } from '@/services/api';
import { GetAsReplaceGoodsPageReturnedGoodsResponseDetail } from '@/services/AfterServiceV2Api'; import { GetAsReplaceGoodsPageReturnedGoodsResponseDetail } from '@/services/AfterServiceV2Api';
import { normalizeFiledata, FileData } from '@/utils'; import { normalizeFiledata, FileData } from '@/utils';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT,
ORDER_TYPE2,
ORDER_TYPE2_POINTS, ORDER_TYPE2_POINTS,
ORDER_TYPE2_CHANNEL_POINTS, ORDER_TYPE2_CHANNEL_POINTS,
} from '@/constants/order'; } from '@/constants/order';
...@@ -31,6 +27,7 @@ import { ...@@ -31,6 +27,7 @@ import {
EXCHANGE_OUTER_STATUS_TAG_MAP, EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP, EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../../../constants'; } from '../../../../constants';
import { isMaterialOrder } from '../../../../utils';
const addSchemaAction = createFormActions(); const addSchemaAction = createFormActions();
const { const {
...@@ -194,11 +191,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({ ...@@ -194,11 +191,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
const [orderTypeValue, setOrderTypeValue] = useState(0); const [orderTypeValue, setOrderTypeValue] = useState(0);
const isPointsOrder = orderTypeValue === ORDER_TYPE2_POINTS || orderTypeValue === ORDER_TYPE2_CHANNEL_POINTS; const isPointsOrder = orderTypeValue === ORDER_TYPE2_POINTS || orderTypeValue === ORDER_TYPE2_CHANNEL_POINTS;
const isMateriel = ( const isMateriel = isMaterialOrder(orderTypeValue);
orderTypeValue === ORDER_TYPE_INQUIRY_CONTRACT
|| orderTypeValue === ORDER_TYPE_BIDDING_CONTRACT
|| orderTypeValue === ORDER_TYPE_TENDER_CONTRACT
);
const tableColumn: ColumnType<any>[] = [ const tableColumn: ColumnType<any>[] = [
{ {
......
...@@ -11,12 +11,11 @@ import { ...@@ -11,12 +11,11 @@ import {
DELIVERY_TYPE_ENUM, DELIVERY_TYPE_ENUM,
} from '@/constants/afterService'; } from '@/constants/afterService';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT, ORDER_TYPE_TENDER_CONTRACT,
ORDER_TYPE2_POINTS, ORDER_TYPE2_POINTS,
ORDER_TYPE2_CHANNEL_POINTS, ORDER_TYPE2_CHANNEL_POINTS,
} from '@/constants/order'; } from '@/constants/order';
import { isMaterialOrder } from '../../../../../utils';
// 供应会员列表列 // 供应会员列表列
const supplierColumns = [ const supplierColumns = [
...@@ -88,11 +87,7 @@ const orderTypeArr = GlobalConfig.web.orderType.map((item) => ({ ...@@ -88,11 +87,7 @@ const orderTypeArr = GlobalConfig.web.orderType.map((item) => ({
export const addSchema = (orderType: number): ISchema => { export const addSchema = (orderType: number): ISchema => {
const isPoints = orderType === ORDER_TYPE2_POINTS || orderType === ORDER_TYPE2_CHANNEL_POINTS; const isPoints = orderType === ORDER_TYPE2_POINTS || orderType === ORDER_TYPE2_CHANNEL_POINTS;
const isMateriel = ( const isMateriel = isMaterialOrder(orderType);
orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| orderType === ORDER_TYPE_BIDDING_CONTRACT
|| orderType === ORDER_TYPE_TENDER_CONTRACT
);
return { return {
type: 'object', type: 'object',
properties: { properties: {
......
...@@ -19,8 +19,6 @@ import { ...@@ -19,8 +19,6 @@ import {
EXCHANGE_INNER_STATUS_UNCOMMITTED, EXCHANGE_INNER_STATUS_UNCOMMITTED,
} from '@/constants/afterService'; } from '@/constants/afterService';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT, ORDER_TYPE_TENDER_CONTRACT,
ORDER_TYPE2_POINTS, ORDER_TYPE2_POINTS,
ORDER_TYPE2_CHANNEL_POINTS, ORDER_TYPE2_CHANNEL_POINTS,
...@@ -38,6 +36,7 @@ import { ...@@ -38,6 +36,7 @@ import {
EXCHANGE_OUTER_STATUS_TAG_MAP, EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP, EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../../constants'; } from '../../../constants';
import { isMaterialOrder } from '../../../utils';
const ProductList = React.lazy(() => import('../../../components/ProductList')); const ProductList = React.lazy(() => import('../../../components/ProductList'));
const ExchangeReceivedInfo = React.lazy(() => import('../../../components/ExchangeReceivedInfo')); const ExchangeReceivedInfo = React.lazy(() => import('../../../components/ExchangeReceivedInfo'));
...@@ -99,11 +98,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -99,11 +98,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
const [returnAddress, setReturnAddress] = useState<ReturnAddressValues>(null); const [returnAddress, setReturnAddress] = useState<ReturnAddressValues>(null);
const isPointsOrder = detailInfo?.orderType === ORDER_TYPE2_POINTS || detailInfo?.orderType === ORDER_TYPE2_CHANNEL_POINTS; const isPointsOrder = detailInfo?.orderType === ORDER_TYPE2_POINTS || detailInfo?.orderType === ORDER_TYPE2_CHANNEL_POINTS;
const isMateriel = ( const isMateriel = isMaterialOrder(detailInfo?.orderType);
detailInfo?.orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| detailInfo?.orderType === ORDER_TYPE_BIDDING_CONTRACT
|| detailInfo?.orderType === ORDER_TYPE_TENDER_CONTRACT
);
// 获取换货申请详情 // 获取换货申请详情
const getDetailInfo = () => { const getDetailInfo = () => {
......
...@@ -13,8 +13,6 @@ import StatusTag from '@/components/StatusTag'; ...@@ -13,8 +13,6 @@ import StatusTag from '@/components/StatusTag';
import { EditableColumns } from '@/components/PolymericTable/interface'; import { EditableColumns } from '@/components/PolymericTable/interface';
import { REPAIR_OUTER_STATUS_FINISHED } from '@/constants/afterService'; import { REPAIR_OUTER_STATUS_FINISHED } from '@/constants/afterService';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT, ORDER_TYPE_TENDER_CONTRACT,
ORDER_TYPE, ORDER_TYPE,
} from '@/constants/order'; } from '@/constants/order';
...@@ -22,6 +20,7 @@ import { ...@@ -22,6 +20,7 @@ import {
REPAIR_OUTER_STATUS_TAG_MAP, REPAIR_OUTER_STATUS_TAG_MAP,
REPAIR_INNER_STATUS_BADGE_MAP, REPAIR_INNER_STATUS_BADGE_MAP,
} from '../../../constants'; } from '../../../constants';
import { isMaterialOrder } from '../../../utils';
const OuterCirculation = React.lazy(() => import('../../../components/OuterCirculation')); const OuterCirculation = React.lazy(() => import('../../../components/OuterCirculation'));
const ProductList = React.lazy(() => import('../../../components/ProductList')); const ProductList = React.lazy(() => import('../../../components/ProductList'));
...@@ -64,11 +63,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -64,11 +63,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
const [infoLoading, setInfoLoading] = useState(false); const [infoLoading, setInfoLoading] = useState(false);
const [repairGoodsLoading, setRepairGoodsLoading] = useState(false); const [repairGoodsLoading, setRepairGoodsLoading] = useState(false);
const isMateriel = ( const isMateriel = isMaterialOrder(detailInfo?.orderType);
detailInfo?.orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| detailInfo?.orderType === ORDER_TYPE_BIDDING_CONTRACT
|| detailInfo?.orderType === ORDER_TYPE_TENDER_CONTRACT
);
const productColumns: EditableColumns[] = [ const productColumns: EditableColumns[] = [
{ {
......
...@@ -30,6 +30,7 @@ import { ...@@ -30,6 +30,7 @@ import {
REPAIR_OUTER_STATUS_TAG_MAP, REPAIR_OUTER_STATUS_TAG_MAP,
REPAIR_INNER_STATUS_BADGE_MAP, REPAIR_INNER_STATUS_BADGE_MAP,
} from '../../../../constants'; } from '../../../../constants';
import { isMaterialOrder } from '../../../../utils';
const addSchemaAction = createFormActions(); const addSchemaAction = createFormActions();
const { const {
...@@ -123,11 +124,7 @@ const RepairForm: React.FC<BillsFormProps> = ({ ...@@ -123,11 +124,7 @@ const RepairForm: React.FC<BillsFormProps> = ({
const [visibleDrawer, setVisibleDrawer] = useState(false); const [visibleDrawer, setVisibleDrawer] = useState(false);
const [orderTypeValue, setOrderTypeValue] = useState(0); const [orderTypeValue, setOrderTypeValue] = useState(0);
const isMateriel = ( const isMateriel = isMaterialOrder(orderTypeValue);
orderTypeValue === ORDER_TYPE_INQUIRY_CONTRACT
|| orderTypeValue === ORDER_TYPE_BIDDING_CONTRACT
|| orderTypeValue === ORDER_TYPE_TENDER_CONTRACT
);
const tableColumn: ColumnType<any>[] = [ const tableColumn: ColumnType<any>[] = [
{ {
......
...@@ -6,12 +6,11 @@ import { UPLOAD_TYPE } from '@/constants'; ...@@ -6,12 +6,11 @@ import { UPLOAD_TYPE } from '@/constants';
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import { GlobalConfig } from '@/global/config'; import { GlobalConfig } from '@/global/config';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT, ORDER_TYPE_TENDER_CONTRACT,
ORDER_TYPE_POINTS, ORDER_TYPE_POINTS,
ORDER_TYPE_CHANNEL_POINTS, ORDER_TYPE_CHANNEL_POINTS,
} from '@/constants/order'; } from '@/constants/order';
import { isMaterialOrder } from '../../../../../utils';
// 供应会员列表列 // 供应会员列表列
const supplierColumns = [ const supplierColumns = [
...@@ -82,11 +81,7 @@ const orderTypeArr = GlobalConfig.web.orderType.map((item) => ({ ...@@ -82,11 +81,7 @@ const orderTypeArr = GlobalConfig.web.orderType.map((item) => ({
})).filter((item) => (item.value !== ORDER_TYPE_POINTS && item.value !== ORDER_TYPE_CHANNEL_POINTS)); })).filter((item) => (item.value !== ORDER_TYPE_POINTS && item.value !== ORDER_TYPE_CHANNEL_POINTS));
export const addSchema = (orderType: number): ISchema => { export const addSchema = (orderType: number): ISchema => {
const isMateriel = ( const isMateriel = isMaterialOrder(orderType);
orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| orderType === ORDER_TYPE_BIDDING_CONTRACT
|| orderType === ORDER_TYPE_TENDER_CONTRACT
);
return { return {
type: 'object', type: 'object',
properties: { properties: {
......
...@@ -14,8 +14,6 @@ import AuditProcess from '@/components/AuditProcess'; ...@@ -14,8 +14,6 @@ import AuditProcess from '@/components/AuditProcess';
import { EditableColumns } from '@/components/PolymericTable/interface'; import { EditableColumns } from '@/components/PolymericTable/interface';
import { REPAIR_OUTER_STATUS_FINISHED } from '@/constants/afterService'; import { REPAIR_OUTER_STATUS_FINISHED } from '@/constants/afterService';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT, ORDER_TYPE_TENDER_CONTRACT,
ORDER_TYPE, ORDER_TYPE,
} from '@/constants/order'; } from '@/constants/order';
...@@ -23,6 +21,7 @@ import { ...@@ -23,6 +21,7 @@ import {
REPAIR_OUTER_STATUS_TAG_MAP, REPAIR_OUTER_STATUS_TAG_MAP,
REPAIR_INNER_STATUS_BADGE_MAP, REPAIR_INNER_STATUS_BADGE_MAP,
} from '../../../constants'; } from '../../../constants';
import { isMaterialOrder } from '../../../utils';
const ProductList = React.lazy(() => import('../../../components/ProductList')); const ProductList = React.lazy(() => import('../../../components/ProductList'));
const FileList = React.lazy(() => import('../../../components/FileList')); const FileList = React.lazy(() => import('../../../components/FileList'));
...@@ -65,11 +64,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -65,11 +64,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
const [infoLoading, setInfoLoading] = useState(false); const [infoLoading, setInfoLoading] = useState(false);
const [repairGoodsLoading, setRepairGoodsLoading] = useState(false); const [repairGoodsLoading, setRepairGoodsLoading] = useState(false);
const isMateriel = ( const isMateriel = isMaterialOrder(detailInfo?.orderType);
detailInfo?.orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| detailInfo?.orderType === ORDER_TYPE_BIDDING_CONTRACT
|| detailInfo?.orderType === ORDER_TYPE_TENDER_CONTRACT
);
const productColumns: EditableColumns[] = [ const productColumns: EditableColumns[] = [
{ {
......
...@@ -23,8 +23,6 @@ import { ...@@ -23,8 +23,6 @@ import {
RETURN_INNER_STATUS_UNCOMMITTED, RETURN_INNER_STATUS_UNCOMMITTED,
} from '@/constants/afterService'; } from '@/constants/afterService';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT, ORDER_TYPE_TENDER_CONTRACT,
ORDER_TYPE, ORDER_TYPE,
} from '@/constants/order'; } from '@/constants/order';
...@@ -40,6 +38,7 @@ import { ...@@ -40,6 +38,7 @@ import {
RETURN_OUTER_STATUS_TAG_MAP, RETURN_OUTER_STATUS_TAG_MAP,
RETURN_INNER_STATUS_BADGE_MAP, RETURN_INNER_STATUS_BADGE_MAP,
} from '../../../constants'; } from '../../../constants';
import { isMaterialOrder } from '../../../utils';
const ProductList = React.lazy(() => import('../../../components/ProductList')); const ProductList = React.lazy(() => import('../../../components/ProductList'));
const ReturnAnalysis = React.lazy(() => import('../../../components/ReturnAnalysis')); const ReturnAnalysis = React.lazy(() => import('../../../components/ReturnAnalysis'));
...@@ -124,11 +123,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -124,11 +123,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
setVisibleReturnInfo(true); setVisibleReturnInfo(true);
}; };
const isMateriel = ( const isMateriel = isMaterialOrder(detailInfo?.orderType);
detailInfo?.orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| detailInfo?.orderType === ORDER_TYPE_BIDDING_CONTRACT
|| detailInfo?.orderType === ORDER_TYPE_TENDER_CONTRACT
);
const productColumns: EditableColumns[] = [ const productColumns: EditableColumns[] = [
{ {
......
...@@ -29,6 +29,7 @@ import { ...@@ -29,6 +29,7 @@ import {
RETURN_OUTER_STATUS_TAG_MAP, RETURN_OUTER_STATUS_TAG_MAP,
RETURN_INNER_STATUS_BADGE_MAP, RETURN_INNER_STATUS_BADGE_MAP,
} from '../../../../constants'; } from '../../../../constants';
import { isMaterialOrder } from '../../../../utils';
const addSchemaAction = createFormActions(); const addSchemaAction = createFormActions();
const { const {
...@@ -197,11 +198,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({ ...@@ -197,11 +198,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
const [goodsValue, setGoodsValue] = useState([]); const [goodsValue, setGoodsValue] = useState([]);
const [orderTypeValue, setOrderTypeValue] = useState(0); const [orderTypeValue, setOrderTypeValue] = useState(0);
const isMateriel = ( const isMateriel = isMaterialOrder(orderTypeValue);
orderTypeValue === ORDER_TYPE_INQUIRY_CONTRACT
|| orderTypeValue === ORDER_TYPE_BIDDING_CONTRACT
|| orderTypeValue === ORDER_TYPE_TENDER_CONTRACT
);
const tableColumn: ColumnType<any>[] = [ const tableColumn: ColumnType<any>[] = [
{ {
......
...@@ -7,12 +7,11 @@ import { DELIVERY_TYPE_ENUM } from '@/constants/afterService'; ...@@ -7,12 +7,11 @@ import { DELIVERY_TYPE_ENUM } from '@/constants/afterService';
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import { GlobalConfig } from '@/global/config'; import { GlobalConfig } from '@/global/config';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT, ORDER_TYPE_TENDER_CONTRACT,
ORDER_TYPE_POINTS, ORDER_TYPE_POINTS,
ORDER_TYPE_CHANNEL_POINTS, ORDER_TYPE_CHANNEL_POINTS,
} from '@/constants/order'; } from '@/constants/order';
import { isMaterialOrder } from '../../../../../utils';
// 供应会员列表列 // 供应会员列表列
const supplierColumns = [ const supplierColumns = [
...@@ -87,11 +86,7 @@ const orderTypeArr = GlobalConfig.web.orderType.map((item) => ({ ...@@ -87,11 +86,7 @@ const orderTypeArr = GlobalConfig.web.orderType.map((item) => ({
})).filter((item) => (item.value !== ORDER_TYPE_POINTS && item.value !== ORDER_TYPE_CHANNEL_POINTS)); })).filter((item) => (item.value !== ORDER_TYPE_POINTS && item.value !== ORDER_TYPE_CHANNEL_POINTS));
export const addSchema = (orderType: number): ISchema => { export const addSchema = (orderType: number): ISchema => {
const isMateriel = ( const isMateriel = isMaterialOrder(orderType);
orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| orderType === ORDER_TYPE_BIDDING_CONTRACT
|| orderType === ORDER_TYPE_TENDER_CONTRACT
);
return { return {
type: 'object', type: 'object',
properties: { properties: {
......
...@@ -25,8 +25,6 @@ import { ...@@ -25,8 +25,6 @@ import {
RETURN_INNER_STATUS_UNCOMMITTED, RETURN_INNER_STATUS_UNCOMMITTED,
} from '@/constants/afterService'; } from '@/constants/afterService';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT, ORDER_TYPE_TENDER_CONTRACT,
ORDER_TYPE, ORDER_TYPE,
} from '@/constants/order'; } from '@/constants/order';
...@@ -43,6 +41,7 @@ import { ...@@ -43,6 +41,7 @@ import {
RETURN_OUTER_STATUS_TAG_MAP, RETURN_OUTER_STATUS_TAG_MAP,
RETURN_INNER_STATUS_BADGE_MAP, RETURN_INNER_STATUS_BADGE_MAP,
} from '../../../constants'; } from '../../../constants';
import { isMaterialOrder } from '../../../utils';
const ProductList = React.lazy(() => import('../../../components/ProductList')); const ProductList = React.lazy(() => import('../../../components/ProductList'));
const ReturnAnalysis = React.lazy(() => import('../../../components/ReturnAnalysis')); const ReturnAnalysis = React.lazy(() => import('../../../components/ReturnAnalysis'));
...@@ -150,11 +149,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -150,11 +149,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
}); });
}; };
const isMateriel = ( const isMateriel = isMaterialOrder(detailInfo?.orderType);
detailInfo?.orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| detailInfo?.orderType === ORDER_TYPE_BIDDING_CONTRACT
|| detailInfo?.orderType === ORDER_TYPE_TENDER_CONTRACT
);
const productColumns: EditableColumns[] = [ const productColumns: EditableColumns[] = [
{ {
......
/*
* @Author: XieZhiXiong
* @Date: 2021-11-15 10:20:22
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-11-15 10:25:34
* @Description: 售后服务相关工具函数
*/
import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT,
ORDER_TYPE_REQUISITION,
} from '@/constants/order';
// 是否是采购订单
export const isMaterialOrder = (orderType: number) => {
return (
orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| orderType === ORDER_TYPE_BIDDING_CONTRACT
|| orderType === ORDER_TYPE_TENDER_CONTRACT
|| orderType === ORDER_TYPE_REQUISITION
)
};
\ No newline at end of file
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