添加功能
This commit is contained in:
@@ -114,6 +114,16 @@ class IssueLibrary(models.Model):
|
||||
is_push_depart = fields.Boolean(string="部门推送")
|
||||
is_meeting = fields.Boolean(string="已过会", compute='_compute_meeting', store=True)
|
||||
|
||||
is_company = fields.Boolean(string="本公司", default=True, compute='_compute_is_company',
|
||||
search='_search_part_of_company')
|
||||
|
||||
@api.depends_context('uid', 'company')
|
||||
@api.depends('company_id')
|
||||
def _compute_is_company(self):
|
||||
active_company_ids = self.env.companies
|
||||
for record in self:
|
||||
record.is_company = record.company_id in active_company_ids
|
||||
|
||||
def log_avoidance(self, avoid_user, avoid_comment=''):
|
||||
"""记录回避信息,已存在的回避人不重复创建"""
|
||||
existing = self.env['issue.library.avoid.line'].search([
|
||||
|
||||
@@ -378,7 +378,7 @@
|
||||
<field name="res_model">issue.library</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="search_view_id" ref="view_issue_library_filter"/>
|
||||
<field name="domain">[('issue_state', 'not in', ['draft', 'to_draft', 'to_do'])]</field>
|
||||
<field name="domain">[('issue_state', 'not in', ['draft', 'to_draft', 'to_do']), ('is_company', '=', True)]</field>
|
||||
<field name="view_ids" eval="[(5, 0, 0),
|
||||
(0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree')}),
|
||||
(0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form')})]"/>
|
||||
@@ -388,7 +388,7 @@
|
||||
<field name="res_model">issue.library</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="search_view_id" ref="view_issue_library_filter"/>
|
||||
<field name="domain">[('issue_state', 'not in', ['draft', 'to_draft', 'to_do']), ('is_meeting', '=', True)]</field>
|
||||
<field name="domain">[('issue_state', 'not in', ['draft', 'to_draft', 'to_do']), ('is_meeting', '=', True), ('is_company', '=', True)]</field>
|
||||
<field name="view_ids" eval="[(5, 0, 0),
|
||||
(0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree')}),
|
||||
(0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form')})]"/>
|
||||
@@ -634,8 +634,7 @@
|
||||
<field name="res_model">issue.library</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('is_push_party', '=', True), ('is_push_depart', '=', True),('issue_state', 'not in',
|
||||
['draft', 'to_draft'])]
|
||||
</field>
|
||||
['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'}</field>
|
||||
<field name="view_ids" eval="[(5, 0, 0),
|
||||
@@ -648,7 +647,7 @@
|
||||
<field name="res_model">issue.library</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('is_push_party', '=', True),('issue_state', 'not in', ['draft', 'to_draft']),
|
||||
('is_push_depart', '=', True), ('company_id.name', '!=', '集团本部')]
|
||||
('is_push_depart', '=', True), ('company_id.name', '!=', '集团本部'), ('is_company', '=', True)]
|
||||
</field>
|
||||
<field name="context">{'from_action': 'issue_library_action8'}</field>
|
||||
<field name="search_view_id" ref="view_issue_library_party_search"/>
|
||||
@@ -847,7 +846,7 @@
|
||||
<field name="res_model">issue.library</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('is_push_class', '=', True), ('issue_state', 'not in', ['draft', 'to_draft']),
|
||||
('is_push_depart', '=', True)]
|
||||
('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'}</field>
|
||||
@@ -1044,7 +1043,7 @@
|
||||
<field name="res_model">issue.library</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('is_push_boss', '=', True), ('issue_state', 'not in', ['draft', 'to_draft']),
|
||||
('is_push_depart', '=', True)]
|
||||
('is_push_depart', '=', True), ('is_company', '=', True)]
|
||||
</field>
|
||||
<field name="search_view_id" ref="view_issue_library_boss_search"/>
|
||||
<field name="context">{'from_action': 'issue_library_action5'}</field>
|
||||
|
||||
Reference in New Issue
Block a user