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 6 months ago
parent
494e74f048 36e2700c7e
commit
6cb7585829
12 changed files with 112 additions and 19 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-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleFeign.java
  2. 1
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/PeopleList.java
  3. 2
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml
  4. 7
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java
  5. 24
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
  6. 16
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
  7. 15
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue
  8. 16
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue
  9. 24
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
  10. 16
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue
  11. 4
      yxt-as-ui/src/views/client/customermanagement/customermanagement.vue
  12. 4
      yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml

2
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleFeign.java
View File

@ -89,6 +89,6 @@ public interface CrmDockingPeopleFeign {
@ApiOperation("根据客户SID获取一条记录")
@GetMapping("/getListByCustomerSid")
@ResponseBody
public ResultBean<List<PeopleList>> getListByCustomerSid(@RequestParam("customerSid") String customerSid);
public ResultBean<List<PeopleList>> getListByCustomerSid(@RequestParam("sid") String sid);
}

1
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/PeopleList.java
View File

@ -16,4 +16,5 @@ public class PeopleList {
private String name; // 对接人
@ApiModelProperty("手机号码")
private String mobile; // 手机号码
private String remarks;
}

2
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml
View File

@ -63,7 +63,7 @@
<select id="selPersonCount" resultType="java.lang.Integer">
select
count(*)
from crm_docking_people where customerSid =#{customerSid}
from crm_docking_people where customerSid =#{customerSid} and isDelete = 0
</select>
<select id="selectBySid" resultType="java.lang.Integer">
SELECT COUNT(*)

7
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java
View File

@ -744,7 +744,9 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
String customerSid = entity.getCustomerSid();
List<CrmMaintenanceenterprisePerson> personList = crmMaintenanceenterprisePersonService.selByBillSid(businessSid);
if (!personList.isEmpty()) {
crmDockingPeopleService.delByCustomerSid(customerSid);
if (entity.getFilingType().equals("首次")) {
crmDockingPeopleService.delByCustomerSid(customerSid);
}
for (CrmMaintenanceenterprisePerson person : personList) {
CrmDockingPeople crmDockingPeople = new CrmDockingPeople();
if (StringUtils.isNotBlank(person.getName())) {
@ -753,6 +755,9 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
if (StringUtils.isNotBlank(person.getMobile())) {
crmDockingPeople.setMobile(person.getMobile());
}
if (StringUtils.isNotBlank(person.getRemarks())) {
crmDockingPeople.setRemarks(person.getRemarks());
}
crmDockingPeople.setCustomerSid(customerSid);
crmDockingPeopleService.insert(crmDockingPeople);
}

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

@ -42,7 +42,8 @@
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
@ -59,7 +60,8 @@
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
@ -214,6 +216,7 @@ export default {
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)
v = 1
break
@ -233,6 +236,7 @@ export default {
stayDetermineMoney: e.stayDetermineMoney,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
vehRebateSids: [e.sid],
sid: '',
mainSid: ''
@ -251,6 +255,7 @@ export default {
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)
k = 1
break
@ -268,6 +273,7 @@ export default {
stayDetermineMoney: s.stayDetermineMoney,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
vehRebateSids: [s.sid],
sid: '',
mainSid: ''
@ -307,6 +313,7 @@ export default {
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)
v = 1
break
@ -326,6 +333,7 @@ export default {
stayDetermineMoney: e.stayDetermineMoney,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
vehRebateSids: [e.sid],
sid: '',
mainSid: ''
@ -344,6 +352,7 @@ export default {
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)
k = 1
break
@ -361,6 +370,7 @@ export default {
stayDetermineMoney: s.stayDetermineMoney,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
vehRebateSids: [s.sid],
sid: '',
mainSid: ''
@ -489,6 +499,16 @@ export default {
}
}, 0)
sums[index] += ''
} else if (column.property === 'fyAdjustmentMoney') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums

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

@ -31,7 +31,8 @@
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
@ -48,7 +49,8 @@
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
@ -194,6 +196,16 @@ export default {
}
}, 0)
sums[index] += ''
} else if (column.property === 'fyAdjustmentMoney') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums

15
anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue
View File

