Skip to content

W
wenHuaBu_adminServer
Commit 935d61c0 by lixinming
Options

Merge branch 'master' of http://123.207.147.179:8888/node_server/wenHuaBu_adminServer

parents 08813c85 0450ef70
Showing with 81 additions and 70 deletions
src/biz/member/finance/costVerification.ts
...@@ -311,29 +311,34 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState ...@@ -311,29 +311,34 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState
for (let i = 0; i < selectConf.length; i++) { for (let i = 0; i < selectConf.length; i++) {
let key = selectConf[i]; let key = selectConf[i];
let value = info[key] || ""; let value = info[key] || "";
if (userInfo) {
if (key == "memberCategory") { if (key == "memberCategory") {
if (info.memberCategory == MEMBERTYPE.个人会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.individualMemberType); if (info.memberCategory == MEMBERTYPE.个人会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.individualMemberType);
else if (info.memberCategory == MEMBERTYPE.单位会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.unitMemberType); else if (info.memberCategory == MEMBERTYPE.单位会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.unitMemberType);
} }
if (key == "name") { if (key == "name") {
if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name; if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name;
else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName; else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName;
} }
if (key == "card") { if (key == "card") {
if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.documentId; if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.documentId;
else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.uscc; else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.uscc;
} }
if (key == "mail") { if (key == "mail") {
value = userInfo.mail; value = userInfo.mail;
}
if (key == "phone") {
value = userInfo.phone;
}
if (key == "memberLevel") {
value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
}
if (key == "session") {
value = getEdition(Math.floor(userInfo.session/100), userInfo.session%100 );
}
} }
if (key == "phone") {
value = userInfo.phone;
}
if (key == "memberLevel") {
value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
}
if (key == "operationTime") { if (key == "operationTime") {
if (orderInfo && orderInfo.operationTime) value = moment(orderInfo.operationTime).format("YYYY-MM-DD"); if (orderInfo && orderInfo.operationTime) value = moment(orderInfo.operationTime).format("YYYY-MM-DD");
else value = "-" else value = "-"
...@@ -343,9 +348,7 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState ...@@ -343,9 +348,7 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState
value = "-"; value = "-";
} }
} }
if (key == "session") {
value = getEdition(Math.floor(userInfo.session/100), userInfo.session%100 );
}
if (key == "confirmReceipt") { if (key == "confirmReceipt") {
value = value == RECEIPTCONFIRMATION.收款确认 ? "已审批" : "待审批"; value = value == RECEIPTCONFIRMATION.收款确认 ? "已审批" : "待审批";
} }
......
src/biz/member/finance/invoice.ts
...@@ -354,28 +354,30 @@ export async function backInvoice({id}) { ...@@ -354,28 +354,30 @@ export async function backInvoice({id}) {
for (let i = 0; i < selectConf.length; i++) { for (let i = 0; i < selectConf.length; i++) {
let key = selectConf[i]; let key = selectConf[i];
let value = info[key] || ""; let value = info[key] || "";
if (userInfo) {
if (key == "memberCategory") { if (key == "memberCategory") {
if (info.memberCategory == MEMBERTYPE.个人会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.individualMemberType); if (info.memberCategory == MEMBERTYPE.个人会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.individualMemberType);
else if (info.memberCategory == MEMBERTYPE.单位会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.unitMemberType); else if (info.memberCategory == MEMBERTYPE.单位会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.unitMemberType);
} }
if (key == "name") { if (key == "name") {
if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name; if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name;
else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName; else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName;
} }
if (key == "card") { if (key == "card") {
if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.documentId; if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.documentId;
else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.uscc; else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.uscc;
} }
if (key == "mail") { if (key == "mail") {
value = userInfo.mail; value = userInfo.mail;
} }
if (key == "phone") { if (key == "phone") {
value = userInfo.phone; value = userInfo.phone;
} }
if (key == "memberLevel") { if (key == "memberLevel") {
value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel); value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
}
} }
if (key == "operationTime") { if (key == "operationTime") {
if (orderInfo && orderInfo.operationTime) value = moment(orderInfo.operationTime).format("YYYY-MM-DD"); if (orderInfo && orderInfo.operationTime) value = moment(orderInfo.operationTime).format("YYYY-MM-DD");
else value = "-" else value = "-"
...@@ -613,23 +615,26 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine ...@@ -613,23 +615,26 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
for (let i = 0; i < selectConf.length; i++) { for (let i = 0; i < selectConf.length; i++) {
let key = selectConf[i]; let key = selectConf[i];
let value = info[key] || ""; let value = info[key] || "";
if (key == "name") { if (userInfo) {
if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name; if (key == "name") {
else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName; if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name;
} else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName;
if (key == "card") { }
if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.documentId; if (key == "card") {
else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.uscc; if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.documentId;
} else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.uscc;
if (key == "mail") { }
value = userInfo.mail; if (key == "mail") {
} value = userInfo.mail;
if (key == "phone") { }
value = userInfo.phone; if (key == "phone") {
} value = userInfo.phone;
if (key == "memberLevel") { }
value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel); if (key == "memberLevel") {
value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
}
} }
if (key == "operationTime") { if (key == "operationTime") {
if (orderInfo && orderInfo.operationTime) value = moment(orderInfo.operationTime).format("YYYY-MM-DD"); if (orderInfo && orderInfo.operationTime) value = moment(orderInfo.operationTime).format("YYYY-MM-DD");
else value = "-" else value = "-"
......
src/biz/member/order.ts
...@@ -724,16 +724,19 @@ export async function refundApprove({id, refundImgUrl}) { ...@@ -724,16 +724,19 @@ export async function refundApprove({id, refundImgUrl}) {
for (let i = 0; i < selectConf.length; i++) { for (let i = 0; i < selectConf.length; i++) {
let key = selectConf[i]; let key = selectConf[i];
let value = info[key] || ""; let value = info[key] || "";
if (key == "name") { if (userInfo) {
if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name; if (key == "name") {
else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName; if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name;
} else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName;
if (key == "phone") { }
value = userInfo.phone; if (key == "phone") {
} value = userInfo.phone;
if (key == "memberLevel") { }
value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel); if (key == "memberLevel") {
value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
}
} }
if (key == "state") { if (key == "state") {
if (!info.isReplenishReturnInfo) value = "资料补充中"; if (!info.isReplenishReturnInfo) value = "资料补充中";
else { else {
......
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