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

Merge remote-tracking branch 'origin/master'

master
God 7 months ago
parent
093c89b195 195b118ac8
commit
82de6e6063
16 changed files with 37 additions and 37 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. 2
      anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js
  2. 2
      anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js
  3. 2
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue
  4. 20
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
  5. 4
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
  6. 2
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
  7. 2
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue
  8. 2
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue
  9. 2
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue
  10. 4
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue
  11. 20
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
  12. 4
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue
  13. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue
  14. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue
  15. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/yiheduidanchefanli.vue
  16. 2
      yxt-as-ui/src/views/basicinformation/maintenanceProjectRecord/maintenanceProjectRecordAdd.vue

2
anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js
View File

@ -94,7 +94,7 @@ export default {
// 查看明细
vehRebateCheckDetails: function(data) {
return request({
url: '/scm/v1/scmvehrebatewith/vehRebateCheckDetails/' + data,
url: '/scm/v1/scmvehrebatecheckapplydetail/vehRebateCheckDetails/' + data,
method: 'get'
})
},

2
anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js
View File

@ -94,7 +94,7 @@ export default {
// 查看明细
specialRebateCheckDetails: function(data) {
return request({
url: '/scm/v1/scmspecialrebatewith/specialRebateCheckDetails/' + data,
url: '/scm/v1/scmspecialrebatecheckapply/specialRebateCheckDetails/' + data,
method: 'get'
})
},

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

@ -60,7 +60,7 @@
</template>
</el-table-column>
<el-table-column prop="estimateRebate" label="预提返利" align="center" width="140" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" width="150" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" width="150" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="140" />
<el-table-column prop="stayDetermineMoney" label="其中待确定金额" align="center" width="160" />
<el-table-column prop="money" label="其中费用" align="center" width="150" />

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

@ -38,7 +38,7 @@
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
@ -55,7 +55,7 @@
<el-table-column prop="withholdingDate" label="预提年月" align="center" />
<el-table-column prop="num" label="预提数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
@ -209,7 +209,7 @@ export default {
if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
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].expectCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].expectCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].expectCost : 0) + parseFloat(e.expectCost !== '' ? e.expectCost : 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
@ -226,7 +226,7 @@ export default {
rebateTypeValue: e.rebateTypeValue,
num: 1,
withRebate: e.estimateRebate,
expectCost: e.expectCost,
withholdCost: e.withholdCost,
brandName: e.brandName,
brandSid: e.brandSid,
uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
@ -246,7 +246,7 @@ export default {
if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
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].expectCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].expectCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].expectCost : 0) + parseFloat(s.expectCost !== '' ? s.expectCost : 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
@ -261,7 +261,7 @@ export default {
withholdingDate: s.withholdingDate,
num: 1,
withRebate: s.estimateRebate,
expectCost: s.expectCost,
withholdCost: s.withholdCost,
brandName: s.brandName,
brandSid: s.brandSid,
uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
@ -302,7 +302,7 @@ export default {
if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
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].expectCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].expectCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].expectCost : 0) + parseFloat(e.expectCost !== '' ? e.expectCost : 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
@ -319,7 +319,7 @@ export default {
rebateTypeValue: e.rebateTypeValue,
num: 1,
withRebate: e.estimateRebate,
expectCost: e.expectCost,
withholdCost: e.withholdCost,
brandName: e.brandName,
brandSid: e.brandSid,
uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
@ -339,7 +339,7 @@ export default {
if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
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].expectCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].expectCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].expectCost : 0) + parseFloat(s.expectCost !== '' ? s.expectCost : 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
@ -354,7 +354,7 @@ export default {
withholdingDate: s.withholdingDate,
num: 1,
withRebate: s.estimateRebate,
expectCost: s.expectCost,
withholdCost: s.withholdCost,
brandName: s.brandName,
brandSid: s.brandSid,
uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,

4
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
View File

@ -27,7 +27,7 @@
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
@ -44,7 +44,7 @@
<el-table-column prop="withholdingDate" label="预提年月" align="center" />
<el-table-column prop="num" label="预提数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />

2
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
View File

@ -77,7 +77,7 @@
<el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" width="140" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" width="140" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="120" />

2
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue
View File

@ -32,7 +32,7 @@
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="rebateName" label="返利名称" align="center" width="150" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="150" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" width="150" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" width="150" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="150" />

2
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue
View File

@ -30,7 +30,7 @@
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="rebateName" label="返利名称" align="center" width="150" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="150" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" width="150" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" width="150" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="150" />

2
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue
View File

@ -20,7 +20,7 @@
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" width="140" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" width="140" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="120" />

4
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue
View File

@ -29,7 +29,7 @@
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
@ -46,7 +46,7 @@
<el-table-column prop="withholdingDate" label="预提年月" align="center" />
<el-table-column prop="num" label="预提数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />

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

@ -37,7 +37,7 @@
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
@ -54,7 +54,7 @@
<el-table-column prop="withholdingDate" label="预提年月" align="center" />
<el-table-column prop="num" label="预提数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
@ -204,7 +204,7 @@ export default {
if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
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].expectCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].expectCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].expectCost : 0) + parseFloat(e.expectCost !== '' ? e.expectCost : 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
@ -221,7 +221,7 @@ export default {
rebateTypeValue: e.rebateTypeValue,
num: 1,
withRebate: e.estimateRebate,
expectCost: e.expectCost,
withholdCost: e.withholdCost,
brandName: e.brandName,
brandSid: e.brandSid,
uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
@ -241,7 +241,7 @@ export default {
if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
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].expectCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].expectCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].expectCost : 0) + parseFloat(s.expectCost !== '' ? s.expectCost : 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
@ -256,7 +256,7 @@ export default {
withholdingDate: s.withholdingDate,
num: 1,
withRebate: s.estimateRebate,
expectCost: s.expectCost,
withholdCost: s.withholdCost,
brandName: s.brandName,
brandSid: s.brandSid,
uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
@ -297,7 +297,7 @@ export default {
if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
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].expectCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].expectCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].expectCost : 0) + parseFloat(e.expectCost !== '' ? e.expectCost : 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
@ -314,7 +314,7 @@ export default {
rebateTypeValue: e.rebateTypeValue,
num: 1,
withRebate: e.estimateRebate,
expectCost: e.expectCost,
withholdCost: e.withholdCost,
brandName: e.brandName,
brandSid: e.brandSid,
uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
@ -334,7 +334,7 @@ export default {
if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
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].expectCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].expectCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].expectCost : 0) + parseFloat(s.expectCost !== '' ? s.expectCost : 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
@ -349,7 +349,7 @@ export default {
withholdingDate: s.withholdingDate,
num: 1,
withRebate: s.estimateRebate,
expectCost: s.expectCost,
withholdCost: s.withholdCost,
brandName: s.brandName,
brandSid: s.brandSid,
uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,

4
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue
View File

@ -27,7 +27,7 @@
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
@ -44,7 +44,7 @@
<el-table-column prop="withholdingDate" label="预提年月" align="center" />
<el-table-column prop="num" label="预提数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />

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

@ -32,7 +32,7 @@
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="rebateName" label="返利名称" align="center" width="150" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="150" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" width="150" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" width="150" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="150" />

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

@ -30,7 +30,7 @@
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="rebateName" label="返利名称" align="center" width="150" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="150" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" width="150" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" width="150" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="150" />

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

@ -20,7 +20,7 @@
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" width="140" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" width="140" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="120" />

2
yxt-as-ui/src/views/basicinformation/maintenanceProjectRecord/maintenanceProjectRecordAdd.vue
View File

@ -5,7 +5,7 @@
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled">提交</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>

Write Preview
Loading…
Cancel
Save