Commit c71c7013 by lixinming

no message

parent 49e4b283
...@@ -266,6 +266,7 @@ export async function backInvoice({id}) { ...@@ -266,6 +266,7 @@ export async function backInvoice({id}) {
let updateInfo:any = { let updateInfo:any = {
invoiceStatus : INVOICESTATUS.退回, invoiceStatus : INVOICESTATUS.退回,
advanceInvoice:false,
}; };
if (orderInfo.state == ORDERSTATE.已支付 ) updateInfo.confirmReceipt = RECEIPTCONFIRMATION.待确认 if (orderInfo.state == ORDERSTATE.已支付 ) updateInfo.confirmReceipt = RECEIPTCONFIRMATION.待确认
await updateOneData(TABLEENUM.订单表, {id}, updateInfo); await updateOneData(TABLEENUM.订单表, {id}, updateInfo);
...@@ -347,11 +348,7 @@ export async function applicationInvoice({id}) { ...@@ -347,11 +348,7 @@ export async function applicationInvoice({id}) {
if (orderInfo.invoiceStatus == INVOICESTATUS.退回) throw new BizError(ERRORENUM.请求已被退回请重新申请); if (orderInfo.invoiceStatus == INVOICESTATUS.退回) throw new BizError(ERRORENUM.请求已被退回请重新申请);
let updateInfo:any = {invoiceStatus:INVOICESTATUS.未开发票}; let updateInfo:any = {invoiceStatus:INVOICESTATUS.未开发票};
if (orderInfo.state == ORDERSTATE.已支付) { if (orderInfo.state != ORDERSTATE.已支付) updateInfo.advanceInvoice = true;
updateInfo.advanceInvoice = false;
} else {
updateInfo.advanceInvoice = true;
}
await updateOneData(TABLEENUM.订单表, {id}, updateInfo); await updateOneData(TABLEENUM.订单表, {id}, updateInfo);
...@@ -368,11 +365,8 @@ export async function reapplyInvoice({id}) { ...@@ -368,11 +365,8 @@ export async function reapplyInvoice({id}) {
if (orderInfo.invoiceStatus != INVOICESTATUS.退回) throw new BizError(ERRORENUM.不满足重新请求条件); if (orderInfo.invoiceStatus != INVOICESTATUS.退回) throw new BizError(ERRORENUM.不满足重新请求条件);
let updateInfo:any = {invoiceStatus:INVOICESTATUS.未开发票}; let updateInfo:any = {invoiceStatus:INVOICESTATUS.未开发票};
if (orderInfo.state == ORDERSTATE.已支付) { if (orderInfo.state != ORDERSTATE.已支付) updateInfo.advanceInvoice = true;
updateInfo.advanceInvoice = false;
} else {
updateInfo.advanceInvoice = true;
}
await updateOneData(TABLEENUM.订单表, {id}, updateInfo); await updateOneData(TABLEENUM.订单表, {id}, updateInfo);
return successResult(); return successResult();
......
...@@ -457,7 +457,7 @@ const ModelArray = [ ...@@ -457,7 +457,7 @@ const ModelArray = [
firstPayExamine:{type:'Boolean', default:false},//首次订单的审批开关【待支付页审批开关】 firstPayExamine:{type:'Boolean', default:false},//首次订单的审批开关【待支付页审批开关】
confirmReceipt:{type:'Number', default:RECEIPTCONFIRMATION.待确认},//收款确认【财务核对页收款确认】 confirmReceipt:{type:'Number', default:RECEIPTCONFIRMATION.待确认},//收款确认【财务核对页收款确认】
invoiceStatus:{type:'Number', default:INVOICESTATUS.不具备开票条件, index:true},//发票状态 枚举 INVOICESTATUS 【待开发票页上传发票之后更新状态】 invoiceStatus:{type:'Number', default:INVOICESTATUS.不具备开票条件, index:true},//发票状态 枚举 INVOICESTATUS 【待开发票页上传发票之后更新状态】
advanceInvoice:{type:'Boolean', default:false},//是否提开票 【个人列表页提交开发票按钮】 advanceInvoice:{type:'Boolean', default:false},//是否提开票 【个人列表页提交开发票按钮】
newUnitName:'String',//单位名称,新发票抬头【变更发票抬头使用】 newUnitName:'String',//单位名称,新发票抬头【变更发票抬头使用】
newUscc:'String',//新统一信用代码【变更发票信用代码使用】 newUscc:'String',//新统一信用代码【变更发票信用代码使用】
ct:'Number',//订单创建时间 ct:'Number',//订单创建时间
......
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