diff --git a/app/src/components/table-record.js b/app/src/components/table-record.js index 7a7886e..142fee9 100644 --- a/app/src/components/table-record.js +++ b/app/src/components/table-record.js @@ -3,7 +3,9 @@ Vue.component('table-record', { data: function () { return { - working_time: 0.0, + working_time: 0.0, // 演算処理をする前の勤務時間 + below_time:0.0, + above_time: 0.0, is_hovering: false, }; }, @@ -39,10 +41,10 @@ {{ working_time }} {{ basic_info.cost_below_limit }} - {{ calc_below_time }} + {{ below_time }} {{ calc_below_cost }} {{ basic_info.cost_above_limit }} - {{ calc_above_time }} + {{ above_time }} {{ calc_above_cost }} {{ calc_invoice_price }} @@ -100,10 +102,26 @@ console.log('何も処理をしない'); break; case "0": - this.working_time = calc_working_time_by_select(this.working_time, 15); + // 控除の算出 + if (this.calc_below_time > 0) { + this.below_time = calc_working_time_by_select(this.calc_below_time, 15); + } + // 超過の算出 + if (this.calc_above_time > 0) { + this.above_time = calc_working_time_by_select(this.calc_above_time, 15); + } + break; case "1": - this.working_time = calc_working_time_by_select(this.working_time, 30); + // 控除の算出 + if (this.calc_below_time > 0) { + this.below_time = calc_working_time_by_select(this.calc_below_time, 30); + } + // 超過の算出 + if (this.calc_above_time > 0) { + this.above_time = calc_working_time_by_select(this.calc_above_time, 30); + } + break; }; }