desktop/njts-accounting-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: 年度リストを昇順に変更

Browse Source
This commit is contained in:
admin
2026-06-07 21:58:20 +09:00
parent 91632ea5b6
commit 4a500ff5e9
25 changed files with 1531 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
frontend/payroll-calculation.html
View File

@@ -1331,7 +1331,7 @@
</div>
<div class="calc-note" style="background:#eef6ee; border-left:3px solid #28a745; padding:6px 10px; margin:6px 0; font-size:0.88em; color:#1a5c1a; line-height:1.7">
健康保険 ¥${_health.toLocaleString()} ＋ 介護保険 ¥${_care.toLocaleString()} ＋ 子ども・子育て支援金 ¥${_child.toLocaleString()} ＝ <strong>¥${_healthCareChild.toLocaleString()}</strong><br>
¥${_healthCareChild.toLocaleString()}（上記合計） ＋ 厚生年金 ¥${_pension.toLocaleString()}${' '}${_emp > 0 ? `＋ 雇用保険 ¥${_emp.toLocaleString()}` : ''}＝ <strong>社会保険小計 ¥${_socialSub.toLocaleString()}</strong>
¥${_healthCareChild.toLocaleString()}（上記合計） ＋ 厚生年金 ¥${_pension.toLocaleString()}${" "}${_emp > 0 ? `＋ 雇用保険 ¥${_emp.toLocaleString()}` : ""}＝ <strong>社会保険小計 ¥${_socialSub.toLocaleString()}</strong>
</div>
<div class="detail-row"><span style="font-weight:bold">社会保険小計:</span><span style="font-weight:bold">¥${_socialSub.toLocaleString()}</span></div>
<div class="detail-row">
@@ -1379,7 +1379,12 @@
document.getElementById("payrollDetail").style.display = "block";
// モバイルでは明細パネルへ自動スクロール
if (window.innerWidth <= 767 && splitRightSalary) {
setTimeout(function() { splitRightSalary.scrollIntoView({ behavior: "smooth", block: "start" }); }, 50);
setTimeout(function () {
splitRightSalary.scrollIntoView({
behavior: "smooth",
block: "start",
});
}, 50);
}
} catch (error) {
alert("給与明細の取得に失敗しました");
@@ -1918,7 +1923,7 @@
</div>
<div class="calc-note" style="background:#eef6ee; border-left:3px solid #28a745; padding:6px 10px; margin:6px 0; font-size:0.88em; color:#1a5c1a; line-height:1.7">
健康保険 ¥${_bHealth.toLocaleString()} ＋ 介護保険 ¥${_bCare.toLocaleString()} ＋ 子ども・子育て支援金 ¥${_bChild.toLocaleString()} ＝ <strong>¥${_bHealthCareChild.toLocaleString()}</strong><br>
¥${_bHealthCareChild.toLocaleString()}（上記合計） ＋ 厚生年金 ¥${_bPension.toLocaleString()}${' '}${_bEmp > 0 ? `＋ 雇用保険 ¥${_bEmp.toLocaleString()}` : ''}＝ <strong>社会保険小計 ¥${_bSocialSub.toLocaleString()}</strong>
¥${_bHealthCareChild.toLocaleString()}（上記合計） ＋ 厚生年金 ¥${_bPension.toLocaleString()}${" "}${_bEmp > 0 ? `＋ 雇用保険 ¥${_bEmp.toLocaleString()}` : ""}＝ <strong>社会保険小計 ¥${_bSocialSub.toLocaleString()}</strong>
</div>
<div class="detail-row"><span style="font-weight:bold">社会保険小計:</span><span style="font-weight:bold">¥${_bSocialSub.toLocaleString()}</span></div>
<div class="detail-row">
@@ -1964,7 +1969,12 @@
document.getElementById("bonusDetail").style.display = "block";
// モバイルでは明細パネルへ自動スクロール
if (window.innerWidth <= 767 && splitRightBonus) {
setTimeout(function() { splitRightBonus.scrollIntoView({ behavior: "smooth", block: "start" }); }, 50);
setTimeout(function () {
splitRightBonus.scrollIntoView({
behavior: "smooth",
block: "start",
});
}, 50);
}
} catch (error) {
alert("賞与明細の取得に失敗しました");
@@ -2638,19 +2648,33 @@
// CSVデータを生成
let csvContent =
"データ,従業員コード,従業員名,年月,支給額,控除額,差引支給額\n";
"データ,従業員コード,従業員名,年月,支給額,社会保険,所得税,控除額合計,差引支給額\n";
// 給与データ
if (result.data.salary) {
(result.data.salary || []).forEach((salary) => {
csvContent += `給与,${salary.employee_code},${salary.employee_name},${salary.payroll_year}-${String(salary.payroll_month).padStart(2, "0")},${salary.total_payment},${salary.total_deduction},${salary.net_payment}\n`;
const socialIns =
Number(salary.health_insurance || 0) +
Number(salary.care_insurance || 0) +
Number(salary.pension_insurance || 0) +
Number(salary.employment_insurance || 0) +
Number(salary.child_support || 0);
const incomeTax = Number(salary.income_tax || 0);
csvContent += `給与,${salary.employee_code},${salary.employee_name},${salary.payroll_year}-${String(salary.payroll_month).padStart(2, "0")},${salary.total_payment},${socialIns},${incomeTax},${salary.total_deduction},${salary.net_payment}\n`;
});
}
// 賞与データ
if (result.data.bonus) {
(result.data.bonus || []).forEach((bonus) => {
csvContent += `賞与,${bonus.employee_code},${bonus.employee_name},${bonus.bonus_year}-${String(bonus.bonus_month).padStart(2, "0")},${bonus.total_bonus},${bonus.total_deduction},${bonus.net_bonus}\n`;
const socialIns =
Number(bonus.health_insurance || 0) +
Number(bonus.care_insurance || 0) +
Number(bonus.pension_insurance || 0) +
Number(bonus.employment_insurance || 0) +
Number(bonus.child_support || 0);
const incomeTax = Number(bonus.income_tax || 0);
csvContent += `賞与,${bonus.employee_code},${bonus.employee_name},${bonus.bonus_year}-${String(bonus.bonus_month).padStart(2, "0")},${bonus.total_bonus},${socialIns},${incomeTax},${bonus.total_deduction},${bonus.net_bonus}\n`;
});
}