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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
pengyuthon
2026-03-20 11:01:28 +08:00
parent 4ec81eeb7b 64240d0af7
commit a672f54ce5
3 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_issue/models/issue_library.py
+19 -7
View File
@@ -109,6 +109,25 @@ class IssueLibrary(models.Model):
is_push_class = fields.Boolean(string="班子推送")
is_push_boss = fields.Boolean(string="董事推送")
is_push_depart = fields.Boolean(string="部门推送")
is_meeting = fields.Boolean(string="已过会", compute='_compute_meeting', store=True)
@api.depends('is_party', 'is_party_passed', 'is_class', 'is_class_passed', 'is_boss', 'is_boss_passed')
def _compute_meeting(self):
for rec in self:
rec.is_meeting = False
enabled = []
rec.is_party and enabled.append(rec.is_party_passed == 'pass')
rec.is_class and enabled.append(rec.is_class_passed == 'pass')
rec.is_boss and enabled.append(rec.is_boss_passed == 'pass')
if enabled and all(enabled):
rec.is_meeting = True
def all_issue_library_line_ids(self):
issue_active_ids = self.env["issue.library"].browse(
self._context.get('active_ids', self._context.get('active_id'))
)
for record in issue_active_ids:
record._compute_meeting()
def meeting_record(self):
self.ensure_one()
@@ -745,13 +764,6 @@ class IssueLibrary(models.Model):
"res_id": record.issue_approval_id.id
}
def all_issue_library_line_ids(self):
issue_active_ids = self.env["issue.library"].browse(
self._context.get('active_ids', self._context.get('active_id'))
)
for record in issue_active_ids:
record._onchange_issue_library_line_ids()
@api.onchange('issue_library_line_ids')
def _onchange_issue_library_line_ids(self):
for record in self:
yuthon_issue/views/issue_library_views.xml
+16 -5
View File
@@ -57,6 +57,7 @@
<button name="all_meeting_issue" type="object" string="会议安排" class="oe_highlight" groups="yuthon_salary.group_lc_user"/>
</header>
<field name="name" column_invisible="1"/>
<field name="is_meeting" invisible="1"/>
<field name="department_id"/>
<field name="name_text" class="list_width"/>
<field name="is_party" groups="yuthon_salary.group_jtbb_user" string="党总支"/>
@@ -343,7 +344,17 @@
<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_meeting', '=', False)]</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')})]"/>
</record>
<record id="issue_library_meeting_action" model="ir.actions.act_window">
<field name="name">已过会</field>
<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="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')})]"/>
@@ -382,7 +393,7 @@
<button name="meeting_record" string="会议详情" type="object" class="btn btn-blue"
invisible="issue_state_party == 'will'"/>
<button name="correction" string="修正提醒" type="object" class="btn btn-blue"/>
<button name="refunded" string="退回" type="object" class="btn btn-blue"/>
<button name="refunded" string="退回" type="object" class="btn btn-blue" invisible="party_char"/>
<button name="issue_cancel" string="取消" type="object" class="btn btn-blue"/>
<button name="unlink" string="删除" type="object" class="btn btn-blue"/>
</tree>
@@ -421,7 +432,7 @@
<button name="meeting_record" string="会议详情" type="object" class="btn btn-blue"
invisible="issue_state_party == 'will'"/>
<button name="correction" string="修正提醒" type="object" class="btn btn-blue"/>
<button name="refunded" string="退回" type="object" class="btn btn-blue"/>
<button name="refunded" string="退回" type="object" class="btn btn-blue" invisible="party_char"/>
<button name="issue_cancel" string="取消" type="object" class="btn btn-blue"/>
<button name="unlink" string="删除" type="object" class="btn btn-blue"/>
</tree>
@@ -598,7 +609,7 @@
<button name="meeting_record" string="会议详情" type="object" class="btn btn-blue"
invisible="issue_state_class == 'will'"/>
<button name="correction" string="修正提醒" type="object" class="btn btn-blue"/>
<button name="refunded" string="退回" type="object" class="btn btn-blue"/>
<button name="refunded" string="退回" type="object" class="btn btn-blue" invisible="class_char"/>
<button name="issue_cancel" string="取消" type="object" class="btn btn-blue"/>
<button name="unlink" string="删除" type="object" class="btn btn-blue"/>
</tree>
@@ -760,7 +771,7 @@
<button name="meeting_record" string="会议详情" type="object" class="oe_highlight"
invisible="issue_state_boss == 'will'"/>
<button name="correction" string="修正提醒" type="object" class="oe_highlight"/>
<button name="refunded" string="退回" type="object" class="btn btn-blue"/>
<button name="refunded" string="退回" type="object" class="btn btn-blue" invisible="boss_char"/>
<button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
<button name="unlink" string="删除" type="object" class="oe_highlight"/>
</tree>
yuthon_issue/views/menus.xml
+6
View File
@@ -26,6 +26,12 @@
groups="yuthon_issue.group_issue_admin"
action="issue_library_action"
sequence="10"/>
<menuitem id="issue_library_meeting_menu"
parent="tianhe_issue_library_menu_root"
name="已过会"
groups="yuthon_issue.group_issue_admin"
action="issue_library_meeting_action"
sequence="10"/>
<!-- <menuitem id="tianhe_issue_library_all"-->
<!-- parent="tianhe_issue_library_menu"-->
<!-- name="全部"-->