Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev

This commit is contained in:
sunjie
2025-07-23 21:40:18 +08:00
@@ -195,6 +195,7 @@
<tree string="薪资审定">
<field name="employee_id" string="姓名" readonly="1" options="{'no_open': True}" decoration-danger="is_bold" decoration-bf="is_bold"/>
<field name="date_of_entry" optional="show"/>
<field name="bank_account_id"/>
<field name="actual_salary" optional="show"/>
<field name="total_before_tax" decoration-danger="1" decoration-bf="1" optional="show"/>
<field name="three_one" optional="show"/>
@@ -258,6 +259,7 @@
<tree string="薪资审定">
<field name="employee_id" string="姓名" readonly="1" options="{'no_open': True}" decoration-danger="is_bold" decoration-bf="is_bold"/>
<field name="date_of_entry" optional="show"/>
<field name="bank_account_id"/>
<field name="actual_salary" optional="show"/>
<field name="total_before_tax" decoration-danger="1" decoration-bf="1" optional="show"/>
<field name="three_one" optional="show"/>
@@ -308,6 +310,7 @@
<tree string="薪资审定">
<field name="employee_id" string="姓名" readonly="1" options="{'no_open': True}" decoration-danger="is_bold" decoration-bf="is_bold"/>
<field name="date_of_entry" optional="show"/>
<field name="bank_account_id"/>
<field name="actual_salary" optional="show"/>
<field name="total_before_tax" decoration-danger="1" decoration-bf="1" optional="show"/>
<field name="three_one" optional="show"/>