From a47c945f5258e6b7e03bc1d933c64f4fa9a320db Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Tue, 22 Jul 2025 11:17:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_hr_attendance/__manifest__.py | 1 + .../controllers/applet_address.py | 2 ++ yuthon_hr_attendance/models/__init__.py | 1 + yuthon_hr_attendance/models/wife_message.py | 13 +++++++++++++ .../security/ir.model.access.csv | 1 + .../security/planning_group.xml | 5 +++++ .../views/applet_address_views.xml | 2 ++ .../views/wife_message_view.xml | 19 +++++++++++++++++++ yuthon_work_brand/views/hr_menus.xml | 5 +++++ 9 files changed, 49 insertions(+) create mode 100644 yuthon_hr_attendance/models/wife_message.py create mode 100644 yuthon_hr_attendance/views/wife_message_view.xml diff --git a/yuthon_hr_attendance/__manifest__.py b/yuthon_hr_attendance/__manifest__.py index dabd24209..67019f3d7 100644 --- a/yuthon_hr_attendance/__manifest__.py +++ b/yuthon_hr_attendance/__manifest__.py @@ -52,6 +52,7 @@ 'views/yuthon_customer_planning_views.xml', 'views/planning_slot_template_views.xml', 'views/hr_attendance_month_views.xml', + 'views/wife_message_view.xml', 'views/hr_attendance_portal_templates.xml', 'wizard/hr_attendance_month_wizard_views.xml', 'wizard/yuthon_delete_planning_wizard_views.xml', diff --git a/yuthon_hr_attendance/controllers/applet_address.py b/yuthon_hr_attendance/controllers/applet_address.py index 704b2db25..037cb7911 100644 --- a/yuthon_hr_attendance/controllers/applet_address.py +++ b/yuthon_hr_attendance/controllers/applet_address.py @@ -12,8 +12,10 @@ class AppletAddress(models.Model): address_name = fields.Char('地址名称') address_name2 = fields.Text('详细地址') employee_ids = fields.Many2many('hr.employee', string="员工") + company_id = fields.Many2one('res.company', string="公司") longitude = fields.Float(string="经度", digits=(16, 10)) latitude = fields.Float(string="纬度", digits=(16, 10)) + wife_name_ids = fields.Many2many('wife.message', string="wife名称") card_rice = fields.Integer(string="打卡范围(米)") def update_employee(self): diff --git a/yuthon_hr_attendance/models/__init__.py b/yuthon_hr_attendance/models/__init__.py index a2eb0a30b..17a21ffac 100644 --- a/yuthon_hr_attendance/models/__init__.py +++ b/yuthon_hr_attendance/models/__init__.py @@ -25,6 +25,7 @@ from . import yuthon_customer_planning from . import hr_attendance_wechat from . import hr_attendance_detail_wechat from . import hr_attendance_month +from . import wife_message # from odoo.tools import SQL diff --git a/yuthon_hr_attendance/models/wife_message.py b/yuthon_hr_attendance/models/wife_message.py new file mode 100644 index 000000000..59e66b4bf --- /dev/null +++ b/yuthon_hr_attendance/models/wife_message.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools, _ +from datetime import datetime, time, timedelta +from odoo.exceptions import UserError + + +class WifeMessage(models.Model): + _name = 'wife.message' + _description = 'wife名称管理' + + ip = fields.Char(string='IP') + name = fields.Char(string='名称') + company_id = fields.Many2one("res.company", string="公司", default=lambda self: self.env.company) \ No newline at end of file diff --git a/yuthon_hr_attendance/security/ir.model.access.csv b/yuthon_hr_attendance/security/ir.model.access.csv index f65d0f6f2..b50207e9f 100644 --- a/yuthon_hr_attendance/security/ir.model.access.csv +++ b/yuthon_hr_attendance/security/ir.model.access.csv @@ -59,3 +59,4 @@ access_yuthon_integrated_wizard,yuthon.integrated.wizard,model_yuthon_integrated access_applet_address,applet.address,model_applet_address,base.group_user,1,1,1,1 access_applet_security,applet.security,model_applet_security,base.group_user,1,1,1,1 access_applet_security_setting,applet.security.setting,model_applet_security_setting,base.group_user,1,1,1,1 +access_wife_message,wife.message,model_wife_message,base.group_user,1,1,1,1 diff --git a/yuthon_hr_attendance/security/planning_group.xml b/yuthon_hr_attendance/security/planning_group.xml index ca6614887..da7981476 100644 --- a/yuthon_hr_attendance/security/planning_group.xml +++ b/yuthon_hr_attendance/security/planning_group.xml @@ -24,6 +24,11 @@ [('company_id', 'in', company_ids)] + + 小程序地址管理公司过滤 + + [('company_id', 'in', company_ids)] + 考勤记录多公司 diff --git a/yuthon_hr_attendance/views/applet_address_views.xml b/yuthon_hr_attendance/views/applet_address_views.xml index 4f5cabac1..8caf5bb4d 100644 --- a/yuthon_hr_attendance/views/applet_address_views.xml +++ b/yuthon_hr_attendance/views/applet_address_views.xml @@ -8,9 +8,11 @@ + + diff --git a/yuthon_hr_attendance/views/wife_message_view.xml b/yuthon_hr_attendance/views/wife_message_view.xml new file mode 100644 index 000000000..8382fb574 --- /dev/null +++ b/yuthon_hr_attendance/views/wife_message_view.xml @@ -0,0 +1,19 @@ + + + + wife.message.tree + wife.message + + + + + + + + + + Wife名称管理 + wife.message + tree + + \ No newline at end of file diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index c7d193d80..471174fea 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -169,6 +169,11 @@ parent="hr_attendance_root_board_menu" sequence="15" action="yuthon_hr_attendance.hr_attendance_detail_action"/> +