pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!4198 !4197 添加功能

Browse Source 
Merge pull request !4198 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-07-31 02:45:17 +00:00
committed by Gitee
parent 5ed8d7dc84 f0d068bd66
commit 6b896d1553
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<attribute name="invisible">1</attribute>
</xpath>
<xpath expr="//field[@name='work_email']" position="after">
<field name="user_state" readonly="1"/>
<field name="user_state"/>
</xpath>
<xpath expr="//field[@name='department_id']" position="attributes">
<attribute name="widget">ztree_select</attribute>
yuthon_salary/views/inherit_hr_payslip_views.xml
+4 -4
View File
@@ -268,7 +268,7 @@
<field name="last_year_jie"/>
<field name="rank_salary" required="1"/>
<field name="performance_bonuses" required="1"/>
<field name="based_pay" required="1"/>
<field name="temporary_performance_bonus" required="1"/>
<field name="seniority_salary" required="1"/>
<field name="commuting_allowance" required="1"/>
<field name="full_attendance_award"/>
@@ -390,7 +390,7 @@
<field name="position_subsidy"/>
<field name="position_salary"/>
<field name="performance_bonuses" required="1"/>
<field name="based_pay" required="1"/>
<field name="temporary_performance_bonus" required="1"/>
<field name="environmental_allowance"/>
<field name="quality_allowance"/>
<field name="high_subsidy"/>
@@ -433,7 +433,7 @@
<field name="base_salary" required="1"/>
<field name="rank_salary" required="1"/>
<field name="performance_bonuses" required="1"/>
<field name="based_pay" required="1"/>
<field name="temporary_performance_bonus" required="1"/>
<field name="seniority_salary" required="1"/>
<field name="commuting_allowance" required="1"/>
@@ -565,7 +565,7 @@
<field name="position_salary"/>
<field name="position_subsidy"/>
<field name="performance_bonuses" required="1"/>
<field name="based_pay" required="1"/>
<field name="temporary_performance_bonus" required="1"/>
<field name="environmental_allowance"/>
<field name="quality_allowance"/>
<field name="high_subsidy"/>