diff --git a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js
index 86e152edb7..cbed3d1db6 100644
--- a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js
+++ b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js
@@ -98,6 +98,13 @@ export default {
method: 'get'
})
},
+ createPdf: function(data) {
+ return request({
+ url: '/scm/v1/scmvehrebatecheckapply/createPdf',
+ method: 'post',
+ params: data
+ })
+ },
// 提交流程
submitVehicleApply: function(params) {
return request({
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
index 5a2f855c92..29230fbdbb 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
@@ -59,8 +59,8 @@
-
- 查看
+
+ 查看
@@ -79,8 +79,8 @@
-
- 查看
+
+ 查看
@@ -299,24 +299,27 @@ export default {
dataDelete(index) {
this.formobj.baseVehinstallModpricedetails.splice(index, 1)
},
- handleLook() {
+ handleLook(row) {
this.viewState = 3
- this.$refs['divAdd'].showInfo(this.formobj.sid, this.formobj.scmVehrebateCheckapplydetailList)
+ this.$refs['divAdd'].showInfo(row.vehRebateSids)
},
backAdd(val) {
this.viewState = 1
// 先将数据清空
this.formobj.scmWhenVehrebateCheckapplydetailDetails = []
this.formobj.scmLastVehrebateCheckapplydetailDetails = []
- this.formobj.scmVehrebateCheckapplydetailList = []
var list = JSON.parse(JSON.stringify(val))
// 同一数据源
- list.forEach((e) => {
- this.formobj.scmVehrebateCheckapplydetailList.push(e)
- })
+ for (var n = 0; n < list.length; n++) {
+ for (var m = 0; m < this.formobj.scmVehrebateCheckapplydetailList.length; m++) {
+ if (list[n] === this.formobj.scmVehrebateCheckapplydetailList[m].sid) {
+ this.formobj.scmVehrebateCheckapplydetailList.splice(this.formobj.scmVehrebateCheckapplydetailList[m], 1)
+ }
+ }
+ }
// 将同一数据源进行拆分(1.按照返利类型统计 2.按照预提年月统计)
// 按照返利类型统计
- list.forEach((e) => {
+ this.formobj.scmVehrebateCheckapplydetailList.forEach((e) => {
let v = 0
for (var i in this.formobj.scmWhenVehrebateCheckapplydetailDetails) {
if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].brandName === e.brandName) {
@@ -358,7 +361,7 @@ export default {
})
let k = 0
// 按照预提年月统计
- list.forEach((s) => {
+ this.formobj.scmVehrebateCheckapplydetailList.forEach((s) => {
for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)
@@ -446,13 +449,13 @@ export default {
return
}
const values = data.map(item => Number(item[column.property]))
- if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue') {
+ if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue' && column.property !== undefined) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
- return prev + curr
+ return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else {
- return prev
+ return Math.round((parseFloat(prev)) * 100) / 100
}
}, 0)
sums[index] += ''
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
index 85f949c9db..1809ecbc08 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
@@ -8,7 +8,7 @@
导出
- 下载
+ 下载
关闭
@@ -98,6 +98,7 @@