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

!265 pengyuthon

Browse Source 
Merge pull request !265 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2024-10-12 01:33:03 +00:00
committed by Gitee
parent 8dcbf357d9 376d9c56b3
commit bbb18d63fd
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
room/models/room_booking.py
+7 -1
View File
@@ -107,13 +107,19 @@ class RoomBooking(models.Model):
department_users_list = users_role_list = []
for users in self:
if users.department_ids:
# 查看是否下级部门
if users.department_ids.child_ids:
for child in users.department_ids.child_ids:
department_child_users_data = users.env['hr.employee'].search([('department_id', '=', child.id.origin)])
department_users_list += [de.user_id.id for de in department_child_users_data]
for depart in users.department_ids:
department_users_data = users.env['hr.employee'].search([('department_id', '=', depart.id.origin)])
department_users_list = [de.user_id.id for de in department_users_data]
employee_users_list = users.employee_ids.user_id.ids
if users.users_role_ids:
for user_id in users.users_role_ids:
user_role_data = users.env['hr.employee'].search([('user_role_id', '=', user_id.id.origin)])
user_role_data = users.env['hr.employee'].search(['|', ('user_role_id', '=', user_id.id.origin),
('user_role_ids', '=', user_id.id.origin)])
users_role_list = [ro.user_id.id for ro in user_role_data]
publish_user_list = department_users_list + employee_users_list + users_role_list
users.room_users_ids = [(6, 0, list(set(publish_user_list)))]
soong_workflow/models/soong_workflow.py
+2
View File
@@ -32,6 +32,7 @@ MODEL_DOMAIN = """[
class SoongWorkflow(models.Model):
_name = "soong.workflow"
_description = "Soong Workflow"
_order = 'sequence asc'
_sql_constraints = [
("uniq_name", "unique(name)", _("Workflow name must be unique.")),
@@ -39,6 +40,7 @@ class SoongWorkflow(models.Model):
]
name = fields.Char(string="Name", help="Give workflow a name.")
sequence = fields.Integer(string='序号')
model_id = fields.Many2one("ir.model", string="Model", domain=MODEL_DOMAIN, help="Enter business model you would like to modify its workflow.", )
node_ids = fields.One2many(comodel_name="soong.workflow.node", inverse_name="workflow_id", string="Nodes")
link_ids = fields.One2many(comodel_name="soong.workflow.link", inverse_name="workflow_id", string="Links")
soong_workflow/views/menuitem.xml
+4 -9
View File
@@ -11,20 +11,15 @@
groups="group_soong_workflow_manager"
sequence="200"/>
<menuitem id="menu_workflow_approval_request"
name="我的审批"
parent="menu_soong_workflow_root"
sequence="1"/>
<menuitem id="menu_workflow_approval_request_new"
name="新的请求"
parent="menu_workflow_approval_request"
name="新的流程"
parent="menu_soong_workflow_root"
action="action_kklw_workflow_approval_request"
sequence="1"/>
<menuitem id="menu_workflow_approval_request_my"
name="我的请求"
parent="menu_workflow_approval_request"
name="流程查询"
parent="menu_soong_workflow_root"
action="soong_workflow_record_action"
sequence="3"/>
soong_workflow/views/soong_workflow_views.xml
+1
View File
@@ -54,6 +54,7 @@
<field name="model">soong.workflow</field>
<field name="arch" type="xml">
<tree>
<field name="sequence" widget="handle"/>
<field name="name"/>
<field name="model_id"/>
<!-- <field name="remove_default_attrs_mod"/>-->
yuthon_work_brand/views/work_menus.xml
+4 -8
View File
@@ -69,18 +69,14 @@
name="工作流程"
parent="spreadsheet_dashboard.spreadsheet_dashboard_menu_root"
sequence="5"/>
<menuitem id="menu_workflow_approval_request_my_board"
name="我的审批"
parent="menu_soong_workflow_root_board"
sequence="1"/>
<menuitem id="menu_workflow_approval_request_new_board"
name="新的请求"
parent="menu_workflow_approval_request_my_board"
name="新的流程"
parent="menu_soong_workflow_root_board"
action="soong_workflow.action_kklw_workflow_approval_request"
sequence="1"/>
<menuitem id="menu_workflow_approval_my_request_board"
name="我的请求"
parent="menu_workflow_approval_request_my_board"
name="流程查询"
parent="menu_soong_workflow_root_board"
action="soong_workflow.soong_workflow_record_action"
sequence="3"/>
<menuitem id="menu_soong_workflow_entrust_board"