no message

src/biz/member/apply.ts

@@ -300,7 +300,7 @@ export async function outPutApply() {
         changeApplyType:{"$gt":CHANGEAPPLYTYPE.注册信息补充完成} //返回除了补充注册信息之外的所有状态数据
     };
     
-    let selectTitle = ["状态", "单位/个人名称", "变更前职位", "申请变更职位", "申请理由", "申请时间", "审核时间"];
+    let selectTitle = ["序号", "状态", "单位/个人名称", "变更前职位", "申请变更职位", "申请理由", "申请时间", "审核时间"];
     let selectConf = ["changeApplyType", "unitName", "name", "memberType", "beforeChange", "applyMemberLevel", "applyStr", "applyApplicationTime", "applyReviewTime"];
 
     let dbList = await find(TABLEENUM.用户表, selectParam, selectConf);
@@ -311,7 +311,7 @@ export async function outPutApply() {
     let dataConf = ["changeApplyType", "name", "beforeChange", "applyMemberLevel", "applyStr", "applyApplicationTime", "applyReviewTime"];
     for (let i = 0; i < dbList.length; i++) {
         let info = dbList[i];
-        let subList = [];
+        let subList = [ (i+1).toString() ];
         for (let i = 0; i < dataConf.length; i++) {
             let key = dataConf[i];
             let value = info[key] || "";
@@ -581,7 +581,7 @@ export async function infomationChangeLog({infoChangeId}) {
             let updateInfoStr = "";
             if (info[key] != userInfo[key]) {
                 if (!userInfo[key]) updateBeforeInfoStr = "修改前：-";
-                else updateBeforeInfoStr = `修改后：${userInfo[key]}`;
+                else updateBeforeInfoStr = `修改前：${userInfo[key]}`;
                 
                 if (!info[key]) updateInfoStr = "修改后：-";
                 else updateInfoStr = `修改后：${info[key]}`;

src/biz/member/examine.ts

@@ -9,7 +9,7 @@ import { addManyData } from "../../data/add";
 import { TABLEENUM } from "../../data/models/model";
 import { find, findCount, findOnce, findToSortToPage } from "../../data/select";
 import { updateOneData } from "../../data/update";
-import { generateSystemId, getMenberNum, getSessionByEdition, successResult } from "../../tools/system";
+import { generateSystemId, getEdition, getMenberNum, getSessionByEdition, successResult } from "../../tools/system";
 import { BizError } from "../../util/bizError";
 import { extractData } from "../../util/piecemeal";
 import { changeEnumValue } from "../../util/verificationEnum";
@@ -641,7 +641,7 @@ export async function outPutPendingReviewList({memberType, exportColumns}) {
         ];
     }
 
-    let selectTitle = [];
+    let selectTitle = ["序号"];
     let selectConf = [];
     exportColumns.forEach( info=> {
         if (info.key == "省市区") {
@@ -658,8 +658,8 @@ export async function outPutPendingReviewList({memberType, exportColumns}) {
     let addList = ["sheng", "shi", "qu"];
     
     let dataList = [selectTitle];
-    dbList.forEach(info => {
-        let subList = [];
+    dbList.forEach((info, index) => {
+        let subList = [ (index+1).toString() ];
         for (let i = 0; i < selectConf.length; i++) {
             let key = selectConf[i];
             let value = info[key] || "";
@@ -677,6 +677,7 @@ export async function outPutPendingReviewList({memberType, exportColumns}) {
                 else if (key == "nation") value = changeEnumValue(NATION, value);
                 else if (key == "education") value = changeEnumValue(EDUCATION, value);
                 else if (key == "profCategory") value = changeEnumValue(PROFCATEGORY, value);
+                else if (key == "session") value = getEdition(Math.floor(value/100), value%100 );
                 else if (addList.indexOf(key) != -1) value = getCityNameByCode(value);
             }
             subList.push(value);

src/biz/member/finance/costVerification.ts

@@ -279,7 +279,7 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState
         }
     } else findParam.confirmReceipt = {"$ne":RECEIPTCONFIRMATION.退回}
     
-    let selectTitle = [];
+    let selectTitle = ["序号"];
     let selectConf = [];
     exportColumns.forEach( info=> {
         selectTitle.push(info.key);
@@ -296,7 +296,7 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState
         let info = dbList[i];
         let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "session", "unitName", "documentId", "uscc", "mail", "memberLevel",  "phone"]);
         let orderInfo = await findOnceToSort(TABLEENUM.订单审批历史表, {orderId:info.id,operationBehavior:ORDEREXAMINE.用户提交, refundName:null}, {operationTime:-1}, ["operationTime"]);
-        let subList = [];
+        let subList = [ (i+1).toString() ];
         for (let i = 0; i < selectConf.length; i++) {
             let key = selectConf[i];
             let value = info[key] || "";

src/biz/member/finance/invoice.ts

@@ -330,7 +330,7 @@ export async function backInvoice({id}) {
         }
     }
 
-    let selectTitle = [];
+    let selectTitle = ["序号"];
     let selectConf = [];
     exportColumns.forEach( info=> {
         selectTitle.push(info.key);
@@ -348,7 +348,7 @@ export async function backInvoice({id}) {
         let info = dbList[i];
         let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "unitName", "documentId", "uscc", "mail", "memberLevel", "phone"]);
         let orderInfo = await findOnceToSort(TABLEENUM.订单审批历史表, {orderId:info.id,operationBehavior:ORDEREXAMINE.用户提交, refundName:null}, {operationTime:-1}, ["operationTime"]);
-        let subList = [];
+        let subList = [ (i+1).toString() ];
         for (let i = 0; i < selectConf.length; i++) {
             let key = selectConf[i];
             let value = info[key] || "";
@@ -582,7 +582,7 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
         invoiceStatus:INVOICESTATUS.已开发票
     };
 
-    let selectTitle = [];
+    let selectTitle = ["序号"];
     let selectConf = [];
     exportColumns.forEach( info=> {
         selectTitle.push(info.key);
@@ -600,7 +600,7 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
         let info = dbList[i];
         let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "unitName", "documentId", "uscc", "mail", "memberLevel", "phone"]);
         let orderInfo = await findOnceToSort(TABLEENUM.订单审批历史表, {orderId:info.id,operationBehavior:ORDEREXAMINE.已开票}, {operationTime:-1}, ["operationTime"]);
-        let subList = [];
+        let subList = [ (i+1).toString() ];
         for (let i = 0; i < selectConf.length; i++) {
             let key = selectConf[i];
             let value = info[key] || "";

src/biz/member/member.ts

@@ -419,7 +419,7 @@ export async function outPutIndividualMembers({exportColumns}) {
     // let selectConf = ["joinTime", "isInput", "memberState", "certificateType", "individualMemberType", "memberLevel", "isGracePeriod", "loginId", "phone", "mail", "name", "sex", "documentId",
     //  "documentType", "birth", "nation", "sheng", "shi", "qu", "addres", "education", "duties", "workTitle", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF", "profCategory", "unitName"];                                    
     
-    let selectTitle = [];
+    let selectTitle = ["序号"];
     let selectConf = [];
     exportColumns.forEach( info=> {
         if (info.key == "省市区") {
@@ -439,7 +439,7 @@ export async function outPutIndividualMembers({exportColumns}) {
 
     for (let i = 0; i < dbList.length; i++) {
         let info = dbList[i];
-        let subList = [];
+        let subList = [ (i+1).toString() ];
         for (let i = 0; i < selectConf.length; i++) {
             let key = selectConf[i];
             let value = info[key] || "";
@@ -492,7 +492,7 @@ export async function outPutUnitMembers({exportColumns}) {
     // let selectConf = ["joinTime", "isInput", "memberState", "certificateType", "individualMemberType", "memberLevel", "isGracePeriod", "loginId", "phone", "mail", "unitName", "uscc", 
     // "legalPerson", "legalPersonPhone", "legalPersonMail", "contactPerson", "contactPersonDuties", "phone", "uusinessLicenseUrl", "unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", "yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "yuanXiaoXueShengZongRenShu", "yuanXiaoJiaoZhiGongZongRenShu", "jiaoXueFuZeRenDianHua", "kaishezhuanYe", "danWeiJianJie"];                                    
     
-    let selectTitle = [];
+    let selectTitle = ["序号"];
     let selectConf = [];
     exportColumns.forEach( info=> {
         if (info.key == "省市区") {
@@ -511,7 +511,7 @@ export async function outPutUnitMembers({exportColumns}) {
 
     for (let i = 0; i < dbList.length; i++) {
         let info = dbList[i];
-        let subList = [];
+        let subList = [ (i+1).toString() ];
         for (let i = 0; i < selectConf.length; i++) {
             let key = selectConf[i];
             let value = info[key] || "";

src/biz/member/memberFees.ts

@@ -61,7 +61,7 @@ export async function outPutDataForExcel({type, exportColumns}) {
         selectParam.userRegisterState = USERREGISTERSTATE.通过
     }
     let selectFiles =["userId"];
-    let titleList = [];
+    let titleList = ["序号"];
     let valueKeyList = [];
     let isSelectOrder = false;
     exportColumns.forEach(info => {
@@ -78,7 +78,7 @@ export async function outPutDataForExcel({type, exportColumns}) {
     let dataList = [titleList];
     for (let i = 0; i < dbList.length; i++) {
         let info = dbList[i];
-        let subList = [];
+        let subList = [ (i+1).toString() ];
         let orderItemList = [];
         if (isSelectOrder) {
             orderItemList = await find(TABLEENUM.订单表, {userId:info.userId}, ["orderCycleStart", "money", "state"]);

src/biz/member/order.ts

@@ -701,7 +701,7 @@ export async function refundApprove({id, refundImgUrl}) {
         isReceive:ISRECEIVE.提供账户_zkh需退款_ykh
     };
 
-    let selectTitle = [];
+    let selectTitle = ["序号"];
     let selectConf = [];
     exportColumns.forEach( info=> {
         selectTitle.push(info.key);
@@ -717,7 +717,7 @@ export async function refundApprove({id, refundImgUrl}) {
         let info = dbList[i];
         let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["userId", "memberState", "name", "unitName", "memberLevel", "phone"]);
         if (!userInfo || !userInfo.userId) continue;
-        let subList = [];
+        let subList = [ (i+1).toString() ];
         for (let i = 0; i < selectConf.length; i++) {
             let key = selectConf[i];
             let value = info[key] || "";

src/biz/register.ts

@@ -457,7 +457,8 @@ export async function unitMemberNotSaved({form, keyanForm, id}) {
     eccEnumValue(EccFuncName, '单位会员类型', UNITMEMBERTYPE, form.unitMemberType);
 
     form.saveUnsubmitted = STATE.否;
-    await updateOneData(TABLEENUM.用户表, {userId:id, saveUnsubmitted:STATE.否}, form);
+    // await updateOneData(TABLEENUM.用户表, {userId:id, saveUnsubmitted:STATE.否}, form);
+    await updateOneData(TABLEENUM.用户表, {userId:id}, form);
 
     await deleteManyData(TABLEENUM.单位所获得科研成果表, {userId:id});
     let addList = [];

src/config/outPutConfig.ts

@@ -4,8 +4,10 @@
  * 待审核导出列-单位会员
  */
 export enum UNITAUDITINGCOLUMNS {
-    入会时间 = "joinTime",
+    状态 = "memberState",
     单位名称 = "unitName",
+    会员职务 = "memberLevel",
+    入会时间 = "joinTime",
     法人邮箱 = "legalPersonMail",
     主要负责人 = "yuanXiaoFuZeRen",
     科研负责人电话 = "yuanXiaoKeYanFuZeRenDianHua",
@@ -41,9 +43,7 @@ export enum UNITAUDITINGCOLUMNS {
     单位简介 = "danWeiJianJie",
     
     标签 = "lableId",
-    状态 = "memberState",
     届次 = "session",
-    会员职务 = "memberLevel"
 }
 
 
@@ -51,8 +51,10 @@ export enum UNITAUDITINGCOLUMNS {
  * 待审核导出列-个人会员
  */
 export enum AUDITINGCOLUMNS {
-    入会时间 = "joinTime",
+    状态 = "memberState",
     姓名 = "name",
+    会员职务 = "memberLevel",
+    入会时间 = "joinTime",
     手机号 = "phone",
     专业类别 = "profCategory",
     性别 = "sex",
@@ -68,9 +70,7 @@ export enum AUDITINGCOLUMNS {
     学历 = "education",
     职称 = "workTitle",
     标签 = "lableId",
-    状态 = "memberState",
     届次 = "session",
-    会员职务 = "memberLevel",
     会员级别 = "individualMemberType"
 }
 
@@ -151,8 +151,8 @@ export enum INVOICEDCOLUMNS {
  */
 export enum REFUNDCOLUMNS {
     "退款状态" = "state",
-    会员类别 = "memberCategory",
     "单位/个人名称" = "name",
+    会员类别 = "memberCategory",
     所缴周期 = "orderCycle",
     退款金额 = "money",
     退款账号 = "refundBankCarId",
@@ -165,10 +165,10 @@ export enum REFUNDCOLUMNS {
 //会费管理-未缴费
 export enum MEMBERFEESDCOLUMNS {
     状态 = "memberState",
+    "单位/个人名称" = "name" ,
     会员类别 = "memberType",
     手机号 ="phone",
     "单位代码/身份证"="code",
-    "单位/个人名称" = "name" ,
     会员职务 = "memberLevel",
     入会时间 = "joinTime",
     缴费金额 = "Money",
@@ -180,10 +180,10 @@ export enum MEMBERFEESDCOLUMNS {
 //会费管理-已缴费、缴费期
 export enum MEMBERPAYMENTCOLUMNS {
     状态 = "memberState",
+    "单位/个人名称" = "name" ,
     会员类别 = "memberType",
     手机号 ="phone",
     "单位代码/身份证"="code",
-    "单位/个人名称" = "name" ,
     会员职务 = "memberLevel",
     入会时间 = "joinTime",
     缴费金额 = "Money",

src/routers/member/router.ts

@@ -120,6 +120,7 @@ export const Config = {
                         legalPersonMail:{type:'String', desc:'法人邮箱', notMustHave:false},
                         // unitMail:{type:'String', desc:'单位电子邮箱', notMustHave:false},  2024.4.22日的需求 去掉
                         contactPerson:{type:'String', desc:'日常联系人', notMustHave:false},
+                        mail:{type:"String", desc:'日常联系人邮箱', notMustHave:false},
                         contactPersonDuties:{type:'String', desc:'日常联系人职务', notMustHave:false},
                         phone:{type:'String', desc:'日常联系人手机', notMustHave:false},
                         uusinessLicenseUrl:{type:'String', desc:'营业执照复印件', notMustHave:false},
@@ -237,6 +238,7 @@ export const Config = {
                         legalPersonPhone:{type:'String', desc:'法人联系电话', notMustHave:true},
                         legalPersonMail:{type:'String', desc:'法人邮箱', notMustHave:true},
                         contactPerson:{type:'String', desc:'日常联系人', notMustHave:true},
+                        mail:{type:"String", desc:'日常联系人邮箱', notMustHave:false},
                         contactPersonDuties:{type:'String', desc:'日常联系人职务', notMustHave:true},
                         phone:{type:'String', desc:'日常联系人手机', notMustHave:true},
                         uusinessLicenseUrl:{type:'String', desc:'营业执照复印件', notMustHave:true},