Commit 7bafbdde by lixinming

no message

parent 9ccf55be
...@@ -80,8 +80,8 @@ export async function applyList({name, joinStartTime, joinEndTime, memberCategor ...@@ -80,8 +80,8 @@ export async function applyList({name, joinStartTime, joinEndTime, memberCategor
memberCategory = changeEnumValue(UNITMEMBERTYPE, info.unitMemberType);//会员类别/级别 memberCategory = changeEnumValue(UNITMEMBERTYPE, info.unitMemberType);//会员类别/级别
} }
item.memberCategory = `${memberCategory}${applyMemberLevel}`; item.memberCategory = `${memberCategory}${applyMemberLevel}`;
item.applyApplicationTime = moment(item.applyApplicationTime).format("YYYY-MM-DD") item.applyApplicationTime = moment(item.applyApplicationTime).format("YYYY-MM-DD");
item.applyReviewTime = moment(item.applyReviewTime).format("YYYY-MM-DD") item.applyReviewTime = item.applyReviewTime ? moment(item.applyReviewTime).format("YYYY-MM-DD") : '-';
dataList.push(item); dataList.push(item);
} }
......
...@@ -106,6 +106,8 @@ export async function unitMemberDetails({userId, id}) { ...@@ -106,6 +106,8 @@ export async function unitMemberDetails({userId, id}) {
let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id}); let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id});
if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在); if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
let topInfo:any = extractData(oldInfo, ["session", "memberLevel"]); let topInfo:any = extractData(oldInfo, ["session", "memberLevel"]);
topInfo.session = getEdition(parseInt(`${topInfo.session/100}`), parseInt(`${topInfo.session%100}`) );
/**处理枚举值 */ /**处理枚举值 */
topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel); topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
let basicInfo:any = extractData(oldInfo, UnitBasicConfig); let basicInfo:any = extractData(oldInfo, UnitBasicConfig);
......
...@@ -153,6 +153,8 @@ export enum REFUNDCOLUMNS { ...@@ -153,6 +153,8 @@ export enum REFUNDCOLUMNS {
export enum MEMBERFEESDCOLUMNS { export enum MEMBERFEESDCOLUMNS {
状态 = "memberState", 状态 = "memberState",
会员类别 = "memberType", 会员类别 = "memberType",
注册手机号 ="phone",
"单位代码/身份证"="code",
"单位/个人名称" = "name" , "单位/个人名称" = "name" ,
会员职务 = "memberLevel", 会员职务 = "memberLevel",
入会时间 = "joinTime", 入会时间 = "joinTime",
......
...@@ -22,7 +22,7 @@ async function lanuch() { ...@@ -22,7 +22,7 @@ async function lanuch() {
// await initAdmin(); // await initAdmin();
await initSystemTask(); await initSystemTask();
await initActivity(); await initActivity();
// await initSaveUnsubmitted(); await initSaveUnsubmitted();
// await test1(); // await test1();
// await inputData(); 20240520日导入数据 // await inputData(); 20240520日导入数据
......
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