Skip to content

Z
zhichan
Commit 4c3e413c by 王昆
Options

gsb

parent 7fb04306
Showing with 26 additions and 19 deletions
xgg-admin/app/base/service/impl/invoice/invoiceSve.js
...@@ -146,15 +146,15 @@ class InvoiceService extends ServiceBase { ...@@ -146,15 +146,15 @@ class InvoiceService extends ServiceBase {
invoice.invoiceAmount = Number(invoice.invoiceAmt); invoice.invoiceAmount = Number(invoice.invoiceAmt);
invoice.invoiceTime = this.trim(invoice.invoiceTime); invoice.invoiceTime = this.trim(invoice.invoiceTime);
invoice.businessmenCreditCode = this.trim(invoice.businessmenCreditCode); invoice.businessmenCreditCode = this.trim(invoice.businessmenCreditCode);
invoice.businessmenType=this.trim(invoice.businessmenType) || "10"; invoice.businessmenType = this.trim(invoice.businessmenType) || "10";
invoice.serviceRate = signInfo.serviceRate; invoice.ruleCode = this.trim(invoice.ruleCode) || "10";
invoice.ruleCode=this.trim(invoice.ruleCode) || "10";
invoice.perCalWay = signInfo.taxUpType; // TODO 确定值 invoice.perCalWay = signInfo.taxUpType; // TODO 确定值
invoice.valCalWay = signInfo.addValueUpType; // TODO 确定值 invoice.valCalWay = signInfo.addValueUpType; // TODO 确定值
invoice.businessmenId = signInfo.id; invoice.businessmenId = signInfo.id;
invoice.taxCostPriRat = signInfo.costRate; invoice.serviceRate = system.f2y(signInfo.serviceRate);
invoice.taxIncPriRat = signInfo.taxRate; invoice.taxCostPriRat = system.f2y(signInfo.costRate);
invoice.taxIncPriRat = system.f2y(signInfo.taxRate);
if (invoice.type == 1) { if (invoice.type == 1) {
invoice.perIncTaxRange = JSON.parse(signInfo.specialTaxLadder); invoice.perIncTaxRange = JSON.parse(signInfo.specialTaxLadder);
invoice.valAddTaxRange = JSON.parse(signInfo.specialOtherLadder); invoice.valAddTaxRange = JSON.parse(signInfo.specialOtherLadder);
...@@ -169,10 +169,10 @@ class InvoiceService extends ServiceBase { ...@@ -169,10 +169,10 @@ class InvoiceService extends ServiceBase {
if (rs.status == 0 && rs.data) { if (rs.status == 0 && rs.data) {
var calcRs = rs.data; var calcRs = rs.data;
calc.code = 1; calc.code = 1;
calc.incomeTax = Number((calcRs.personalIncomeTax || 0)).toFixed(0); calc.incomeTax = Number(calcRs.personalIncomeTax || 0).toFixed(0);
calc.addedValueTax = Number((calcRs.valueAddedTax || 0)).toFixed(0); calc.addedValueTax = Number(calcRs.valueAddedTax || 0).toFixed(0);
calc.serviceTax = Number((calcRs.serviceCharge || 0)).toFixed(0); calc.serviceTax = Number(calcRs.serviceCharge || 0).toFixed(0);
calc.specialTax = Number((calcRs.additionalTax || 0)).toFixed(0); calc.specialTax = Number(calcRs.additionalTax || 0).toFixed(0);
calc.warning = this.trim(calcRs.warning); calc.warning = this.trim(calcRs.warning);
calc.monthAmt = 0; calc.monthAmt = 0;
calc.msg = "success"; calc.msg = "success";
...@@ -191,7 +191,7 @@ class InvoiceService extends ServiceBase { ...@@ -191,7 +191,7 @@ class InvoiceService extends ServiceBase {
return system.getResultSuccess(result); return system.getResultSuccess(result);
} }
async apiVerificationAndCalculation(pobj){ async apiVerificationAndCalculation(pobj) {
pobj.serviceRate = Number(pobj.serviceRate) * 100; pobj.serviceRate = Number(pobj.serviceRate) * 100;
pobj.taxIncPriRat = Number(pobj.taxIncPriRat) * 100; pobj.taxIncPriRat = Number(pobj.taxIncPriRat) * 100;
pobj.taxCostPriRat = Number(pobj.taxCostPriRat) * 100; pobj.taxCostPriRat = Number(pobj.taxCostPriRat) * 100;
...@@ -282,6 +282,7 @@ class InvoiceService extends ServiceBase { ...@@ -282,6 +282,7 @@ class InvoiceService extends ServiceBase {
invoice.invoiceTime = this.trim(invoice.invoiceTime); invoice.invoiceTime = this.trim(invoice.invoiceTime);
invoice.businessmenCreditCode = this.trim(invoice.businessmenCreditCode); invoice.businessmenCreditCode = this.trim(invoice.businessmenCreditCode);
// 开票内容 // 开票内容
if (signInfo.invoicecontents && signInfo.invoicecontents.length > 0) { if (signInfo.invoicecontents && signInfo.invoicecontents.length > 0) {
invoice.invoiceContent = signInfo.invoicecontents[0].invoicecontentName; invoice.invoiceContent = signInfo.invoicecontents[0].invoicecontentName;
...@@ -294,18 +295,24 @@ class InvoiceService extends ServiceBase { ...@@ -294,18 +295,24 @@ class InvoiceService extends ServiceBase {
invoice.contract = ""; invoice.contract = "";
invoice.applyNo = invoice.applyNo; invoice.applyNo = invoice.applyNo;
invoice.serviceRate = signInfo.serviceRate;
invoice.perCalWay = signInfo.taxUpType; invoice.perCalWay = signInfo.taxUpType;
invoice.valCalWay = signInfo.addValueUpType; invoice.valCalWay = signInfo.addValueUpType;
// 销售方信息 // 销售方信息
invoice.businessmenType = this.trim(invoice.businessmenType) || "10";
invoice.ruleCode = this.trim(invoice.ruleCode) || "10";
invoice.businessmenId = signInfo.id; invoice.businessmenId = signInfo.id;
invoice.businessName = signInfo.name; invoice.businessName = signInfo.name;
invoice.isBank = signInfo.isBank; invoice.isBank = signInfo.isBank;
invoice.taxAuthorities = signInfo.taxOrg; invoice.taxAuthorities = signInfo.taxOrg;
invoice.taxCostPriRat = signInfo.costRate; // invoice.taxCostPriRat = signInfo.costRate;
invoice.taxIncPriRat = signInfo.taxRate; // invoice.taxIncPriRat = signInfo.taxRate;
invoice.serviceRate = system.f2y(signInfo.serviceRate);
invoice.taxCostPriRat = system.f2y(signInfo.costRate);
invoice.taxIncPriRat = system.f2y(signInfo.taxRate);
if (invoice.type == 1) { if (invoice.type == 1) {
invoice.perIncTaxRange = JSON.parse(signInfo.specialTaxLadder); invoice.perIncTaxRange = JSON.parse(signInfo.specialTaxLadder);
invoice.valAddTaxRange = JSON.parse(signInfo.specialOtherLadder); invoice.valAddTaxRange = JSON.parse(signInfo.specialOtherLadder);
...@@ -495,14 +502,14 @@ class InvoiceService extends ServiceBase { ...@@ -495,14 +502,14 @@ class InvoiceService extends ServiceBase {
* 试算 * 试算
* @param {*} pobj * @param {*} pobj
*/ */
async apiCalcInvoice(pobj) { async apiCalcInvoice2(pobj) {
pobj.serviceRate = Number(pobj.serviceRate) * 100; pobj.serviceRate = Number(pobj.serviceRate || 0) * 100;
pobj.taxIncPriRat = Number(pobj.taxIncPriRat) * 100; pobj.taxIncPriRat = Number(pobj.taxIncPriRat || 0) * 100;
pobj.taxCostPriRat = Number(pobj.taxCostPriRat) * 100; pobj.taxCostPriRat = Number(pobj.taxCostPriRat || 0) * 100;
pobj.invoiceAmount = system.y2f(pobj.invoiceAmount); pobj.invoiceAmount = system.y2f(pobj.invoiceAmount || 0);
var rs = await this.callms("invoice", "calcInvoice", pobj); var rs = await this.callms("invoice", "verificationAndCalculation", pobj);
if (rs.status == 0) { if (rs.status == 0) {
return rs return rs
} 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