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 ccc8febec6..100d8beb74 100644
--- a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js
+++ b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js
@@ -10,6 +10,15 @@ export default {
headers: { 'Content-Type': 'application/json' }
})
},
+ // 单车返利核对（待核对）查询不分页数据
+ checkApplyGetVehRebateAll: function(data) {
+ return request({
+ url: '/scm/v1/scmvehrebate/checkApplyGetVehRebateAll',
+ method: 'post',
+ data: data,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
// 一次导出
excelListOne: function(data) {
return request({
diff --git a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js
index 63362654dd..cc6a96e18c 100644
--- a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js
+++ b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js
@@ -1,7 +1,7 @@
import request from '@/utils/request'
export default {
- // 单车返利核对（待核对）查询分页列表
+ // 专项返利核对（待核对）查询分页列表
listPage: function(data) {
return request({
url: '/scm/v1/scmspecialrebate/checkApplyGetSpecialRebate',
@@ -10,6 +10,15 @@ export default {
headers: { 'Content-Type': 'application/json' }
})
},
+ // 专项返利核对（待核对）查询不分页
+ checkApplyGetSpecialRebateAll: function(data) {
+ return request({
+ url: '/scm/v1/scmspecialrebate/checkApplyGetSpecialRebateAll',
+ method: 'post',
+ data: data,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
// 一次导出
excelListOne: function(data) {
return request({
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
index 5722faf4b5..dc911326db 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
@@ -57,8 +57,8 @@
-
-
+
+
@@ -84,8 +84,8 @@
-
+
@@ -410,6 +410,7 @@ export default {
// 查询条件 -----------
tableKey: 0,
list: [],
+ listAll: [],
sids: [],
FormLoading: false,
state_list: [
@@ -549,6 +550,13 @@ export default {
this.listQuery.total = 0
}
})
+ req.checkApplyGetVehRebateAll(this.listQuery.params).then((res) => {
+ if (res.success) {
+ this.listAll = res.data
+ } else {
+ this.listAll = []
+ }
+ })
},
// 查询按钮
handleFilter() {
@@ -783,6 +791,33 @@ export default {
this.uploadData.orgPath = ''
this.getList()
}
+ },
+ // 合计
+ getSummaries(param) {
+ param.data = this.listAll
+ const { columns, data } = param
+ const sums = []
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '合计'
+ return
+ }
+ const values = data.map(item => Number(item[column.property]))
+ if (column.property === 'manufactorSettlementPrice' || column.property === 'freight' || column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney') {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
+ } else {
+ return Math.round((parseFloat(prev)) * 100) / 100
+ }
+ }, 0)
+ sums[index] += ''
+ } else {
+ sums[index] = ''
+ }
+ })
+ return sums
}
}
}
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
index 29c09866a9..bcca43b973 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
@@ -56,8 +56,8 @@
-
-
+
+
@@ -79,8 +79,8 @@
-
+
@@ -395,6 +395,7 @@ export default {
// 查询条件 -----------
tableKey: 0,
list: [],
+ listAll: [],
sids: [],
FormLoading: false,
rebateType_list: [],
@@ -546,6 +547,13 @@ export default {
this.listQuery.total = 0
}
})
+ req.checkApplyGetSpecialRebateAll(this.listQuery.params).then((res) => {
+ if (res.success) {
+ this.listAll = res.data
+ } else {
+ this.listAll = []
+ }
+ })
},
// 查询按钮
handleFilter() {
@@ -779,6 +787,33 @@ export default {
this.uploadData.orgPath = ''
this.getList()
}
+ },
+ // 合计
+ getSummaries(param) {
+ param.data = this.listAll
+ const { columns, data } = param
+ const sums = []
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '合计'
+ return
+ }
+ const values = data.map(item => Number(item[column.property]))
+ if (column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney') {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
+ } else {
+ return Math.round((parseFloat(prev)) * 100) / 100
+ }
+ }, 0)
+ sums[index] += ''
+ } else {
+ sums[index] = ''
+ }
+ })
+ return sums
}
}
}