Commit c5e30964 authored by shenshaokai's avatar shenshaokai

feat: '会员'文案改成'供应商'

parent b81f2fbf
......@@ -10,7 +10,7 @@ module.exports = [
{ name: 'TransactionV2', token: '5f4d3bb2ee37c3f390bb09ef2ca5694bc978b6578239d50faf5ea579a9a1127a', categoryIds: [0] }, // 交易服务V2
{ name: 'ContractV2', token: 'cd3e8fe3c94af42c20871e45af4e5b9241bd1752f33944af7562bf7c74349659', categoryIds: [0] }, // 合同能力V2
{ name: 'OrderNewV2', token: 'f122746b38ea3c3d05e3e7ace587a8b6adc4d33395587f2f00beeb19868dc908', categoryIds: [0], }, //订单服务V2 New
{ name: 'MemberV2', token: '0984987df5e222fd023565733c55237c5dfc958242a42f16fb89635ec0c6ffd8', categoryIds: [0]}, //会员服务 V2
{ name: 'MemberV2', token: '0984987df5e222fd023565733c55237c5dfc958242a42f16fb89635ec0c6ffd8', categoryIds: [0]}, //供应商服务 V2
{ name: 'ReportV2', token: 'f1867444395ca36adeb619eb0442b46541b28103302cb0601dc400d986996a26', categoryIds: [0]}, // 报表服务v2 首页
{ name: 'EnhanceV2', token: 'f9e43d5e53eead45cd0d879550baede5d94c5e1b1cc224379348991bf20d5d5e', categoryIds: [0], }, // 加工服务v2
{ name: 'MessageV2', token: 'e23bc60cd7ab5512bbf757d8bcfead70c76e91d9b30fcc44ab79f06f0425ab4b', categoryIds: [0], }, // 消息中心v2
......
......@@ -63,7 +63,7 @@ const router = [
path: '/memberCenter',
redirect: '/memberCenter/home',
},
// 册的会员审核不通过时, 可以修改个人信息, 这里任何人都有权限
// 册的供应商审核不通过时, 可以修改个人信息, 这里任何人都有权限
{
path: `/memberCenter/editMySelf`,
component: '@/pages/member/memberImport/editMySelf',
......
This diff is collapsed.
This diff is collapsed.
......@@ -250,7 +250,7 @@ const TranactionRoute = {
],
},
// 采购商会员评价管理
// 采购商供应商评价管理
{
path: '/memberCenter/tranactionAbility/purchaserEvaluation',
name: 'purchaserEvaluation',
......
This diff is collapsed.
......@@ -3,31 +3,31 @@
* @Date: 2021-05-18 17:36:53
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-12-03 18:01:11
* @Description: 会员相关常量
* @Description: 供应商相关常量
*/
import { getIntl } from 'umi';
const intl = getIntl();
/* --------------------------------- 会员类型 -------------------------------- */
/* --------------------------------- 供应商类型 -------------------------------- */
/**
* 企业会员
* 企业供应商
*/
export const MEMBER_TYPE_CORPORATE = 1;
/**
* 个人会员
* 个人供应商
*/
export const MEMBER_TYPE_INDIVIDUAL = 2;
/**
* 渠道企业会员
* 渠道企业供应商
*/
export const MEMBER_TYPE_CHANNEL_CORPORATE = 3;
/**
* 渠道个人会员
* 渠道个人供应商
*/
export const MEMBER_TYPE_CHANNEL_INDIVIDUAL = 4;
/**
* 会员类型对应中文
* 供应商类型对应中文
*/
export const MEMBER_TYPE = {
[MEMBER_TYPE_CORPORATE]: intl.formatMessage({ id: 'member.constants.MEMBER_TYPE_CORPORATE' }),
......@@ -37,7 +37,7 @@ export const MEMBER_TYPE = {
};
/* --------------------------------- 会员状态 -------------------------------- */
/* --------------------------------- 供应商状态 -------------------------------- */
/**
* 正常的
*/
......@@ -52,7 +52,7 @@ export const MEMBER_STATUS = {
};
/* --------------------------------- 会员外部状态 -------------------------------- */
/* --------------------------------- 供应商外部状态 -------------------------------- */
/**
* 待提交审核
*/
......@@ -70,7 +70,7 @@ export const MEMBER_OUTER_STATUS_PLATFORM_VERIFY_PASSED = 3;
*/
export const MEMBER_OUTER_STATUS_PLATFORM_VERIFY_NOT_PASSED = 4;
/**
* 待审核会员入库
* 待审核供应商入库
*/
export const MEMBER_OUTER_STATUS_DEPOSITING = 5;
/**
......@@ -82,20 +82,20 @@ export const MEMBER_OUTER_STATUS_DEPOSITORY_PASSED = 6;
*/
export const MEMBER_OUTER_STATUS_DEPOSITORY_NOT_PASSED = 7;
/**
* 待审核会员变更
* 待审核供应商变更
*/
export const MEMBER_OUTER_STATUS_MODIFYING = 8;
/**
* 会员变更审核通过
* 供应商变更审核通过
*/
export const MEMBER_OUTER_STATUS_MODIFY_PASSED = 9;
/**
* 会员变更审核不通过
* 供应商变更审核不通过
*/
export const MEMBER_OUTER_STATUS_MODIFY_NOT_PASSED = 10;
/* --------------------------------- 会员内部状态(非平台会员,即上级不是平台会员) -------------------------------- */
/* --------------------------------- 供应商内部状态(非平台供应商,即上级不是平台供应商) -------------------------------- */
/**
* 待审核入库资料
*/
......@@ -129,7 +129,7 @@ export const MEMBER_INNER_STATUS_TO_CLASSFIY_DEPOSITORY = 7;
*/
export const MEMBER_INNER_STATUS_DEPOSITORY_CLASSIFICATION_NOT_PASSED = 8;
/**
* 待审核入库(一级)
* 待审核入库(一级)
*/
export const MEMBER_INNER_STATUS_TO_DEPOSIT_GRADE_ONE = 9;
/**
......@@ -157,36 +157,36 @@ export const MEMBER_INNER_STATUS_VERIFY_PASSED = 14;
*/
export const MEMBER_INNER_STATUS_VERIFY_NOT_PASSED = 15;
/**
* 待审核会员变更(一级)
* 待审核供应商变更(一级)
*/
export const MEMBER_INNER_STATUS_VERIFY_TO_MODIFY_GRADE_ONE = 16;
/**
* 会员变更审核不通过(一级)
* 供应商变更审核不通过(一级)
*/
export const MEMBER_INNER_STATUS_MODIFY_GRADE_ONE_NOT_PASSED = 17;
/**
* 待审核会员变更(二级)
* 待审核供应商变更(二级)
*/
export const MEMBER_INNER_STATUS_TO_MODIFY_GRADE_TWO = 18;
/**
* 会员变更审核不通过(二级)
* 供应商变更审核不通过(二级)
*/
export const MEMBER_INNER_STATUS_MODIFY_GRADE_TWO_NOT_PASSED = 19;
/**
* 待确认会员变更
* 待确认供应商变更
*/
export const MEMBER_INNER_STATUS_TO_COMFIRM_MODIFY = 20;
/**
* 会员变更审核通过
* 供应商变更审核通过
*/
export const MEMBER_INNER_STATUS_MODIFY_PASSED = 21;
/**
* 会员变更审核不通过
* 供应商变更审核不通过
*/
export const MEMBER_INNER_STATUS_MODIFY_NOT_PASSED = 22;
/* --------------------------------- 会员内部状态(平台会员) -------------------------------- */
/* --------------------------------- 供应商内部状态(平台供应商) -------------------------------- */
/**
* 待提交平台审核
*/
......@@ -200,7 +200,7 @@ export const PLATFORM_MEMBER_INNER_STATUS_COMMIT_NOT_PASSED = 2;
*/
export const PLATFORM_MEMBER_INNER_STATUS_TO_BE_VERIFY_STEP1 = 3;
/**
* 审核会员不通过(一级)
* 审核供应商不通过(一级)
*/
export const PLATFORM_MEMBER_INNER_STATUS_VERIFY_STEP1_NOT_PASSED = 4;
/**
......@@ -208,11 +208,11 @@ export const PLATFORM_MEMBER_INNER_STATUS_VERIFY_STEP1_NOT_PASSED = 4;
*/
export const PLATFORM_MEMBER_INNER_STATUS_TO_BE_VERIFY_STEP2 = 5;
/**
* 审核会员不通过(二级)
* 审核供应商不通过(二级)
*/
export const PLATFORM_MEMBER_INNER_STATUS_VERIFY_STEP2_NOT_PASSED = 6;
/**
* 待确认会员
* 待确认供应商
*/
export const PLATFORM_MEMBER_INNER_STATUS_TO_CONFIRM = 7;
/**
......@@ -225,21 +225,21 @@ export const PLATFORM_MEMBER_INNER_STATUS_VERIFY_NOT_PASSED = 8;
export const PLATFORM_MEMBER_INNER_STATUS_VERIFY_PASSED = 9;
/* --------------------------------- 会员等级类型枚举 -------------------------------- */
/* --------------------------------- 供应商等级类型枚举 -------------------------------- */
/**
* 平台会员
* 平台供应商
*/
export const MEMBER_LEVEL_TYPE_PLATFORM = 1;
/**
* 商户会员
* 商户供应商
*/
export const MEMBER_LEVEL_TYPE_MERCHANT = 2;
/**
* 渠道会员
* 渠道供应商
*/
export const MEMBER_LEVEL_TYPE_CHANNEL = 3;
/**
* 会员等级类型枚举对应中文
* 供应商等级类型枚举对应中文
*/
export const MEMBER_LEVEL_TYPE = {
[MEMBER_LEVEL_TYPE_PLATFORM]: intl.formatMessage({ id: 'member.constants.MEMBER_LEVEL_TYPE_PLATFORM' }),
......@@ -248,7 +248,7 @@ export const MEMBER_LEVEL_TYPE = {
};
/* --------------------------------- 会员规则类型 -------------------------------- */
/* --------------------------------- 供应商规则类型 -------------------------------- */
/**
* 交易
*/
......@@ -263,7 +263,7 @@ export const VIP_RULE_LOGIN = 2;
export const VIP_RULE_COMMENT = 3;
/* --------------------------------- 会员角色类型 -------------------------------- */
/* --------------------------------- 供应商角色类型 -------------------------------- */
/**
* 服务提供者
*/
......@@ -296,7 +296,7 @@ export const MEMBER_INVOICE_TYPE_4 = 4;
*/
export const MEMBER_INVOICE_TYPE_5 = 5;
/**
* 会员等级类型枚举对应中文
* 供应商等级类型枚举对应中文
*/
export const MEMBER_INVOICE_TYPE = {
[MEMBER_INVOICE_TYPE_1]: intl.formatMessage({ id: 'member.constants.MEMBER_INVOICE_TYPE_1' }),
......@@ -337,7 +337,7 @@ export const MEMBER_TAX_POINT_4 = 3;
*/
export const MEMBER_TAX_POINT_5 = 0;
/**
* 会员等级类型枚举对应中文
* 供应商等级类型枚举对应中文
*/
export const MEMBER_TAX_POINT = {
[MEMBER_TAX_POINT_1]: intl.formatMessage({ id: 'member.constants.MEMBER_TAX_POINT_1' }),
......@@ -350,7 +350,7 @@ export const MEMBER_TAX_POINT = {
};
/**
* 会员等级层级options
* 供应商等级层级options
*/
export const MEMBER_LEVEL_ENUM = [
{
......
export default {
// 会员管理 - 会员导入
// 供应商管理 - 供应商导入
'member.management.import.query.memberId': '회원 ID',
'member.management.import.query.memberName': '이름:',
'member.management.import.query.memberTypeName': '회원 유형',
......@@ -49,7 +49,7 @@ export default {
'member.management.import.upload.fileTitle': '회원 프로필',
'member.management.import.upload.modalName': '멤버 가져오기',
// 会员管理 - 会员维护
// 供应商管理 - 供应商维护
'member.management.maintain.query.memberId': '회원 ID',
'member.management.maintain.query.memberName': '이름:',
'member.management.maintain.query.memberTypeName': '회원 유형',
......@@ -240,13 +240,13 @@ export default {
// 待确认入库
'member.management.memberPrVerifyComingConfirm.query.verify-tip': '선택한 회원을 심사하여 통과시키시겠습니까?',
// 待审核会员变更(一级)
// 待审核供应商变更(一级)
'member.management.memberPrVerifyChange1.query.verify-tip': '선택한 회원을 심사하여 통과시키시겠습니까?',
// 待确认会员变更
// 待确认供应商变更
'member.management.memberPrVerifyChangeConfirm.query.verify-tip': '선택한 회원을 심사하여 통과시키시겠습니까?',
// 会员等级
// 供应商等级
'member.memberLevel.query.columns.id': 'ID',
'member.memberLevel.query.columns.level': '회원 등급',
'member.memberLevel.query.columns.levelTag': '회원 등급 라벨',
......@@ -285,7 +285,7 @@ export default {
'member.memberLevel.components.DetailInfo.threshold.current': '현재 밸브값',
'member.memberLevel.components.DetailInfo.rights': '회원 권익',
// 会员升级规则
// 供应商升级规则
'member.memberUpgradeRule.columns.id': 'ID',
'member.memberUpgradeRule.columns.ruleName': '업그레이드 규칙',
'member.memberUpgradeRule.columns.remark': '프로모션 규칙 설명',
......@@ -297,7 +297,7 @@ export default {
'member.memberUpgradeRule.comment.rules-legal': '정수 값을 입력하십시오.',
'member.memberUpgradeRule.save': '보존',
// 会员管理流程规则配置
// 供应商管理流程规则配置
'member.memberFlowRule.delete.message': '삭제 중',
'member.memberFlowRule.modify.message': '수정 중',
'member.memberFlowRule.defaultColumns.id': 'ID',
......@@ -370,10 +370,10 @@ export default {
'member.memberFlowRule.components.PlatformConfigTable.default': '플랫폼 등록 정보 사용(기본값)',
'member.memberFlowRule.components.Search.reset': '재설정',
// 会员状态
// 供应商状态
'member.status.notAaudit': '검토 대기 중',
// 会员信息查询
// 供应商信息查询
'member.memberQuery.query.defaultColumns.name': '회원 귀속',
'member.memberQuery.query.defaultColumns.memberTypeName': '회원 유형',
'member.memberQuery.query.defaultColumns.roleName': '회원 역할',
......@@ -680,9 +680,9 @@ export default {
'member.components.VerifyModal.reason.pass': '통과 원인',
'member.components.VerifyModal.reason.placeholder': '최대 120자, 한자 60자를 입력하십시오',
'member.components.ListWarp.new': '변경 전',
'member.components.ListWarp.old': '변경 후',
'member.components.ListWarp.old': '변경 후',
// 会员考察/考评/整改/预警、投诉建议、会员整改管理、考评结果查询、投诉建议管理
// 供应商考察/考评/整改/预警、投诉建议、供应商整改管理、考评结果查询、投诉建议管理
'member.memberInspection.add.modifyInvestigate': '회원 고찰 수정',
'member.memberInspection.add.back': '되돌아오다',
'member.memberInspection.add.addInvestigate': '신규 회원 시찰',
......@@ -994,14 +994,14 @@ export default {
'member.evaluate.validate.number': '정수',
//待分配会员
//待分配供应商
'member.management.assigned.query.sourceName': '응용 프로그램 소스',
'member.management.assigned.query.receive': '받기',
'member.management.assigned.query.batchReceive': '일괄 수신',
'member.memberQuery.suggest.common.schema.eventTime.required': '이벤트 시간을 입력하십시오.',
// 会员等级管理
// 供应商等级管理
'member.memberLevel.levelId': '회원 등급 ID',
'member.memberLevel.level': '회원 등급',
'member.memberLevel.level.placeholder': '선택해주세요',
......@@ -1062,7 +1062,7 @@ export default {
'member.memberLevel.enable': '활성화',
'member.memberLevel.parameter.edit': '매개변수 변경',
// 会员拜访管理
// 供应商拜访管理
'member.memberVisitManage.index': '일련 번호',
'member.memberVisitManage.visitTheme': '방문 주제',
'member.memberVisitManage.visitTheme.placeholder': '최대 40자, 20자',
......@@ -1114,7 +1114,7 @@ export default {
'member.management.memberPrComingClassify.drawer.form.classify.paymentTerms.required': '지불 조건을 선택하십시오',
'member.management.memberPrComingClassify.drawer.form.classify.developTypes': '개발 이유',
'member.management.memberPrComingClassify.drawer.form.classify.businessTypes': '비즈니스 카테고리',
// 导入会员弹窗
// 导入供应商弹窗
'member.memberImport.components.MemberRolesModal.title': '가져올 역할 선택',
'member.memberImport.components.MemberRolesModal.next.step': '다음 단계',
'member.memberEvaluate.allQuery.schema.totalScore.placeholder': '최종 점수를 입력하십시오'
......
......@@ -122,18 +122,18 @@ export default {
'components.huohao': '货号',
'components.pinlei': '品类',
'components.pinpai': '品牌',
'components.qingshuruhuiyuanmingcheng': '请输入会员名称',
'components.qingshuruhuiyuanmingcheng': '请输入供应商名称',
'components.baojiadanhao': '报价单号',
'components.baojiahuiyuan': '报价会员',
'components.baojiahuiyuan': '报价供应商',
'components.baojiadanzhaiyao': '报价单摘要',
'components.xunjiadanbianhao': '询价单编号',
'components.danjushijianquanbu': '单据时间(全部)',
'components.xuqiudanhaoxuqiudan': '需求单号/需求单摘要',
'components.xuqiuhuiyuanquanbu': '需求会员(全部)',
'components.xuqiuhuiyuan': '需求会员',
'components.xuqiuhuiyuanquanbu': '需求供应商(全部)',
'components.xuqiuhuiyuan': '需求供应商',
'components.xuqiudanbianhao': '需求单编号',
'components.dingdanhaodingdanzhaiyao': '订单号/订单摘要',
'components.gongyinghuiyuanquanbu': '供应会员(全部)',
'components.gongyinghuiyuanquanbu': '供应供应商(全部)',
'components.xuqiudanhao': '需求单号',
'components.xuqiudanzhaiyao': '需求单摘要',
'components.fahuodanhao': '发货单号',
......@@ -142,10 +142,10 @@ export default {
'components.danjuleixing': '单据类型',
'components.shangpinmingcheng': '商品名称',
'components.xunjiadanhao': '询价单号',
'components.xunjiahuiyuan': '询价会员',
'components.xunjiahuiyuan': '询价供应商',
'components.xunjiadanzhaiyao': '询价单摘要',
'components.huiyuanmingcheng': '会员名称',
'components.xuanzehuiyuanjuese': '选择会员角色',
'components.huiyuanmingcheng': '供应商名称',
'components.xuanzehuiyuanjuese': '选择供应商角色',
'components.hetongbianhao': '合同编号',
'components.hetongzhaiyao': '合同摘要',
'components.hetongyifang': '合同乙方',
......@@ -207,7 +207,7 @@ export default {
'components.buqianshu': '不签署',
'components.qingshurushangpinmingchengID': '请输入商品名称/ID',
'components.baojiadanhaoxuqiudan': '报价单号/需求单号/报价单摘要',
'components.baojiahuiyuanquanbu': '报价会员(全部)',
'components.baojiahuiyuanquanbu': '报价供应商(全部)',
'components.sousuo': '搜索',
'components.shangchuanshibaiqingjian': '上传失败, 请检查上传接口',
'components.shangchuanwenjianbunengdayu': '上传文件不能大于20m',
......@@ -265,9 +265,9 @@ export default {
'components.fabugongying': '发布供应',
'components.caigougongying': '采购&供应',
'components.wangjimima': '忘记密码',
'components.huiyuanfuwu': '会员服务',
'components.huiyuandenglu': '会员登录',
'components.huiyuanzhuce': '会员注册',
'components.huiyuanfuwu': '供应商服务',
'components.huiyuandenglu': '供应商登录',
'components.huiyuanzhuce': '供应商注册',
'components.riskCheckTips': '按住滑块,拖动拼图',
'components.tableResetTip': '重置',
'components.tableFilterTip': '高级筛选',
......
This diff is collapsed.
......@@ -4,7 +4,7 @@ export interface IEvaluationModule {
activeKey: string,
};
// 采购会员评价管理
// 采购供应商评价管理
purchaser: {
activeKey: string,
};
......
......@@ -54,11 +54,11 @@ type RefundModalValueType = {
*/
refundAmount?: number,
/**
* 采购会员id
* 采购供应商id
*/
purchaserId?: number,
/**
* 采购会员角色id
* 采购供应商角色id
*/
purchaserRoleId?: number,
/**
......
......@@ -77,10 +77,10 @@ export const addSchema = (orderType: number): ISchema => {
},
purchaser: {
type: 'string',
title: intl.formatMessage({ id: 'afterService.apply.purchaser' }, { default: '采购会员' }),
title: intl.formatMessage({ id: 'afterService.apply.purchaser' }, { default: '采购供应商' }),
enum: [],
'x-component-props': {
placeholder: intl.formatMessage({ id: 'afterService.apply.purchaser.placeholder' }, { default: '请输入采购会员名称' }),
placeholder: intl.formatMessage({ id: 'afterService.apply.purchaser.placeholder' }, { default: '请输入采购供应商名称' }),
showSearch: true,
defaultActiveFirstOption: false,
showArrow: false,
......
......@@ -71,10 +71,10 @@ export const addSchema = (orderType: number): ISchema => {
},
purchaser: {
type: 'string',
title: intl.formatMessage({ id: 'afterService.apply.purchaser' }, { default: '采购会员' }),
title: intl.formatMessage({ id: 'afterService.apply.purchaser' }, { default: '采购供应商' }),
enum: [],
'x-component-props': {
placeholder: intl.formatMessage({ id: 'afterService.apply.purchaser.placeholder' }, { default: '请输入采购会员名称' }),
placeholder: intl.formatMessage({ id: 'afterService.apply.purchaser.placeholder' }, { default: '请输入采购供应商名称' }),
showSearch: true,
defaultActiveFirstOption: false,
showArrow: false,
......
......@@ -72,10 +72,10 @@ export const addSchema = (orderType: number): ISchema => {
},
purchaser: {
type: 'string',
title: intl.formatMessage({ id: 'afterService.apply.purchaser' }, { default: '采购会员' }),
title: intl.formatMessage({ id: 'afterService.apply.purchaser' }, { default: '采购供应商' }),
enum: [],
'x-component-props': {
placeholder: intl.formatMessage({ id: 'afterService.apply.purchaser.placeholder' }, { default: '请输入采购会员名称' }),
placeholder: intl.formatMessage({ id: 'afterService.apply.purchaser.placeholder' }, { default: '请输入采购供应商名称' }),
showSearch: true,
defaultActiveFirstOption: false,
showArrow: false,
......
......@@ -152,7 +152,7 @@ const ReceiptItem: React.FC<ItemIprops> = (props) => {
}
const Receipt: React.ForwardRefRenderFunction<RefHandle, IProps> = (props, ref) => {
const { isMember = false, memberId = '', memberRoleId = '', isEdit = true, showAddModal = false } = props //isMember=true为变更会员信息的发票信息
const { isMember = false, memberId = '', memberRoleId = '', isEdit = true, showAddModal = false } = props //isMember=true为变更供应商信息的发票信息
const [list, setList] = useState<IReceiptProps[]>([]);
const [editItem, setEditItem] = useState<IReceiptProps | null>(null)
const invoiceModalRef = useRef<any>({})
......
......@@ -132,7 +132,7 @@ const schema = {
}
const Info: React.FC = (props) => {
const { location: { state } } = props //isMember=true为变更会员信息的发票信息
const { location: { state } } = props //isMember=true为变更供应商信息的发票信息
const isMember = state?.isMember
const memberId = state?.memberId
const memberRoleId = state?.memberRoleId
......@@ -145,7 +145,7 @@ const Info: React.FC = (props) => {
const handleSubmit = (value: IReceiptProps) => {
console.log(value);
/* 未改变之前逻辑,仅加了是否为会员发票信息的判断 */
/* 未改变之前逻辑,仅加了是否为供应商发票信息的判断 */
let serviceActions = postSettleAccountsInvoiceMessageAdd
if (isMember) {
serviceActions = isAdd
......
......@@ -5,7 +5,7 @@
* @param column 采购
* @param columnsList 招标
* @param columnsGetList 竞价
* @param supplierColumns 会员类型
* @param supplierColumns 供应商类型
* */
import EyePreview from "@/components/EyePreview";
......
/*
* @Description: 会员分类信息pro
* @Description: 供应商分类信息pro
*/
import React, { useEffect, useRef, useState, useImperativeHandle } from 'react';
import { useIntl } from 'umi';
......@@ -55,7 +55,7 @@ const PROVINCE_API_MAP = {
0: getMemberAbilityMaintenanceDetailRecordClassifyProvince,
1: getMemberDepositClassifyProvince,
};
// 会员品类接口map
// 供应商品类接口map
const CATEGORY_TREE_API_MAP = {
0: getProductCustomerGetCustomerCategoryTree,
1: getProductCustomerGetCustomerCategoryTree,
......@@ -130,7 +130,7 @@ type CategoriesValueItemType = CategoriesBasicValueItem & {
export type FormSubmitBasicValueType = {
/**
* 会员编码
* 供应商编码
*/
code: string,
/**
......@@ -678,7 +678,7 @@ const MemberDocCategoryPro: React.ForwardRefRenderFunction<MemberDocCategoryProR
console.warn(err);
});
// 请求会员品类数据
// 请求供应商品类数据
CATEGORY_TREE_API_MAP[isVerify]().then(res => {
if (res.code === 1000) {
const { data = [] } = res;
......
......@@ -3,7 +3,7 @@
* @Date: 2021-07-09 11:09:36
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-12-04 15:35:31
* @Description: 会员详情信息
* @Description: 供应商详情信息
*/
import React, { Ref, useMemo, useRef,useEffect } from 'react';
import {
......@@ -268,7 +268,7 @@ const MemberProfile: React.FC<IProps> = (props) => {
extra={extra ? extra(dataSource) : null}
>
<Row gutter={[16, 16]}>
{/* 会员审核流程 */}
{/* 供应商审核流程 */}
<Col span={24}>
<AnchorPage.Item itemKey="verifySteps">
<AuditProcess
......@@ -462,7 +462,7 @@ const MemberProfile: React.FC<IProps> = (props) => {
) : null}
{/* 分类信息 */}
{/* 会员编码非必填 */}
{/* 供应商编码非必填 */}
{(
(
dataSource
......
......@@ -78,7 +78,7 @@ interface MemberFormProps {
*/
isEdit?: boolean,
/**
* 当前模式 myself 表示自己修改自己的信息,一般用于会员注册时被拒绝之后
* 当前模式 myself 表示自己修改自己的信息,一般用于供应商注册时被拒绝之后
*/
mode?: 'myself' | 'any'
};
......@@ -376,7 +376,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
}
};
// 会员类型、注册手机下拉框
// 供应商类型、注册手机下拉框
const getPageitemsBasic = async () => {
const res = await getMemberAbilitySubPageitemsBasic();
......@@ -388,8 +388,8 @@ const MemberForm: React.FC<MemberFormProps> = ({
} = data;
const memberTypeId = memberTypes.map(item => {
// 设置默认值为企业会员
if (item.memberTypeName === "企业会员" || item.memberTypeId == '1') {
// 设置默认值为企业供应商
if (item.memberTypeName === "企业供应商" || item.memberTypeId == '1') {
formActions.setFieldValue('memberTypeId', item.memberTypeId)
}
return { label: item.memberTypeName, value: item.memberTypeId }
......@@ -405,7 +405,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
const useBusinessEffects = ($: IFormExtendsEffectSelector<any, ISchemaFormActions | ISchemaFormAsyncActions>) => {
const linkage = useLinkageUtils();
// 间接触发根据会员类型
// 间接触发根据供应商类型
onFieldValueChange$('memberTypeId').subscribe(fieldState => {
if (!fieldState.value) {
return;
......@@ -428,7 +428,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
});
});
// 根据会员类型
// 根据供应商类型
onFieldInputChange$('memberTypeId').subscribe(fieldState => {
if (!fieldState.value) {
return;
......@@ -491,7 +491,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
});
});
// 根据会员角色,查询其他注册资料
// 根据供应商角色,查询其他注册资料
onFieldValueChange$('roleId').subscribe(fieldState => {
if (!fieldState.value) {
setMemberItems([]);
......@@ -515,7 +515,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
linkage.enum('level', []);
});
// 根据会员类型和角色,查询等级下拉
// 根据供应商类型和角色,查询等级下拉
onFieldValueChange$('*(memberTypeId,roleId)').subscribe(fieldState => {
const selfName = fieldState.name;
const selfValue = fieldState.value;
......
......@@ -3,7 +3,7 @@
* @Date: 2021-01-06 11:36:35
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-11-17 11:43:49
* @Description: 会员导入-会员详情
* @Description: 供应商导入-供应商详情
*/
import React from 'react';
import { usePageStatus } from '@/hooks/usePageStatus';
......
......@@ -3,7 +3,7 @@
* @Date: 2021-05-21 16:45:32
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-11-29 20:07:02
* @Description: 会员档案信息
* @Description: 供应商档案信息
*/
import React, { useContext, useEffect, useRef, useState } from 'react';
import { useIntl } from 'umi';
......@@ -69,7 +69,7 @@ export type AppraisalListItemType = {
*/
subject: string
/**
* 下级会员名称
* 下级供应商名称
*/
name: string
/**
......
......@@ -3,7 +3,7 @@
* @Date: 2021-01-06 11:36:35
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-11-17 18:01:05
* @Description: 会员基础信息详情
* @Description: 供应商基础信息详情
*/
import React, { useContext, useEffect, useRef, useState } from 'react';
import { useIntl } from 'umi';
......@@ -108,7 +108,7 @@ const MemberBasicInfo: React.FC<any> = () => {
if(contenxt.isEdit){
contenxt.handleExtraRender(<Button loading={btnLoading} onClick={handleFinish}>变更</Button>)
}
}, [location.pathname])
const handleModifyAfter = () => {
......@@ -117,7 +117,7 @@ const MemberBasicInfo: React.FC<any> = () => {
return (
<Row gutter={[16, 16]}>
{/* 会员审核流程 */}
{/* 供应商审核流程 */}
<Col span={24}>
<AnchorPage.Item itemKey="verifySteps">
<AuditProcess
......
/*
* @Author: LinZhongCong
* @Date: 2022-05-06 09:58
* @Description: 会员地址信息
* @Description: 供应商地址信息
*/
import React, { useEffect, useContext } from 'react';
......
......@@ -3,7 +3,7 @@
* @Date: 2021-05-21 16:45:32
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-12-04 18:28:03
* @Description: 会员档案信息
* @Description: 供应商档案信息
*/
import React, { useContext, useEffect, useState } from 'react';
import { useIntl } from 'umi';
......@@ -58,7 +58,7 @@ export type AppraisalListItemType = {
*/
subject: string
/**
* 下级会员名称
* 下级供应商名称
*/
name: string
/**
......
......@@ -3,14 +3,14 @@
* @Date: 2021-01-06 11:36:35
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-07-28 10:02:03
* @Description: 会员基础信息详情
* @Description: 供应商基础信息详情
*/
import React, { useContext, useEffect } from 'react';
import {
Row,
Col,
} from 'antd';
import {
import {
MEMBER_TYPE_CHANNEL_CORPORATE,
MEMBER_TYPE_CHANNEL_INDIVIDUAL,
} from '@/constants/member';
......@@ -18,7 +18,7 @@ import AnchorPage from '@/components/AnchorPage';
import AuditProcess from '@/components/AuditProcess';
import CustomizeColumn from '@/components/CustomizeColumn';
import FlowRecords from '@/components/FlowRecords';
import {
import {
MEMBER_OUTER_COLUMNS,
MEMBER_INNER_COLUMNS,
} from '../../constant';
......@@ -47,7 +47,7 @@ const MemberBasicInfo: React.FC<any> = () => {
key: 'basicInfo',
name: intl.formatMessage({ id: 'member.components.MemberProfile.basicInfo' }),
},
// 平台录入的会员不需要填渠道信息的
// 平台录入的供应商不需要填渠道信息的
(
memberInfo?.memberTypeEnum === MEMBER_TYPE_CHANNEL_CORPORATE
|| memberInfo?.memberTypeEnum === MEMBER_TYPE_CHANNEL_INDIVIDUAL
......@@ -75,7 +75,7 @@ const MemberBasicInfo: React.FC<any> = () => {
return (
<Row gutter={[16, 16]}>
{/* 会员审核流程 */}
{/* 供应商审核流程 */}
<Col span={24}>
<AnchorPage.Item itemKey="verifySteps">
<AuditProcess
......@@ -86,7 +86,7 @@ const MemberBasicInfo: React.FC<any> = () => {
/>
</AnchorPage.Item>
</Col>
{/* 基本信息 */}
<Col span={24}>
<AnchorPage.Item itemKey="basicInfo">
......@@ -107,9 +107,9 @@ const MemberBasicInfo: React.FC<any> = () => {
/>
</AnchorPage.Item>
</Col>
{/* 渠道信息 */}
{/* 平台录入的会员不需要填渠道信息的 */}
{/* 平台录入的供应商不需要填渠道信息的 */}
{
memberInfo?.memberTypeEnum === MEMBER_TYPE_CHANNEL_CORPORATE
|| memberInfo?.memberTypeEnum === MEMBER_TYPE_CHANNEL_INDIVIDUAL
......@@ -174,4 +174,4 @@ const MemberBasicInfo: React.FC<any> = () => {
);
};
export default MemberBasicInfo;
\ No newline at end of file
export default MemberBasicInfo;
......@@ -3,7 +3,7 @@
* @Date: 2021-06-04 15:37:19
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-12-04 17:59:25
* @Description: 修改会员注册信息
* @Description: 修改供应商注册信息
*/
import React, { useState, useEffect, useRef } from 'react';
import { history, Prompt, useIntl } from 'umi';
......
......@@ -38,7 +38,7 @@ export const PlanSummary = intl.formatMessage({id: 'order.jihuazhaiyao',defaultM
export const PlanningCycle = intl.formatMessage({id: 'order.jihuazhouqi',defaultMessage: '计划周期'});
export const ExternalState = intl.formatMessage({id: 'order.waibuzhuangtai',defaultMessage: '外部状态'});
export const BuyerLabel = intl.formatMessage({id: 'order.caigouhuiyuan',defaultMessage: '采购会员'});
export const BuyerLabel = intl.formatMessage({id: 'order.caigouhuiyuan',defaultMessage: '采购供应商'});
export const OutStatusLabel = intl.formatMessage({id: 'order.waibuzhuangtai',defaultMessage: '外部状态'});
export const DeliveryTypeLabel = intl.formatMessage({id: 'order.peisongfangshi',defaultMessage: '配送方式'});
......
......@@ -5,27 +5,27 @@ const intl = getIntl();
// 供应商列表列
export const supplierColumns = [
{
title: intl.formatMessage({ id: 'afterService.apply.supplier.columns.memberId' }, { default: '会员ID' }),
title: intl.formatMessage({ id: 'afterService.apply.supplier.columns.memberId' }, { default: '供应商ID' }),
dataIndex: 'memberId',
align: 'center',
},
{
title: intl.formatMessage({ id: 'afterService.apply.supplier.columns.name' }, { default: '会员名称' }),
title: intl.formatMessage({ id: 'afterService.apply.supplier.columns.name' }, { default: '供应商名称' }),
dataIndex: 'name',
align: 'center',
},
{
title: intl.formatMessage({ id: 'afterService.apply.supplier.columns.memberTypeName' }, { default: '会员类型' }),
title: intl.formatMessage({ id: 'afterService.apply.supplier.columns.memberTypeName' }, { default: '供应商类型' }),
dataIndex: 'memberTypeName',
align: 'center',
},
{
title: intl.formatMessage({ id: 'afterService.apply.supplier.columns.roleName' }, { default: '会员角色' }),
title: intl.formatMessage({ id: 'afterService.apply.supplier.columns.roleName' }, { default: '供应商角色' }),
dataIndex: 'roleName',
align: 'center',
},
{
title: intl.formatMessage({ id: 'afterService.apply.supplier.columns.levelTag' }, { default: '会员等级' }),
title: intl.formatMessage({ id: 'afterService.apply.supplier.columns.levelTag' }, { default: '供应商等级' }),
dataIndex: 'levelTag',
align: 'center',
},
......
......@@ -23,7 +23,7 @@ export const initBasicData = (message:any) => {
{
col: [
{ label: '来源类型', extra: message.sourceTypeName || '-' },
{ label: unPageCoordination?'供应商':'采购会员', extra: unPageCoordination?message.supplyMemberName:message.memberName || '-' },
{ label: unPageCoordination?'供应商':'采购供应商', extra: unPageCoordination?message.supplyMemberName:message.memberName || '-' },
{ label: message.orderType === 1?'物料信息':'商品信息', extra: message.productDetail.name || message.productDetail.generalTerm || '-' },
{ label: '备注', extra: message.remark || '-' },
{ label: 'PCA 要求日期', extra: message.pcaReplyTime || '-' },
......
......@@ -55,7 +55,7 @@
*/
type: string
/**
* 会员品类
* 供应商品类
*/
customerCategoryName: string
/**
......
......@@ -142,7 +142,7 @@ const ContractModalTable: React.FC<ContractModalTableProps> = (props) => {
// @ 配送方式 默认物流
temp.logistics = 1
// 会员信息冗余
// 供应商信息冗余
temp.memberId = item.partyBMemberId
temp.memberRoleId = item.partyBRoleId
return temp
......
......@@ -173,7 +173,7 @@ function TransferOrderDetail() {
<div className='finish_sumbit_from'>
<div className='role_type'>
<div className='label text-gray-400'>
转单后的角色会员
转单后的角色供应商
<span className='text-red-600'>*</span>
</div>
<div className='control mt-4'>
......
......@@ -53,7 +53,7 @@ export const TransferOrderCloums: StandardTableProps[] = [
dataIndex: "tax"
},
{
title: "会员折扣",
title: "供应商折扣",
dataIndex: "discount",
render: (t, r) => {
return (
......@@ -210,7 +210,7 @@ export const SupplierTableCloums: StandardTableProps[] = [
render: (t, r) => {
return (
<Select>
<Select.Option value="1">上游会员采购会员</Select.Option>
<Select.Option value="1">上游供应商采购供应商</Select.Option>
</Select>
)
}
......
......@@ -9,7 +9,7 @@ import { action, observable} from 'mobx'
import { IEvaluationModule } from '@/module/evaluationModule';
/**
* 供应商评价、采购会员评价管理会员管理
* 供应商评价、采购供应商评价管理供应商管理
*/
class EvaluationStore implements IEvaluationModule {
......
......@@ -38,7 +38,7 @@ export const getPlatformDomain = (topDomain: string, defaultSubDomian: string =
}
/**
* 会员中心域名
* 供应商中心域名
*/
export const getMemberCenterUrl = (topDomain: string, defaultSubDomian: string = 'lx-member') => {
return `${REQUEST_HEADER}${defaultSubDomian}.${topDomain}`
......
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