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

!12862 !12861 添加功能

Browse Source 
Merge pull request !12862 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-09-17 08:01:13 +00:00
committed by Gitee
parent 6ae8f7974d 699b8f5186
commit 31efb578bb
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_issue/views/issue_library_views.xml
+16 -12
View File
@@ -425,9 +425,10 @@
<search string="党议题">
<field name="name"/>
<field name="code"/>
<field name="name_text"/>
<filter string="待上会" name="issue_state" domain="[('issue_state', '=', 'draft')]"/>
<filter string="已上会" name="issue_state" domain="[('issue_state', '=', 'on_meet')]"/>
<filter name="filter_issue_state_party_will_or_empty"
string="待上会"
domain="['|', ('issue_state', '=', 'to_approval'), ('issue_state_party', '=', 'will')]"/>
<filter string="已上会" name="issue_state_party" domain="[('issue_state_party', '=', 'on_meet')]"/>
<filter string="待上会审批" name="to_approval" domain="[('issue_state', '=', 'to_approval')]"/>
<group expand="0">
<filter name="group_manager" string="会议状态" domain="[]" context="{'group_by': 'issue_state'}"/>
@@ -662,7 +663,7 @@
<field name="domain">[('is_push_party', '=', True), ('is_push_depart', '=', True),('issue_state', 'not in',
['draft', 'to_draft']), ('is_company', '=', True)]</field>
<field name="search_view_id" ref="view_issue_library_party_search"/>
<field name="context">{'from_action': 'issue_library_action3', 'searchpanel_default_issue_state': 'to_approval'}</field>
<field name="context">{'from_action': 'issue_library_action3', 'search_default_filter_issue_state_party_will_or_empty': 1}</field>
<field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree2')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form3')})]"/>
@@ -675,7 +676,7 @@
<field name="domain">[('is_push_party', '=', True),('issue_state', 'not in', ['draft', 'to_draft']),
('is_push_depart', '=', True), ('company_id.name', '!=', '集团本部'), ('is_company', '=', True)]
</field>
<field name="context">{'from_action': 'issue_library_action8'}</field>
<field name="context">{'from_action': 'issue_library_action8','search_default_filter_issue_state_party_will_or_empty': 1}</field>
<field name="search_view_id" ref="view_issue_library_party_search"/>
<field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree3')}),
@@ -690,9 +691,10 @@
<search string="班子议题">
<field name="name"/>
<field name="code"/>
<field name="name_text"/>
<filter string="待上会" name="issue_state" domain="[('issue_state', '=', 'draft')]"/>
<filter string="已上会" name="issue_state" domain="[('issue_state', '=', 'on_meet')]"/>
<filter name="filter_issue_state_class_will_or_empty"
string="待上会"
domain="['|', ('issue_state_class', '=', 'will'), ('issue_state', '=', 'to_approval')]"/>
<filter string="已上会" name="issue_state_class" domain="[('issue_state_class', '=', 'on_meet')]"/>
<filter string="待上会审批" name="to_approval" domain="[('issue_state', '=', 'to_approval')]"/>
<group expand="0">
<filter name="group_manager" string="会议状态" domain="[]" context="{'group_by': 'issue_state'}"/>
@@ -877,7 +879,7 @@
('is_push_depart', '=', True), ('is_company', '=', True)]
</field>
<field name="search_view_id" ref="view_issue_library_class_search"/>
<field name="context">{'from_action': 'issue_library_action4', 'searchpanel_default_issue_state': 'to_approval'}</field>
<field name="context">{'from_action': 'issue_library_action4','search_default_filter_issue_state_class_will_or_empty': 1}</field>
<field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree4')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form4')})]"/>
@@ -891,9 +893,11 @@
<search string="董事议题">
<field name="name"/>
<field name="code"/>
<field name="name_text"/>
<filter string="待上会" name="issue_state" domain="[('issue_state', '=', 'draft')]"/>
<filter string="已上会" name="issue_state" domain="[('issue_state', '=', 'on_meet')]"/>
<field name="name_text"/>'to_approval'
<filter name="filter_issue_state_boss_will_or_empty"
string="待上会"
domain="['|', ('issue_state', '=', 'to_approval'), ('issue_state_boss', '=', 'will')]"/>
<filter string="已上会" name="issue_state_boss" domain="[('issue_state_boss', '=', 'on_meet')]"/>
<filter string="待上会审批" name="to_approval" domain="[('issue_state', '=', 'to_approval')]"/>
<group expand="0">
<filter name="group_manager" string="会议状态" domain="[]" context="{'group_by': 'issue_state'}"/>
yuthon_will_task/models/inherit_room_booking.py
+1 -1
View File
@@ -68,7 +68,7 @@ class InheritRoomBooking(models.Model):
employee_list.extend(emp2.ids)
# 去重
employee_list = list(set(employee_list))
employee_list = [emp_id for emp_id in employee_list if emp_id]
def get_hour_selection(datetime_obj):
if not datetime_obj: