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

!7466 添加功能

Browse Source 
Merge pull request !7466 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-12-30 12:23:45 +00:00
committed by Gitee
parent 9a9735de46 7b5e2d71fc
commit 9bd7d9a522
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/wizard/soong_workflow_record_revoke_wizard.py
-3
View File
@@ -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 = '申请人'
yuthon_issue/models/issue_library.py
+6 -1
View File
@@ -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':
yuthon_issue/views/issue_library_views.xml
+10 -9
View File
@@ -15,11 +15,12 @@
<field name="name_text" class="list_width"/>
<field name="is_party" groups="yuthon_salary.group_jtbb_user" string="党总支"/>
<field name="is_party" groups="yuthon_salary.group_lc_user,yuthon_salary.group_wg_user" string="党支委会"/>
<field name="party_date" column_invisibl="not party_date"/>
<field name="party_date" />
<field name="is_class"/>
<field name="class_date" column_invisibl="not class_date"/>
<field name="class_date"/>
<field name="is_boss" groups="yuthon_salary.group_jtbb_user"/>
<field name="boss_date" column_invisibl="not boss_date"/>
<field name="boss_date"/>
<field name="is_legal_trial"/>
<field name="is_district_state"/>
<field name="is_district_government"/>
<field name="is_district_party"/>
@@ -334,7 +335,7 @@
<field name="name">党总支议题库</field>
<field name="res_model">issue.library</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('is_push_party', '=', True)]</field>
<field name="domain">[('is_push_party', '=', True), ('is_push_depart', '=', True)]</field>
<field name="search_view_id" ref="view_issue_library_filter"/>
<field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree3')}),
@@ -345,7 +346,7 @@
<field name="name">党支委议题库</field>
<field name="res_model">issue.library</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('is_push_party', '=', True)]</field>
<field name="domain">[('is_push_party', '=', True),('is_push_depart', '=', True)]</field>
<field name="search_view_id" ref="view_issue_library_filter"/>
<field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree3')}),
@@ -489,7 +490,7 @@
<field name="name">班子会议题库</field>
<field name="res_model">issue.library</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('is_push_class', '=', True)]</field>
<field name="domain">[('is_push_class', '=', True), ('is_push_depart', '=', True)]</field>
<field name="search_view_id" ref="view_issue_library_filter"/>
<field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree4')}),
@@ -632,7 +633,7 @@
<field name="name">董事会议题库</field>
<field name="res_model">issue.library</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('is_push_boss', '=', True)]</field>
<field name="domain">[('is_push_boss', '=', True), ('is_push_depart', '=', True)]</field>
<field name="search_view_id" ref="view_issue_library_filter"/>
<field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree5')}),
@@ -643,12 +644,12 @@
<field name="name">部门议题库</field>
<field name="res_model">issue.library</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('member_of_department', '=', True)]</field>
<field name="domain">[('member_of_department', '=', True), ('is_push_depart', '=', True)]</field>
</record>
<record id="issue_library_my_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="domain">[('employee_id.user_id', '=', uid)]</field>
<field name="domain">[('employee_id.user_id', '=', uid), ('is_push_depart', '=', False)]</field>
</record>
</odoo>