yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 3 months ago
parent
fcea7ec58c 19f1999e9a
commit
1a4d805c26
10 changed files with 248 additions and 239 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 132
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
  2. 64
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
  3. 132
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
  4. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue
  5. 64
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
  6. 2
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyDto.java
  7. 12
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java
  8. 6
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java
  9. 3
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java
  10. 70
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java

132
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
View File

@ -224,21 +224,20 @@ export default {
// 按照返利类型统计
list.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) {
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num) + parseFloat(1)
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].vehRebateSids.push(e.sid)
this.formobj.scmWhenVehrebateCheckapplydetailDetails.forEach((i) => {
if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) {
i.num = parseFloat(i.num) + parseFloat(1)
i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0) : 0)) * 100) / 100
i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + (e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0))) * 100) / 100
i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0)) * 100) / 100
i.vehRebateSids.push(e.sid)
v = 1
break
}
}
})
if (v === 0) {
// 第一次对比没有参照，放入参照物
this.formobj.scmWhenVehrebateCheckapplydetailDetails.push({
@ -251,11 +250,11 @@ export default {
brandSid: e.brandSid,
purchaseSystemName: e.purchaseSystemName,
purchaseSystemSid: e.purchaseSystemSid,
uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.stayDetermineMoney,
uploadMoney: Math.round((e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.onceCheckState === 0 ? e.stayDetermineMoney : 0,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
money: Math.round((e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0) * 100) / 100,
vehRebateSids: [e.sid],
sid: '',
mainSid: ''
@ -265,21 +264,20 @@ export default {
// 按照预提年月统计
list.forEach((s) => {
let k = 0
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)
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].vehRebateSids.push(s.sid)
this.formobj.scmLastVehrebateCheckapplydetailDetails.forEach((l) => {
if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) {
l.num = parseFloat(l.num) + parseFloat(1)
l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0) : 0)) * 100) / 100
l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + (s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0))) * 100) / 100
l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0)) * 100) / 100
l.vehRebateSids.push(s.sid)
k = 1
break
}
}
})
if (k === 0) {
this.formobj.scmLastVehrebateCheckapplydetailDetails.push({
withholdingDate: s.withholdingDate,
@ -290,11 +288,11 @@ export default {
brandSid: s.brandSid,
purchaseSystemName: s.purchaseSystemName,
purchaseSystemSid: s.purchaseSystemSid,
uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.stayDetermineMoney,
uploadMoney: Math.round((s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.onceCheckState === 0 ? s.stayDetermineMoney : 0,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
money: Math.round((s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0) * 100) / 100,
vehRebateSids: [s.sid],
sid: '',
mainSid: ''
@ -328,21 +326,20 @@ export default {
// 按照返利类型统计
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) {
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num) + parseFloat(1)
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].vehRebateSids.push(e.sid)
this.formobj.scmWhenVehrebateCheckapplydetailDetails.forEach((i) => {
if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) {
i.num = parseFloat(i.num) + parseFloat(1)
i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0) : 0)) * 100) / 100
i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + (e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0))) * 100) / 100
i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0)) * 100) / 100
i.vehRebateSids.push(e.sid)
v = 1
break
}
}
})
if (v === 0) {
// 第一次对比没有参照，放入参照物
this.formobj.scmWhenVehrebateCheckapplydetailDetails.push({
@ -355,11 +352,11 @@ export default {
brandSid: e.brandSid,
purchaseSystemName: e.purchaseSystemName,
purchaseSystemSid: e.purchaseSystemSid,
uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.stayDetermineMoney,
uploadMoney: Math.round((e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.onceCheckState === 0 ? e.stayDetermineMoney : 0,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
money: Math.round((e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0) * 100) / 100,
vehRebateSids: [e.sid],
sid: '',
mainSid: ''
@ -369,21 +366,20 @@ export default {
// 按照预提年月统计
this.formobj.scmVehrebateCheckapplydetailList.forEach((s) => {
let k = 0
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)
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].vehRebateSids.push(s.sid)
this.formobj.scmLastVehrebateCheckapplydetailDetails.forEach((l) => {
if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) {
l.num = parseFloat(l.num) + parseFloat(1)
l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0) : 0)) * 100) / 100
l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + (s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0))) * 100) / 100
l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0)) * 100) / 100
l.vehRebateSids.push(s.sid)
k = 1
break
}
}
})
if (k === 0) {
this.formobj.scmLastVehrebateCheckapplydetailDetails.push({
withholdingDate: s.withholdingDate,
@ -394,11 +390,11 @@ export default {
brandSid: s.brandSid,
purchaseSystemName: s.purchaseSystemName,
purchaseSystemSid: s.purchaseSystemSid,
uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.stayDetermineMoney,
uploadMoney: Math.round((s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.onceCheckState === 0 ? s.stayDetermineMoney : 0,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
money: Math.round((s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0) * 100) / 100,
vehRebateSids: [s.sid],
sid: '',
mainSid: ''

64
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
View File

@ -228,11 +228,11 @@ export default {
i.num = parseFloat(i.num) + parseFloat(1)
i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0) : 0)) * 100) / 100
i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + (e.onceCheckState === 0 ? parseFloat(e.onceItureCost !== '' ? e.onceItureCost : 0) + parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0))) * 100) / 100
i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0)) * 100) / 100
i.specialRebateSids.push(e.sid)
v = 1
}
@ -249,11 +249,11 @@ export default {
purchaseSystemSid: e.purchaseSystemSid,
brandName: e.brandName,
brandSid: e.brandSid,
uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.stayDetermineMoney,
uploadMoney: Math.round((e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.onceCheckState === 0 ? e.stayDetermineMoney : 0,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
money: Math.round((e.onceCheckState === 0 ? parseFloat(e.onceItureCost !== '' ? e.onceItureCost : 0) + parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0) * 100) / 100,
specialRebateSids: [e.sid],
sid: '',
mainSid: ''
@ -268,11 +268,11 @@ export default {
l.num = parseFloat(l.num) + parseFloat(1)
l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0) : 0)) * 100) / 100
l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + (s.onceCheckState === 0 ? parseFloat(s.onceItureCost !== '' ? s.onceItureCost : 0) + parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0))) * 100) / 100
l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0)) * 100) / 100
l.specialRebateSids.push(s.sid)
k = 1
}
@ -287,11 +287,11 @@ export default {
purchaseSystemSid: s.purchaseSystemSid,
brandName: s.brandName,
brandSid: s.brandSid,
uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.stayDetermineMoney,
uploadMoney: Math.round((s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.onceCheckState === 0 ? s.stayDetermineMoney : 0,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
money: Math.round((s.onceCheckState === 0 ? parseFloat(s.onceItureCost !== '' ? s.onceItureCost : 0) + parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0) * 100) / 100,
specialRebateSids: [s.sid],
sid: '',
mainSid: ''
@ -330,11 +330,11 @@ export default {
i.num = parseFloat(i.num) + parseFloat(1)
i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0) : 0)) * 100) / 100
i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + (e.onceCheckState === 0 ? parseFloat(e.onceItureCost !== '' ? e.onceItureCost : 0) + parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0))) * 100) / 100
i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0)) * 100) / 100
i.specialRebateSids.push(e.sid)
v = 1
}
@ -351,11 +351,11 @@ export default {
purchaseSystemSid: e.purchaseSystemSid,
brandName: e.brandName,
brandSid: e.brandSid,
uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.stayDetermineMoney,
uploadMoney: Math.round((e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.onceCheckState === 0 ? e.stayDetermineMoney : 0,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
money: Math.round((e.onceCheckState === 0 ? parseFloat(e.onceItureCost !== '' ? e.onceItureCost : 0) + parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0) * 100) / 100,
specialRebateSids: [e.sid],
sid: '',
mainSid: ''
@ -370,11 +370,11 @@ export default {
l.num = parseFloat(l.num) + parseFloat(1)
l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0) : 0)) * 100) / 100
l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + (s.onceCheckState === 0 ? parseFloat(s.onceItureCost !== '' ? s.onceItureCost : 0) + parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0))) * 100) / 100
l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0)) * 100) / 100
l.specialRebateSids.push(s.sid)
k = 1
}
@ -389,11 +389,11 @@ export default {
purchaseSystemSid: s.purchaseSystemSid,
brandName: s.brandName,
brandSid: s.brandSid,
uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.stayDetermineMoney,
uploadMoney: Math.round((s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.onceCheckState === 0 ? s.stayDetermineMoney : 0,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
money: Math.round((s.onceCheckState === 0 ? parseFloat(s.onceItureCost !== '' ? s.onceItureCost : 0) + parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0) * 100) / 100,
specialRebateSids: [s.sid],
sid: '',
mainSid: ''

132
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
View File

@ -192,21 +192,20 @@ export default {
// 按照返利类型统计
list.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) {
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num) + parseFloat(1)
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].vehRebateSids.push(e.sid)
this.formobj.scmWhenVehrebateCheckapplydetailDetails.forEach((i) => {
if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) {
i.num = parseFloat(i.num) + parseFloat(1)
i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0) : 0)) * 100) / 100
i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + (e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0))) * 100) / 100
i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0)) * 100) / 100
i.vehRebateSids.push(e.sid)
v = 1
break
}
}
})
if (v === 0) {
// 第一次对比没有参照，放入参照物
this.formobj.scmWhenVehrebateCheckapplydetailDetails.push({
@ -219,11 +218,11 @@ export default {
brandSid: e.brandSid,
purchaseSystemName: e.purchaseSystemName,
purchaseSystemSid: e.purchaseSystemSid,
uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.stayDetermineMoney,
uploadMoney: Math.round((e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.onceCheckState === 0 ? e.stayDetermineMoney : 0,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
money: Math.round((e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0) * 100) / 100,
vehRebateSids: [e.sid],
sid: '',
mainSid: ''
@ -233,21 +232,20 @@ export default {
// 按照预提年月统计
list.forEach((s) => {
let k = 0
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)
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].vehRebateSids.push(s.sid)
this.formobj.scmLastVehrebateCheckapplydetailDetails.forEach((l) => {
if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) {
l.num = parseFloat(l.num) + parseFloat(1)
l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0) : 0)) * 100) / 100
l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + (s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0))) * 100) / 100
l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0)) * 100) / 100
l.vehRebateSids.push(s.sid)
k = 1
break
}
}
})
if (k === 0) {
this.formobj.scmLastVehrebateCheckapplydetailDetails.push({
withholdingDate: s.withholdingDate,
@ -258,11 +256,11 @@ export default {
brandSid: s.brandSid,
purchaseSystemName: s.purchaseSystemName,
purchaseSystemSid: s.purchaseSystemSid,
uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.stayDetermineMoney,
uploadMoney: Math.round((s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.onceCheckState === 0 ? s.stayDetermineMoney : 0,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
money: Math.round((s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0) * 100) / 100,
vehRebateSids: [s.sid],
sid: '',
mainSid: ''
@ -296,21 +294,20 @@ export default {
// 按照返利类型统计
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) {
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num) + parseFloat(1)
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].vehRebateSids.push(e.sid)
this.formobj.scmWhenVehrebateCheckapplydetailDetails.forEach((i) => {
if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) {
i.num = parseFloat(i.num) + parseFloat(1)
i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0) : 0)) * 100) / 100
i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + (e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0))) * 100) / 100
i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0)) * 100) / 100
i.vehRebateSids.push(e.sid)
v = 1
break
}
}
})
if (v === 0) {
// 第一次对比没有参照，放入参照物
this.formobj.scmWhenVehrebateCheckapplydetailDetails.push({
@ -323,11 +320,11 @@ export default {
brandSid: e.brandSid,
purchaseSystemName: e.purchaseSystemName,
purchaseSystemSid: e.purchaseSystemSid,
uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.stayDetermineMoney,
uploadMoney: Math.round((e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.onceCheckState === 0 ? e.stayDetermineMoney : 0,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
money: Math.round((e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0) * 100) / 100,
vehRebateSids: [e.sid],
sid: '',
mainSid: ''
@ -337,21 +334,20 @@ export default {
// 按照预提年月统计
this.formobj.scmVehrebateCheckapplydetailList.forEach((s) => {
let k = 0
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)
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].vehRebateSids.push(s.sid)
this.formobj.scmLastVehrebateCheckapplydetailDetails.forEach((l) => {
if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) {
l.num = parseFloat(l.num) + parseFloat(1)
l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0) : 0)) * 100) / 100
l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + (s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0))) * 100) / 100
l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0)) * 100) / 100
l.vehRebateSids.push(s.sid)
k = 1
break
}
}
})
if (k === 0) {
this.formobj.scmLastVehrebateCheckapplydetailDetails.push({
withholdingDate: s.withholdingDate,
@ -362,11 +358,11 @@ export default {
brandSid: s.brandSid,
purchaseSystemName: s.purchaseSystemName,
purchaseSystemSid: s.purchaseSystemSid,
uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.stayDetermineMoney,
uploadMoney: Math.round((s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.onceCheckState === 0 ? s.stayDetermineMoney : 0,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
money: Math.round((s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0) * 100) / 100,
vehRebateSids: [s.sid],
sid: '',
mainSid: ''

2
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue
View File

@ -85,7 +85,7 @@ export default {
this.sids = aa
console.log('sids', this.sids)
},
showInfo(sid, value) {
showInfo(vehRebateSids) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})

64
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
View File

@ -195,11 +195,11 @@ export default {
i.num = parseFloat(i.num) + parseFloat(1)
i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0) : 0)) * 100) / 100
i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + (e.onceCheckState === 0 ? parseFloat(e.onceItureCost !== '' ? e.onceItureCost : 0) + parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0))) * 100) / 100
i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0)) * 100) / 100
i.specialRebateSids.push(e.sid)
v = 1
}
@ -216,11 +216,11 @@ export default {
purchaseSystemSid: e.purchaseSystemSid,
brandName: e.brandName,
brandSid: e.brandSid,
uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.stayDetermineMoney,
uploadMoney: Math.round((e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.onceCheckState === 0 ? e.stayDetermineMoney : 0,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
money: Math.round((e.onceCheckState === 0 ? parseFloat(e.onceItureCost !== '' ? e.onceItureCost : 0) + parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0) * 100) / 100,
specialRebateSids: [e.sid],
sid: '',
mainSid: ''
@ -235,11 +235,11 @@ export default {
l.num = parseFloat(l.num) + parseFloat(1)
l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0) : 0)) * 100) / 100
l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + (s.onceCheckState === 0 ? parseFloat(s.onceItureCost !== '' ? s.onceItureCost : 0) + parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0))) * 100) / 100
l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0)) * 100) / 100
l.specialRebateSids.push(s.sid)
k = 1
}
@ -254,11 +254,11 @@ export default {
purchaseSystemSid: s.purchaseSystemSid,
brandName: s.brandName,
brandSid: s.brandSid,
uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.stayDetermineMoney,
uploadMoney: Math.round((s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.onceCheckState === 0 ? s.stayDetermineMoney : 0,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
money: Math.round((s.onceCheckState === 0 ? parseFloat(s.onceItureCost !== '' ? s.onceItureCost : 0) + parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0) * 100) / 100,
specialRebateSids: [s.sid],
sid: '',
mainSid: ''
@ -297,11 +297,11 @@ export default {
i.num = parseFloat(i.num) + parseFloat(1)
i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0) : 0)) * 100) / 100
i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + (e.onceCheckState === 0 ? parseFloat(e.onceItureCost !== '' ? e.onceItureCost : 0) + parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0))) * 100) / 100
i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0)) * 100) / 100
i.specialRebateSids.push(e.sid)
v = 1
}
@ -318,11 +318,11 @@ export default {
purchaseSystemSid: e.purchaseSystemSid,
brandName: e.brandName,
brandSid: e.brandSid,
uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.stayDetermineMoney,
uploadMoney: Math.round((e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: e.onceCheckState === 0 ? e.stayDetermineMoney : 0,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
money: Math.round((e.onceCheckState === 0 ? parseFloat(e.onceItureCost !== '' ? e.onceItureCost : 0) + parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondItureCost !== '' ? e.secondItureCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0) * 100) / 100,
specialRebateSids: [e.sid],
sid: '',
mainSid: ''
@ -337,11 +337,11 @@ export default {
l.num = parseFloat(l.num) + parseFloat(1)
l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0) : 0)) * 100) / 100
l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + (s.onceCheckState === 0 ? parseFloat(s.onceItureCost !== '' ? s.onceItureCost : 0) + parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0))) * 100) / 100
l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0)) * 100) / 100
l.specialRebateSids.push(s.sid)
k = 1
}
@ -356,11 +356,11 @@ export default {
purchaseSystemSid: s.purchaseSystemSid,
brandName: s.brandName,
brandSid: s.brandSid,
uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.stayDetermineMoney,
uploadMoney: Math.round((s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
stayDetermineMoney: s.onceCheckState === 0 ? s.stayDetermineMoney : 0,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
money: Math.round((s.onceCheckState === 0 ? parseFloat(s.onceItureCost !== '' ? s.onceItureCost : 0) + parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondItureCost !== '' ? s.secondItureCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0)) * 100) / 100,
fyAdjustmentMoney: Math.round((s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0) * 100) / 100,
specialRebateSids: [s.sid],
sid: '',
mainSid: ''

2
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyDto.java
View File

@ -16,7 +16,7 @@ import java.util.List;
@Data
public class HrHireApplyDto extends OaFormDto {
private static final long serialVersionUID = 4255707952292859284L;
private String userSid;
// private String userSid;
@ApiModelProperty("是否是财务")
private String isFinanceKey;
private String isFinanceValue;

12
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java
View File

@ -44,8 +44,8 @@ public class HrHireApplyService extends MybatisBaseService<HrHireApplyMapper, Hr
public ResultBean<HrHireApplyVo> getSaveInit(String userSid, String orgPath) {
ResultBean<HrHireApplyVo> rb = ResultBean.fireFail();
HrHireApplyVo hrHireApplyVo = new HrHireApplyVo();
hrHireApplyVo.setUserSid(userSid);
hrHireApplyVo.setOrgPath(orgPath);
hrHireApplyVo.setCreateBySid(userSid);
hrHireApplyVo.setOrgSidPath(orgPath);
return rb.success().setData(hrHireApplyVo);
}
@ -62,8 +62,8 @@ public class HrHireApplyService extends MybatisBaseService<HrHireApplyMapper, Hr
//根据部门sid获取orgPath并赋值
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData();
String orgSidPath = organizationVo.getOrgSidPath();
hrHireApplyVo.setOrgPath(orgSidPath);
hrHireApplyVo.setUserSid(oaForm.getCreateBySid());
hrHireApplyVo.setOrgSidPath(orgSidPath);
hrHireApplyVo.setCreateBySid(oaForm.getCreateBySid());
BeanUtil.copyProperties(hrHireApply, hrHireApplyVo);
FormCommon isFinanceObj = FormCommon.of(hrHireApply.getIsFinanceKey(), hrHireApply.getIsFinanceValue());
hrHireApplyVo.setIsFinanceObj(isFinanceObj);
@ -96,13 +96,13 @@ public class HrHireApplyService extends MybatisBaseService<HrHireApplyMapper, Hr
BeanUtil.copyProperties(dto, entity, "sid");
dto.setBillNo("ZPXQ");
dto.setSid(entity.getSid());
dto.setCreateBySid(dto.getUserSid());
dto.setCreateBySid(dto.getCreateBySid());
ResultBean<String> resultBean = oaFormService.saveOaForm(dto);
if (!resultBean.getSuccess()) {
return rb;
}
entity.setFormSid(resultBean.getData());
entity.setCreateBySid(dto.getUserSid());
entity.setCreateBySid(dto.getCreateBySid());
baseMapper.insert(entity);
sid = entity.getSid();
} else {

6
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java
View File

@ -17,8 +17,10 @@ import java.util.List;
public class HrHireApplyVo {
private String sid;
private String userSid;
private String orgPath;
/* private String userSid;
private String orgPath;*/
private String orgSidPath;
private String createBySid;
@ApiModelProperty("是否是财务")
private FormCommon isFinanceObj;
private String isFinanceKey;

3
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java
View File

@ -20,7 +20,8 @@ public class OaFormDto implements Dto {
@ApiModelProperty("创建人sid")
private String createBySid;
@ApiModelProperty("组织机构全路径")
private String orgPath;
// private String orgPath;
private String orgSidPath;
@ApiModelProperty("申请单编号的字母")
private String billNo;
@ApiModelProperty("sid")

70
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
View File

@ -77,7 +77,7 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
// 将DTO中部分属性复制到oaForm中，忽略不需要的字段（如billNo, orgSidPath）
BeanUtil.copyProperties(dto, oaForm, "billNo", "orgPath");
try {
String orgSidPath = dto.getOrgPath();
String orgSidPath = dto.getOrgSidPath();
// 获取组织信息，根据orgSidPath字段调用外部服务
OrgVo orgVo = sysOrganizationFeign.getOrgByPath(orgSidPath).getData();
// 如果组织信息为空，返回失败信息
@ -211,7 +211,8 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
BeanUtil.copyProperties(ufVo, oaFormFlowDto);
updateFlow(oaFormFlowDto);
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
// 更新办结日期
updateClosingDate(businessSid);
} else {
//极光推送
oaForm = fetchBySid(businessSid);
@ -249,6 +250,12 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
}
}
private void updateClosingDate(String businessSid) {
OaForm oaForm = fetchBySid(businessSid);
oaForm.setFinishTime(new Date());
baseMapper.updateById(oaForm);
}
/**
* 获取上一环节
*
@ -431,6 +438,7 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
if (businessTaskId.equals(dto.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(dto, flowTaskVo);
flowTaskVo.setInstanceId(dto.getProcInsId());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -503,33 +511,39 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
if (r == 1) {
//启动流程
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
OaFormFlowDto oaFormFlowDto = new OaFormFlowDto();
BeanUtil.copyProperties(ufVo, oaFormFlowDto);
updateFlow(oaFormFlowDto);
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap((Map<String, Object>) bv.getFormVariables().get("app"));
messageFlowableQuery.setBusinessSid(dto.getBusinessSid());
messageFlowableQuery.setModuleName(oaForm.getFormType());
messageFlowableQuery.setMsgContent(oaForm.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle(oaForm.getFormType());
messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
if (voResultBean.getSuccess()) {
UpdateFlowFieldVo ufVo = voResultBean.getData();
OaFormFlowDto oaFormFlowDto = new OaFormFlowDto();
BeanUtil.copyProperties(ufVo, oaFormFlowDto);
updateFlow(oaFormFlowDto);
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap((Map<String, Object>) bv.getFormVariables().get("app"));
messageFlowableQuery.setBusinessSid(dto.getBusinessSid());
messageFlowableQuery.setModuleName(oaForm.getFormType());
messageFlowableQuery.setMsgContent(oaForm.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle(oaForm.getFormType());
messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
return voResultBean;
} else {
return rb.setMsg(voResultBean.getMsg());
}
return voResultBean;
} else if (r == 2) {
BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto();
BeanUtil.copyProperties(bv, businessVariablesDto);

Write Preview
Loading…
Cancel
Save