devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

fix: front에서 둔전 수입 계산 수정

Browse Source
This commit is contained in:
Hide_D
2021-12-31 23:07:42 +09:00
parent a819dde71c
commit e7fa95ce8f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/ts/PageNationStratFinan.vue
+8 -3
View File
@@ -145,9 +145,9 @@
<div class="col-12 bg2">군량 예산</div> <div class="col-12 bg2">군량 예산</div>
<div class="col-4 bg1">현 재</div> <div class="col-4 bg1">현 재</div>
<div class="col-8">{{ rice.toLocaleString() }}</div> <div class="col-8">{{ rice.toLocaleString() }}</div>
<div class="col-4 bg1">둔점수입</div> <div class="col-4 bg1">둔전수입</div>
<div class="col-8"> <div class="col-8">
{{ Math.floor(income.rice.wall).toLocaleString() }} {{ Math.floor(incomeRiceWall).toLocaleString() }}
</div> </div>
<div class="col-4 bg1">세 금</div> <div class="col-4 bg1">세 금</div>
<div class="col-8"> <div class="col-8">
@@ -479,8 +479,12 @@ export default defineComponent({
return (self.income.rice.city * self.policy.rate) / 100; return (self.income.rice.city * self.policy.rate) / 100;
}); });
const incomeRiceWall = computed(() => {
return (self.income.rice.wall * self.policy.rate) / 100;
});
const incomeRice = computed(() => { const incomeRice = computed(() => {
return incomeRiceCity.value + self.income.rice.wall; return incomeRiceCity.value + incomeRiceWall.value;
}); });
const outcomeByBill = computed(() => { const outcomeByBill = computed(() => {
@@ -622,6 +626,7 @@ export default defineComponent({
incomeGoldCity, incomeGoldCity,
incomeGold, incomeGold,
incomeRiceCity, incomeRiceCity,
incomeRiceWall,
incomeRice, incomeRice,
outcomeByBill, outcomeByBill,