Commit 5a461508 by chenjinjing

no message

parent 381bd538
......@@ -89,7 +89,6 @@ export async function memberRegister2({form, userId}) {
eccEnumValue(EccFuncName, '证件类型', DOCUMENTTYPE, form.documentType);
eccEnumValue(EccFuncName, '民族', NATION, form.nation);
eccEnumValue(EccFuncName, '专业类别', PROFCATEGORY, form.profCategory);
eccEnumValue(EccFuncName, '会员等级职务', MEMBERLEVEL, form.memberLevel);
//更新注册流程
form.registerFlow = REGISTERFLOW.完成第二步;
......@@ -321,15 +320,12 @@ export async function unitMemberEcho3({userId}) {
*/
const IndividualBasicConfig = ["name", "sex", "documentType", "documentId", "birth", "nation", "sheng", "shi", "qu", "addres", "education", "photoUrl"];
const SpecialityConfig = ["unitName", "memberLevel", "workTitle", "profCategory", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF"];
const SpecialityConfig = ["unitName", "duties", "workTitle", "profCategory", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF"];
export async function individualMemberDetails({userId}) {
let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
let topInfo:any = extractData(oldInfo, ["session", "memberLevel"]);
topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
let basicInfo:any = extractData(oldInfo, IndividualBasicConfig);
basicInfo.documentType = changeEnumValue(DOCUMENTTYPE, basicInfo.documentType);
basicInfo.nation = changeEnumValue(NATION, basicInfo.nation);
......@@ -339,7 +335,7 @@ export async function individualMemberDetails({userId}) {
let otherAttachment:any = extractData(oldInfo, ["cardUrl", "academicCERTUrl", "professionalCERTUrl", "auxiliaryMaterial"]);
return {topInfo, basicInfo, specialityInfo, otherAttachment};
return {basicInfo, specialityInfo, otherAttachment};
}
......
......@@ -352,6 +352,7 @@ const ModelArray = [
memberState:{type:'Number', default:MEMBERSTATE.正常},//会员状态 枚举MEMBERSTATE
certificateType:'Number',//证书类型 枚举CERTIFICATETYPE
individualMemberType:{type: 'Number'},//个人会员类型 枚举INDIVIDUALMEMBERTYPE
memberLevel:'Number',//会员等级、职务 枚举MEMBERLEVEL【会员管理用】
/**宽限期状态 */
isGracePeriod:{type:'Number', default:0},//是否宽限期 0:否, 1:是
gracePeriodEndTime:'Number',//宽限期到期时间 时间戳
......@@ -375,7 +376,7 @@ const ModelArray = [
photoUrl:'String',//证件照图片地址 蓝底证件照
/**第二步流程表单(个人)【专业信息】 */
workUnit:'String',//工作单位
memberLevel:'Number',//会员等级、职务 枚举MEMBERLEVEL
duties:'String',//职务【注册用】
workTitle:'String',//职称
studyResume:'String',//学习简历
workResume:'String',//工作简历
......
......@@ -47,7 +47,7 @@ export const Config = {
education:{type:'Number', desc:'学历', notMustHave:false},
photoUrl:{type:'String', desc:'蓝底证件照', notMustHave:false},
workUnit:{type:'String', desc:'工作单位', notMustHave:false},
memberLevel:{type:'Number', desc:'会员等级职务', notMustHave:false},
duties:{type:'String', desc:'职务', notMustHave:false},
workTitle:{type:'String', desc:'职称', notMustHave:false},
profCategory:{type:'Number', desc:'专业类别', notMustHave:false},
studyResume:{type:'String', desc:'学习简历', notMustHave:false},
......@@ -380,26 +380,6 @@ export const Config = {
],
bindBiz:examineBiz.approvalHistoryList
},
{
apiName:"待支付列表",
subUrl:'/examine/tobepaidlist',
param:[
{key:"unitName", type:"String", desc:"单位名称", isNull:true},
{key:"joinTime", type:"Number", desc:"入会时间", isNull:true},
{key:"memberType", type:"Number", desc:"会员类别", isNull:true},
{key:"paymentStatus", type:"String", desc:"支付状态", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}
],
bindBiz:examineBiz.toBePaidList
},
{
apiName:"通过支付信息",
subUrl:'/examine/passthroughpaid',
param:[
{key:"userId", type:"String", desc:"待支付列表返回的用户id"},
],
bindBiz:examineBiz.passThroughPaid
},
],
"会费管理":[
{
......
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