From 7b5e2d71fc82a39253d21632f974d30815722b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
<9664676+pengyuthon@user.noreply.gitee.com>
Date: Tue, 30 Dec 2025 20:22:56 +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
---
.../soong_workflow_record_revoke_wizard.py | 3 ---
yuthon_issue/models/issue_library.py | 7 ++++++-
yuthon_issue/views/issue_library_views.xml | 19 ++++++++++---------
3 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/soong_workflow/wizard/soong_workflow_record_revoke_wizard.py b/soong_workflow/wizard/soong_workflow_record_revoke_wizard.py
index 6aa606488..49201493e 100644
--- a/soong_workflow/wizard/soong_workflow_record_revoke_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_record_revoke_wizard.py
@@ -45,7 +45,6 @@ class SoongWorkflowRecordRevokeWizard(models.TransientModel):
# 加班审批 -> 删除加班明细
over_line = self.env['vacation.over.line'].search([
('workflow_record_id', '=', self.record_id.id),
- ('update_type', '=', 'add')
])
over_line.unlink()
@@ -53,9 +52,7 @@ class SoongWorkflowRecordRevokeWizard(models.TransientModel):
# 外出审批 -> 删除误餐明细并恢复误餐次数
meal_line = self.env['vacation.meal.line'].search([
('workflow_record_id', '=', self.id),
- ('update_type', '=', 'add') # 只处理增加类型的记录
])
-
meal_line.unlink()
record_to_update.write({'log_ids': [(5, 0, 0)]})
record_to_update.state = '申请人'
diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py
index 7e1c2cc2e..d29e66ec9 100644
--- a/yuthon_issue/models/issue_library.py
+++ b/yuthon_issue/models/issue_library.py
@@ -51,7 +51,7 @@ class IssueLibrary(models.Model):
department_id = fields.Many2one('hr.department', string='部门', related='employee_id.department_id')
users_role_ids = fields.Many2many('soong.user.role', string='角色范围', related='employee_id.user_role_ids')
company_id = fields.Many2one('res.company', string='公司', related='employee_id.company_id', stroe=True)
- is_legal_trial = fields.Boolean(string="是否法审")
+ is_legal_trial = fields.Selection([('no', '否'), ('yes', '是')], string="是否法审", default='no')
workflow_id = fields.Many2one('soong.workflow.record', string="流程")
department_personnel_ids = fields.Many2many('res.users', string='部门人员')
approval_name = fields.Char(string="审批标题")
@@ -68,6 +68,7 @@ class IssueLibrary(models.Model):
is_push_party = fields.Boolean(string="党推送")
is_push_class = fields.Boolean(string="班子推送")
is_push_boss = fields.Boolean(string="董事推送")
+ is_push_depart = fields.Boolean(string="部门推送")
def correction(self):
for rec in self:
@@ -88,6 +89,10 @@ class IssueLibrary(models.Model):
}
}
+ def depart_push(self):
+ for rec in self:
+ rec.is_push_depart = True
+
def library_push(self):
for rec in self:
if rec.is_passed != 'pass':
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index 98eaa3a79..da26891b7 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -15,11 +15,12 @@
-
+
-
+
-
+
+
@@ -334,7 +335,7 @@
党总支议题库
issue.library
tree,form
- [('is_push_party', '=', True)]
+ [('is_push_party', '=', True), ('is_push_depart', '=', True)]
党支委议题库
issue.library
tree,form
- [('is_push_party', '=', True)]
+ [('is_push_party', '=', True),('is_push_depart', '=', True)]
班子会议题库
issue.library
tree,form
- [('is_push_class', '=', True)]
+ [('is_push_class', '=', True), ('is_push_depart', '=', True)]
董事会议题库
issue.library
tree,form
- [('is_push_boss', '=', True)]
+ [('is_push_boss', '=', True), ('is_push_depart', '=', True)]
部门议题库
issue.library
tree,form
- [('member_of_department', '=', True)]
+ [('member_of_department', '=', True), ('is_push_depart', '=', True)]
我的议题
issue.library
tree,form
- [('employee_id.user_id', '=', uid)]
+ [('employee_id.user_id', '=', uid), ('is_push_depart', '=', False)]
\ No newline at end of file