@ -156,7 +156,7 @@
<div class="title">调整说明</div>
<el-row>
<el-col :span="8">
<div class="span-sty">差异金额</div>
<div class="span-sty">返利差异金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.diffAmount }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -164,10 +164,21 @@
<el-form-item><span class="addinputInfo">{{ formobj.isAdjustment }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">调整金额</div>
<div class="span-sty">返利调整金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.adjustmentMoney }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">待支付费用调整金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.treatAdjustmentMoney }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">抵顶费用调整金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.suppAdjustmentMoney }}</span></el-form-item>
</el-col>
<el-col :span="8"></el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">调整说明</div>

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

@ -33,7 +33,8 @@
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
@ -50,7 +51,8 @@
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
@ -267,6 +269,16 @@ export default {
}
}, 0)
sums[index] += ''
} else if (column.property === 'fyAdjustmentMoney') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums

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

@ -41,7 +41,8 @@
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
@ -58,7 +59,8 @@
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
@ -209,6 +211,7 @@ export default {
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)
v = 1
break
@ -228,6 +231,7 @@ export default {
stayDetermineMoney: e.stayDetermineMoney,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
vehRebateSids: [e.sid],
sid: '',
mainSid: ''
@ -246,6 +250,7 @@ export default {
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)
k = 1
break
@ -263,6 +268,7 @@ export default {
stayDetermineMoney: s.stayDetermineMoney,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
vehRebateSids: [s.sid],
sid: '',
mainSid: ''
@ -302,6 +308,7 @@ export default {
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)
v = 1
break
@ -321,6 +328,7 @@ export default {
stayDetermineMoney: e.stayDetermineMoney,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
vehRebateSids: [e.sid],
sid: '',
mainSid: ''
@ -339,6 +347,7 @@ export default {
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)
k = 1
break
@ -356,6 +365,7 @@ export default {
stayDetermineMoney: s.stayDetermineMoney,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
vehRebateSids: [s.sid],
sid: '',
mainSid: ''
@ -447,6 +457,16 @@ export default {
}
}, 0)
sums[index] += ''
} else if (column.property === 'fyAdjustmentMoney') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums

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

@ -31,7 +31,8 @@
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
@ -48,7 +49,8 @@
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
@ -230,6 +232,16 @@ export default {
}
}, 0)
sums[index] += ''
} else if (column.property === 'fyAdjustmentMoney') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums

4
yxt-as-ui/src/views/client/customermanagement/customermanagement.vue
View File

@ -415,7 +415,7 @@ export default {
toFiling() {
if (this.sids.length === 1) {
for (var i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].isDesignatedEnterprise === '1' || this.multipleSelection[i].isFilingIndate !== '1') {
if (this.multipleSelection[i].isDesignatedEnterprise === '1' && this.multipleSelection[i].isFilingIndate !== '1') {
this.$message({ showClose: true, type: 'error', message: '因该条记录中是否为定点企业为是且备案有效期仍在有效期内，需要进行补充备案操作' })
return
}
@ -530,7 +530,7 @@ export default {
},
addVehicle() {
if (this.sids.length === 1) {
if (this.multipleSelection[0].isDesignatedEnterprise === '1' || this.multipleSelection[0].isFilingIndate !== '1') {
if (this.multipleSelection[0].isDesignatedEnterprise === '1' && this.multipleSelection[0].isFilingIndate !== '1') {
this.$message({ showClose: true, type: 'error', message: '因该条记录中是否为定点企业为是且备案有效期仍在有效期内，需要进行补充备案操作' })
return
}

4
yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
View File

@ -50,9 +50,9 @@
FROM
as_customer_vehicle
WHERE
customerSid = #{customerSid} and isEnable = 1
customerSid = #{customerSid} and isDelete = 0
</select>
<select id="getVehListCountsByCustomerSid" resultType="java.lang.Integer">
SELECT COUNT(*) FROM as_customer_vehicle WHERE customerSid = #{customerSid}
SELECT COUNT(*) FROM as_customer_vehicle WHERE customerSid = #{customerSid} and isDelete = 0
</select>
</mapper>

Write Preview
Loading…
Cancel
Save