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

ljm 1

Browse Source
This commit is contained in:
李鹏宇
2025-01-07 13:15:25 +08:00
parent 36d428cd66
commit 9e6f94f5bd
4 changed files with 92 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/views/all_attendance_menu.xml
+68 -64
View File
@@ -11,10 +11,14 @@
parent="hr_attendance_root_board"
groups="group_he_attendance_user"
sequence="1"/>
<menuitem id="menu_hr_attendance_month_wizard" name="考勤统计" parent="menu_hr_attendance_month_board" action="action_hr_attendance_month_wizard"/>
<menuitem id="menu_hr_attendance_month_view_attendances" name="月度出勤" parent="menu_hr_attendance_month_board" sequence="30" action="hr_attendance_month_action"/>
<menuitem id="menu_hr_attendance_year_view_attendances" name="出勤年份维护" parent="menu_hr_attendance_month_board" sequence="40" action="hr_attendance_year_action"/>
<menuitem id="menu_hr_attendance_month_detail_view_attendances" name="考勤详情" parent="menu_hr_attendance_month_board" sequence="50" action="hr_attendance_month_detail_action"/>
<menuitem id="menu_hr_attendance_month_wizard" name="考勤统计" parent="menu_hr_attendance_month_board"
action="action_hr_attendance_month_wizard"/>
<menuitem id="menu_hr_attendance_month_view_attendances" name="月度出勤" parent="menu_hr_attendance_month_board"
sequence="30" action="hr_attendance_month_action"/>
<menuitem id="menu_hr_attendance_year_view_attendances" name="出勤年份维护" parent="menu_hr_attendance_month_board"
sequence="40" action="hr_attendance_year_action"/>
<menuitem id="menu_hr_attendance_month_detail_view_attendances" name="考勤详情"
parent="menu_hr_attendance_month_board" sequence="50" action="hr_attendance_month_detail_action"/>
<menuitem id="menu_hr_attendance_my_record_board"
@@ -79,11 +83,11 @@
parent="menu_hr_attendance_approval_request_board"
sequence="7"
action="approval_request_leave"/>
<!-- <menuitem id="menu_yuthon_shift_approval_board"-->
<!-- name="调替班申请"-->
<!-- parent="menu_hr_attendance_approval_request_board"-->
<!-- sequence="5"-->
<!-- action="view_yuthon_shift_approval_action"/>-->
<!-- <menuitem id="menu_yuthon_shift_approval_board"-->
<!-- name="调替班申请"-->
<!-- parent="menu_hr_attendance_approval_request_board"-->
<!-- sequence="5"-->
<!-- action="view_yuthon_shift_approval_action"/>-->
<menuitem id="menu_hr_attendance_remove_holiday_board"
name="销假申请"
parent="menu_hr_attendance_approval_request_board"
@@ -94,16 +98,16 @@
parent="menu_hr_attendance_approval_request_board"
sequence="13"
action="approval_request_card"/>
<!-- <menuitem id="menu_hr_attendance_special_approval_board"-->
<!-- name="特殊加班申请"-->
<!-- parent="menu_hr_attendance_approval_request_board"-->
<!-- sequence="15"-->
<!-- action="view_special_approval_action"/>-->
<!-- <menuitem id="menu_hr_customer_approval_board"-->
<!-- name="客服值班审批"-->
<!-- parent="menu_hr_attendance_approval_request_board"-->
<!-- sequence="17"-->
<!-- action="action_yuthon_customer_approval"/>-->
<!-- <menuitem id="menu_hr_attendance_special_approval_board"-->
<!-- name="特殊加班申请"-->
<!-- parent="menu_hr_attendance_approval_request_board"-->
<!-- sequence="15"-->
<!-- action="view_special_approval_action"/>-->
<!-- <menuitem id="menu_hr_customer_approval_board"-->
<!-- name="客服值班审批"-->
<!-- parent="menu_hr_attendance_approval_request_board"-->
<!-- sequence="17"-->
<!-- action="action_yuthon_customer_approval"/>-->
<menuitem id="attendance_resources_setting_root_board"
name="配置"
parent="hr_attendance_root_board"
@@ -129,12 +133,6 @@
parent="yuthon_attendance_planning_board"
groups="group_he_attendance_security_user"
sequence="5"/>
<menuitem id="menu_hr_plan_sources_arrange_board1"
name="排版规则"
parent="menu_hr_attendance_security_record_board"
action="yuthon_shift_planning_view_action"
groups="group_he_attendance_security_manager"
sequence="1"/>
<menuitem id="menu_hr_plan_sources_guard_all_board"
name="全部计划"
parent="menu_hr_attendance_security_record_board"
@@ -159,35 +157,18 @@
groups="group_he_attendance_class_c_duty"
action="action_planning_slot_all_form4"
sequence="9"/>
<menuitem id="menu_hr_plan_sources_arrange_board1"
name="排版规则"
parent="menu_hr_attendance_security_record_board"
action="yuthon_shift_planning_view_action"
groups="group_he_attendance_security_manager"
sequence="10"/>
<!--工程部-->
<menuitem id="menu_hr_attendance_engineering_record_board"
name="工程部计划"
parent="yuthon_attendance_planning_board"
groups="group_he_attendance_engineering_user"
sequence="7"/>
<menuitem id="menu_hr_attendance_all_board"
name="排班规则"
parent="menu_hr_attendance_engineering_record_board"
groups="group_he_attendance_engineering_manager"
sequence="1"/>
<menuitem id="menu_hr_attendance_planning_run_board"
name="运行班排班"
parent="menu_hr_attendance_all_board"
groups="group_he_attendance_run_manager"
action="action_yuthon_run_planning"
sequence="3"/>
<menuitem id="menu_hr_attendance_planning_high_board"
name="高压班排班"
parent="menu_hr_attendance_all_board"
groups="group_he_attendance_hv_manager"
action="action_yuthon_high_planning"
sequence="4"/>
<menuitem id="menu_hr_attendance_planning_integrated_board"
name="综合班排班"
parent="menu_hr_attendance_all_board"
action="action_yuthon_integrated_planning"
groups="group_he_attendance_integrated_manager"
sequence="5"/>
<menuitem id="menu_hr_plan_sources_all_board1"
name="运行班计划"
parent="menu_hr_attendance_engineering_record_board"
@@ -206,25 +187,48 @@
groups="group_he_attendance_integrated_user"
action="action_planning_slot_form5"
sequence="8"/>
<menuitem id="menu_hr_attendance_all_board"
name="排班规则"
parent="menu_hr_attendance_engineering_record_board"
groups="group_he_attendance_engineering_manager"
sequence="8"/>
<menuitem id="menu_hr_attendance_planning_run_board"
name="运行班排班"
parent="menu_hr_attendance_all_board"
groups="group_he_attendance_run_manager"
action="action_yuthon_run_planning"
sequence="3"/>
<menuitem id="menu_hr_attendance_planning_high_board"
name="高压班排班"
parent="menu_hr_attendance_all_board"
groups="group_he_attendance_hv_manager"
action="action_yuthon_high_planning"
sequence="4"/>
<menuitem id="menu_hr_attendance_planning_integrated_board"
name="综合班排班"
parent="menu_hr_attendance_all_board"
action="action_yuthon_integrated_planning"
groups="group_he_attendance_integrated_manager"
sequence="5"/>
<!-- 值班相关 -->
<!-- 值班相关 -->
<menuitem id="menu_hr_attendance_duty_summary_menu_board"
name="粮库计划"
parent="yuthon_attendance_planning_board"
groups="group_he_attendance_lc_user"
sequence="9"/>
<menuitem id="menu_hr_attendance_duty_plan_board"
name="排版规则"
parent="menu_hr_attendance_duty_summary_menu_board"
groups="group_he_attendance_lc_manager"
action="view_yuthon_duty_plan_action"
sequence="1"/>
<menuitem id="menu_hr_attendance_duty_summary_board"
name="排班计划"
parent="menu_hr_attendance_duty_summary_menu_board"
groups="group_he_attendance_lc_user"
action="action_planning_slot_form6"
sequence="15"/>
sequence="1"/>
<menuitem id="menu_hr_attendance_duty_plan_board"
name="排版规则"
parent="menu_hr_attendance_duty_summary_menu_board"
groups="group_he_attendance_lc_manager"
action="view_yuthon_duty_plan_action"
sequence="5"/>
<menuitem id="menu_hr_attendance_duty_summary_flow_board"
name="流程"
parent="menu_hr_attendance_duty_summary_menu_board"
@@ -261,18 +265,18 @@
parent="yuthon_attendance_planning_board"
groups="group_he_attendance_customer_user"
sequence="12"/>
<menuitem id="menu_hr_attendance_customer_flow_board"
name="排班规则"
parent="menu_hr_attendance_customer_board"
action="yuthon_customer_planning_view_action"
groups="group_he_attendance_customer_manager"
sequence="5"/>
<menuitem id="menu_hr_attendance_customer_summary_board"
name="排班计划"
parent="menu_hr_attendance_customer_board"
groups="group_he_attendance_customer_user"
action="action_planning_slot_form7"
sequence="10"/>
<menuitem id="menu_hr_attendance_customer_flow_board"
name="排班规则"
parent="menu_hr_attendance_customer_board"
action="yuthon_customer_planning_view_action"
groups="group_he_attendance_customer_manager"
sequence="12"/>
<!--流程-->
<menuitem id="menu_yuthon_customer_process_board"
name="流程"
@@ -295,7 +299,7 @@
parent="yuthon_attendance_planning_board"
groups="group_he_attendance_planning_manager"
sequence="20"/>
<menuitem id="menu_hr_attendance_role_board"
<menuitem id="menu_hr_attendance_role_board"
name="班次角色"
parent="menu_yuthon_customer_setting_board"
sequence="6"
@@ -305,7 +309,7 @@
parent="menu_yuthon_customer_setting_board"
sequence="9"
action="planning.planning_action_shift_template"/>
<menuitem id="menu_hr_attendance_approval_request" name="考勤审批记录"
parent="hr_attendance.menu_hr_attendance_root" sequence="13"/>
yuthon_hr_employee/models/yuthon_hr_employee.py
+14 -5
View File
@@ -43,7 +43,7 @@ class YuthonHrEmployee(models.Model):
# 个人信息
user_salary = fields.Float(string="基本工资")
job_lv_salary = fields.Float(string="职级工资")
# entry_date = fields.Date(string="入职时间")
user_sex = fields.Selection([('girl', '女'), ('boy', '男')], string="性别")
user_state = fields.Selection([('in', '在职'), ('leave', '离职'), ('withdraw', '退休'), ('borrow', '借调'),
@@ -67,15 +67,23 @@ class YuthonHrEmployee(models.Model):
('part_time', '外地农业'), ('practice', '外地非农业')], string="户籍类型")
duty_replacement_card = fields.Integer(string="值班补卡次数（月）")
# 工作信息
entry_date = fields.Date(string="入职时间")
confirmation_date = fields.Date(string="转正时间")
company_old = fields.Char(string="司龄", compute='_compute_company_old')
open_start_time = fields.Date(string="参加工作时间")
social_insurance_date = fields.Date(string="缴纳社保日期")
social_insurance_time = fields.Char(string="社保时长", compute='_compute_social_insurance_info', store=True)
compute_month = fields.Integer(string="社保时长假期")
interrupt_work_month = fields.Integer(string="中断工作月数")
cumulative_work_month = fields.Integer(string="累计工作月数", compute='_compute_social_insurance_info', store=True)
cumulative_work_years = fields.Char(string="累计工作年限", compute='_compute_cumulative_work_years', store=True)
interrupt_work_month = fields.Integer(string="中断工作月数")
compute_char = fields.Char(string="工龄", compute='_compute_social_insurance_info')
compute_month = fields.Integer(string="工龄(月)")
social_insurance_date = fields.Date(string="缴纳社保日期")
social_insurance_time = fields.Char(string="社保时长", compute='_compute_social_insurance_info', store=True)
# 教育
high_degree = fields.Char(string="最高学历")
high_degree2 = fields.Char(string="最高学位")
@@ -261,6 +269,7 @@ class YuthonHrEmployee(models.Model):
social_insurance_time_str = f"{years}年{months}个月" if years > 0 and months > 0 else (
f"{years}年" if years > 0 else f"{months}个月")
record.social_insurance_time = social_insurance_time_str
record.compute_char = social_insurance_time_str
@api.depends('cumulative_work_month')
def _compute_cumulative_work_years(self):
yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+7 -4
View File
@@ -112,15 +112,17 @@
</xpath>
<xpath expr="//group[@name='active_group']" position="after">
<group string="工作信息">
<field name="entry_date"/>
<field name="confirmation_date"/>
<field name="company_old"/>
<field name="open_start_time"/>
<field name="social_insurance_date"/>
<field name="compute_month" invisible="1"/>
<field name="social_insurance_time"/>
<field name="interrupt_work_month"/>
<field name="cumulative_work_month"/>
<field name="cumulative_work_years"/>
<field name="interrupt_work_month"/>
<field name="compute_month" invisible="1"/>
<field name="compute_char"/>
<field name="social_insurance_date"/>
<field name="social_insurance_time"/>
</group>
<group string="其他">
<field name="archiving_agency"/>
@@ -151,6 +153,7 @@
<field name="emergency_contact_ids">
<tree editable="bottom">
<field name="employee_id" column_invisible="1"/>
<field name="name"/>
<field name="user_relationship"/>
<field name="user_sfz"/>
<field name="workplace"/>
yuthon_property_approval/models/property_lease_contract.py
+3 -3
View File
@@ -83,7 +83,7 @@ class PropertyLeaseContract(models.Model):
first_pay = fields.Date(string="首次付款日")
unit_price = fields.Float(string="单价")
deposit_type = fields.Selection([('deposit', '押金'), ('performance', '履约保证金')], string="押金/履约保证金")
deposit = fields.Float(string="押金/履约保证金", compute="_compute_deposit", store=True)
deposit = fields.Float(string="押金/履约保证金", store=True)
performance_bonds_write = fields.Char(string="履约保证金大写")
first_year_rent = fields.Float(string="首年租金")
rent = fields.Float(string="租金", help='第一笔合同的应收')
@@ -518,8 +518,8 @@ class PropertyLeaseContract(models.Model):
# for record in self:
# record.deposit = record.total_area * record.unit_price * 2 # 月租金
@api.depends('rent')
def _compute_deposit(self):
@api.onchange('rent')
def _onchange_deposit(self):
for record in self:
if record.rent:
record.deposit = record.rent * 2