-
{{ formobj.checkApply }}单车返利核对审核申请
+
{{ formobj.checkApply }}单车返利上传核对审核申请
@@ -35,7 +35,7 @@
-
本月各项返利核对情况
+
本月上传核对情况(按返利类型统计)
@@ -81,13 +81,13 @@
-
预提返利本月核对情况
+
本月上传核对情况(按预提年月统计)
往月核对情况
- {{ scope.row.palceGenDate }}
+ {{ scope.row.withholdingDate }}
@@ -245,7 +245,7 @@ export default {
newDate() {
let date = new Date()
let year = date.getFullYear() // 年
- let month = date.getMonth() + 1 // 月
+ let month = date.getMonth() // 月
this.formobj.checkApply = year + '年' + month + '月'
},
init() {
@@ -358,7 +358,7 @@ export default {
}
let v = 0
for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
- if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].palceGenDate === bval.palceGenDate) {
+ if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === bval.withholdingDate) {
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingAmount = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingAmount) + parseInt(1)
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadAmount = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadAmount) + parseInt(1)
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate) + parseInt(bval.withRebate)
@@ -373,7 +373,7 @@ export default {
}
if (v === 0) {
this.formobj.scmLastVehrebateCheckapplydetailDetails.push({
- palceGenDate: bval.palceGenDate,
+ withholdingDate: bval.withholdingDate,
withholdingAmount: 1,
uploadAmount: 1,
withRebate: bval.withRebate,
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue
index c7201f2b0a..a00cc92576 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue
@@ -238,7 +238,7 @@ export default {
const aa = []
const bb = []
row.forEach((element) => {
- if (element.palceGenDateCopy === dateTime) {
+ if (element.withholdingDateCopy === dateTime) {
aa.push({
sid: element.sid,
rebateTypeValue: element.rebateTypeValue,
@@ -254,7 +254,7 @@ export default {
} else {
bb.push({
sid: element.sid,
- palceGenDate: element.palceGenDateCopy,
+ withholdingDate: element.withholdingDateCopy,
withRebate: element.estimateRebate,
uploadMoney: element.uploadMoney,
stayDetermineMoney: element.stayDetermineMoney,
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue
index a75511327a..a34baf6c02 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue
@@ -55,9 +55,9 @@
{{ scope.row.brandName }}
-
+
- {{ scope.row.withApply }}
+ {{ scope.row.withApply }}单车返利预提申请
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
index 2fa14d6fba..6b434311cb 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
@@ -143,8 +143,9 @@ export default {
// 获取日期
newDate() {
let date = new Date()
+ console.log(date.getMonth(), 99999)
let year = date.getFullYear() // 年
- let month = date.getMonth() + 1 // 月
+ let month = date.getMonth() // 月
this.formobj.withApply = year + '年' + month + '月'
},
showAdd(createOrgSid) {
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
index e3fc146479..ba2cd38abe 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
@@ -86,7 +86,7 @@
- {{ scope.row.palceGenDate }}
+ {{ scope.row.withholdingDate }}
@@ -353,7 +353,7 @@ export default {
}
let v = 0
for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
- if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].palceGenDate === bval.palceGenDate) {
+ if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === bval.withholdingDate) {
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingAmount = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingAmount) + parseInt(1)
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadAmount = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadAmount) + parseInt(1)
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate) + parseInt(bval.withRebate)
@@ -368,7 +368,7 @@ export default {
}
if (v === 0) {
this.formobj.scmLastVehrebateCheckapplydetailDetails.push({
- palceGenDate: bval.palceGenDate,
+ withholdingDate: bval.withholdingDate,
withholdingAmount: 1,
uploadAmount: 1,
withRebate: bval.withRebate,
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/yiheduidanchefanli.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/yiheduidanchefanli.vue
index c4d73b0dfe..e0dcd0e9e6 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/yiheduidanchefanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/yiheduidanchefanli.vue
@@ -238,7 +238,7 @@ export default {
const aa = []
const bb = []
row.forEach((element) => {
- if (element.palceGenDateCopy === dateTime) {
+ if (element.withholdingDateCopy === dateTime) {
aa.push({
sid: element.sid,
rebateTypeValue: element.rebateTypeValue,
@@ -254,7 +254,7 @@ export default {
} else {
bb.push({
sid: element.sid,
- palceGenDate: element.palceGenDateCopy,
+ withholdingDate: element.withholdingDateCopy,
withRebate: element.estimateRebate,
uploadMoney: element.uploadMoney,
stayDetermineMoney: element.stayDetermineMoney,