Skip to content

Z
zhichan
Commit e4b92e86 by 王昆
Options

gsb

parent b55c36e6
Showing with 15 additions and 11 deletions
xgg-admin/app/base/controller/impl/business/businessmenCtl.js
...@@ -45,18 +45,20 @@ class BusinessmenCtl extends CtlBase { ...@@ -45,18 +45,20 @@ class BusinessmenCtl extends CtlBase {
async sign(pobj, pobj2, req) { async sign(pobj, pobj2, req) {
var params = { var params = {
id: pobj.id, id: pobj.id,
taxUpType: pobj.taxUpType, taxUpType: pobj.taxUpType || 0,
addValueUpType: pobj.addValueUpType, addValueUpType: pobj.addValueUpType,
costRate: system.y2f(pobj.costRate), costRate: system.y2f(pobj.costRate || 0),
taxRate: system.y2f(pobj.taxRate), taxRate: system.y2f(pobj.taxRate),
serviceRate: system.y2f(pobj.serviceRate), serviceRate: system.y2f(pobj.serviceRate),
serviceBeginTime: pobj.serviceBeginTime,
serviceEndTime: pobj.serviceEndTime,
signNotes: this.trim(pobj.signNotes), signNotes: this.trim(pobj.signNotes),
commonTaxLadder: JSON.stringify(pobj.commonTaxLadder), commonTaxLadder: JSON.stringify(pobj.commonTaxLadder || []),
commonOtherLadder: JSON.stringify(pobj.commonOtherLadder), commonOtherLadder: JSON.stringify(pobj.commonOtherLadder || []),
specialTaxLadder: JSON.stringify(pobj.specialTaxLadder), specialTaxLadder: JSON.stringify(pobj.specialTaxLadder || []),
specialOtherLadder: JSON.stringify(pobj.specialOtherLadder), specialOtherLadder: JSON.stringify(pobj.specialOtherLadder || []),
invoicecontents: pobj.invoicecontents, invoicecontents: pobj.invoicecontents,
} }
try { try {
......
xgg-admin/app/base/service/impl/business/businessmenSve.js
...@@ -164,7 +164,7 @@ class BusinessmenService extends ServiceBase { ...@@ -164,7 +164,7 @@ class BusinessmenService extends ServiceBase {
continue; continue;
} }
try { try {
row[f] = JSON.parse(row[f]); row[f] = JSON.parse(row[f] || "[]");
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
......
xgg-admin/app/front/entry/public/apidoc/business/businessmen.md
...@@ -217,14 +217,16 @@ ...@@ -217,14 +217,16 @@
{ {
"id" : "12797237916000358", // 个体户id "id" : "12797237916000358", // 个体户id
"taxUpType":"10", // 个税累计 "taxUpType":"10", // 个税累计 - -!这个字段改没了
"addValueUpType":"" // 增值税累计 "addValueUpType":"" // 增值税累计
"costRate":"1122", // 核定成本费用率 "costRate":"1122", // 核定成本费用率 - -!这个字段改没了
"taxRate" : "", // 含税价百分比 "taxRate" : "", // 含税价百分比
"serviceRate" : "", // 服务费百分比 "serviceRate" : "", // 服务费百分比
"serviceBeginTime" : "2019-12-05", // 服务开始时间 ------- 改版新增字段
"serviceEndTime" : "2020-12-05", // 服务结束时间 ------- 改版新增字段
"signNotes":" 12qwdwqd", // 签约备注 "signNotes":" 12qwdwqd", // 签约备注
"commonTaxLadder": [ // 普票个税梯度 "commonTaxLadder": [ // 普票个税梯度 - -!这个字段改没了
{ {
"minValue": 0, // 区间最小值 "minValue": 0, // 区间最小值
"rate": "0", // 税率 "rate": "0", // 税率
...@@ -241,7 +243,7 @@ ...@@ -241,7 +243,7 @@
}, },
], ],
"specialTaxLadder": [ // 专票个税梯度 "specialTaxLadder": [ // 专票个税梯度 - -!这个字段改没了
{ {
"minValue": 0, // 区间最小值 "minValue": 0, // 区间最小值
"rate": "0", // 税率 "rate": "0", // 税率
......
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