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

添加功能

Browse Source
This commit is contained in:
zhouzhou
2024-10-23 18:53:34 +08:00
parent edaf573186
commit 72619f54fd
9 changed files with 1181 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_issue/models/inherit_hr_employee.py
+7
View File
@@ -14,6 +14,13 @@ class YuthonHrEmployee(models.Model):
'班子会议题': 'group_team_topic',
'董事会议题': 'group_board_topic',
'议题管理员': 'group_topic_admin',
'物管议题管理员':'group_property_admin',
'物管党支委议题':'property_group_party_topic',
'物管班子会议题':'property_group_team_topic',
'粮储党支委议题':'group_grain_party_topic',
'粮储班子会议题':'group_grain_team_topic',
'粮储议题管理员':'group_grain_admin',
}
old_users_ids = self.user_role_ids
for employee in self:
yuthon_issue/models/issue_approval.py
+7 -20
View File
@@ -11,15 +11,15 @@ class IssueApproval(models.Model):
name = fields.Char(string='标题', required=True)
code = fields.Char(string='编号', required=True, copy=False, default=lambda self: self.env['ir.sequence'].next_by_code('issue_approval_code'))
create_time = fields.Date(string='创建日期', default=lambda self: fields.Date.today())
employee_id = fields.Many2one('hr.employee', string="经办人",default=lambda self: self.env.user.employee_id)
department_id = fields.Many2one(related='employee_id.department_id', string="部门")
yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'),
('thlc', '天河粮储'), ('tctj', '天投城建'),
('thtjbb', '天河投资本部')], string="所属公司",required=True)
department_id = fields.Many2one('hr.department', string="部门")
create_time = fields.Date(string='创建日期', default=lambda self: fields.Date.today())
user_id = fields.Many2one('res.users', string="经办人", default=lambda self: self.env.user)
('thtjbb', '天河投资本部')], string="所属公司",
related='employee_id.yuthon_company')
meeting_details = fields.Char(string="会议详情")
job_id = fields.Many2one('hr.job', string="岗位")
job_id = fields.Many2one('employee_id.job_id', string="岗位")
is_attend = fields.Boolean(string="是否上会", default=True)
issue_text = fields.Html(string="正文")
notice_documents_ids = fields.Many2many('ir.attachment', string='议题附件')
@@ -62,23 +62,14 @@ class IssueApproval(models.Model):
def bottom_meeting_minutes(self):
pass
@api.onchange('issue_approval_ids')
def onchange_name(self):
specifics_list = []
if self.issue_approval_ids:
for issue in self.issue_approval_ids:
if issue.issue_library_id.name:
specifics_list.append(issue.issue_library_id.name)
self.name = ';'.join(specifics_list) if specifics_list else ''
class IssueApprovalLine(models.Model):
_name = 'issue.approval.line'
_description = '关联议题明细'
issue_approval_id = fields.Many2one('issue.approval', string='议题审批')
issue_library_id = fields.Many2one('issue.library',string='议题事项')
employee_id = fields.Many2one('hr.employee', string='创建人')
approval_decision_sequence = fields.Char(string='决策清单')
is_party = fields.Boolean(string="党之委会", default=False)
is_class = fields.Boolean(string="班子会", default=False)
@@ -86,8 +77,4 @@ class IssueApprovalLine(models.Model):
is_note = fields.Boolean(string="上级单位", default=False)
class IssueApprovalRoomLine(models.Model):
_name = 'issue.approval.room.line'
yuthon_issue/models/issue_library.py
+31 -7
View File
@@ -12,7 +12,7 @@ class IssueLibrary(models.Model):
name = fields.Char(string='议题事项')
code = fields.Char(string='编号', required=True, copy=False,
default=lambda self: self.env['ir.sequence'].next_by_code('issue_library_code'))
state = fields.Selection([('draft', '待提交'), ('approval', '审批中'), ('will', '待上会'), ('on_meet', '已上会'), ('cancel', '已取消')],
state = fields.Selection([('draft', '待提交'), ('approval', '审批中'), ('will', '待上会'), ('on_meet', '已上会'), ('cancel', '已取消'),('on_approval','已审批')],
default='draft', string="议题状态")
is_party = fields.Boolean(string="党之委会", default=False, compute='_compute_issue_library_line_ids')
is_class = fields.Boolean(string="班子会", default=False, compute='_compute_issue_library_line_ids')
@@ -36,7 +36,7 @@ class IssueLibrary(models.Model):
yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'),
('thlc', '天河粮储'), ('tctj', '天投城建')], string="所属公司", related='employee_id.yuthon_company')
users_role_ids = fields.Many2many('soong.user.role', string='角色范围', related='employee_id.user_role_ids')
approval_name = fields.Char(string="审批标题")
meeting_place = fields.Char(string="会议地点")
meeting_name = fields.Char(string="会议名称")
@api.onchange('issue_library_line_ids')
@@ -55,9 +55,11 @@ class IssueLibrary(models.Model):
issue_active_ids = self.env["issue.library"].browse(self._context.get('active_ids', self._context.get('active_id')))
form_id = self.env.ref("yuthon_issue.issue_library_approval_form").id
issue_decision_lines = []
specifics_list = []
if not issue_active_ids:
issue_active_ids = self
for issue_record in issue_active_ids:
specifics_list.append(issue_record.name)
issue_record.write({"state": "approval"})
issue_decision_lines.append((0, 0, {
'issue_library_id': issue_record.id,
@@ -65,25 +67,33 @@ class IssueLibrary(models.Model):
'is_party':issue_record.is_party,
'is_class': issue_record.is_class,
'is_boss': issue_record.is_boss,
'is_note': issue_record.is_note
'is_note': issue_record.is_note,
'employee_id':issue_record.employee_id.id
}))
issue_approval_id = self.env['issue.approval'].create({
'issue_approval_ids': issue_decision_lines,
'name': ';'.join(specifics_list),
'employee_id': self.employee_id.id,
})
self.issue_approval_id = issue_approval_id
return {
"type": "ir.actions.act_window",
"name": "批量提交",
"res_model": "issue.approval",
"views": [[form_id, "form"]],
"context": {
"default_issue_approval_ids": issue_decision_lines,
"id": issue_approval_id.id,
}
}
def issue_cancel(self):
self.write({"state": "cancel"})
def all_meeting_issue(self):
for meet in self:
if meet.state == 'on_meet':
raise UserError('不可重复上会')
if meet.state in 'on_meet' or meet.state != 'on_approval':
raise UserError('当前状态不可上会')
meet.write({"state": "on_meet"})
issue_active_ids = self.env["issue.library"].browse(
self._context.get('active_ids', self._context.get('active_id')))
@@ -98,7 +108,20 @@ class IssueLibrary(models.Model):
'default_room_booking_library_ids': [(6, 0, issue_active_ids.ids)],
}
}
def approval_details(self):
for record in self:
if record.state in ['cancel','draft']:
raise UserError('当前状态不可查看审批详情')
self.ensure_one()
approval_id = self.issue_approval_id.id
form_id = self.env.ref("yuthon_issue.issue_library_approval_form").id
return{
"type": "ir.actions.act_window",
"name": "审批详情",
"res_model": "issue.approval",
"views": [[form_id, "form"]],
"res_id": approval_id
}
@api.depends('issue_library_line_ids')
def _compute_issue_library_line_ids(self):
for line in self:
@@ -124,6 +147,7 @@ class IssueLibraryLine(models.Model):
team_meet = fields.Selection(related='issue_approval_decision_id.team_meet', string='经营班子会')
board_meet = fields.Selection(related='issue_approval_decision_id.board_meet', string='董事会')
district_bureau = fields.Selection(related='issue_approval_decision_id.district_bureau', string='上级单位')
ordinal = fields.Char(related='issue_approval_decision_id.sequence',string='序号')
class IssueLibraryApprovalLine(models.Model):
yuthon_issue/security/ir.model.access.csv
+7
View File
@@ -13,3 +13,10 @@ access_issue_library,issue_library,model_issue_library,group_topic_admin,1,1,1,1
access_issue_library,issue_library,model_issue_library,group_party_topic,1,1,1,1
access_issue_library,issue_library,model_issue_library,group_team_topic,1,1,1,1
access_issue_library,issue_library,model_issue_library,group_board_topic,1,1,1,1
access_issue_library,issue_library,model_issue_library,group_property_admin,1,1,1,1
access_issue_library,issue_library,model_issue_library,property_group_party_topic,1,1,1,1
access_issue_library,issue_library,model_issue_library,property_group_team_topic,1,1,1,1
access_issue_library,issue_library,model_issue_library,group_grain_admin,1,1,1,1
access_issue_library,issue_library,model_issue_library,group_grain_party_topic,1,1,1,1
access_issue_library,issue_library,model_issue_library,group_grain_team_topic,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
13 access_issue_library issue_library model_issue_library group_team_topic 1 1 1 1
14 access_issue_library issue_library model_issue_library group_board_topic 1 1 1 1
15 access_issue_library issue_library model_issue_library group_property_admin 1 1 1 1
16 access_issue_library issue_library model_issue_library property_group_party_topic 1 1 1 1
17 access_issue_library issue_library model_issue_library property_group_team_topic 1 1 1 1
18 access_issue_library issue_library model_issue_library group_grain_admin 1 1 1 1
19 access_issue_library issue_library model_issue_library group_grain_party_topic 1 1 1 1
20 access_issue_library issue_library model_issue_library group_grain_team_topic 1 1 1 1
21
22
yuthon_issue/security/issue_security_group.xml
+40 -2
View File
@@ -22,11 +22,49 @@
<field name="category_id" ref="module_category_issue_library"/>
</record>
<!-- 议题管理员群组 -->
<!-- 物管党之管理员群组 -->
<record id="property_group_party_topic" model="res.groups">
<field name="name">物管党支委议题</field>
<field name="category_id" ref="module_category_issue_library"/>
</record>
<!-- 物管班子会管理员群组 -->
<record id="property_group_team_topic" model="res.groups">
<field name="name">物管班子会议题</field>
<field name="category_id" ref="module_category_issue_library"/>
</record>
<!-- 物管管理员群组 -->
<record id="group_property_admin" model="res.groups">
<field name="name">物管议题管理员</field>
<field name="category_id" ref="module_category_issue_library"/>
<field name="implied_ids" eval="[(4, ref('property_group_party_topic')), (4, ref('property_group_team_topic'))]"/>
<field name="users" eval="[(4, ref('base.user_admin'))]"/>
</record>
<!-- 粮储党之管理员群组-->
<record id="group_grain_party_topic" model="res.groups">
<field name="name">粮储党支委议题</field>
<field name="category_id" ref="module_category_issue_library"/>
</record>
<!-- 粮储班子会管理员群组 -->
<record id="group_grain_team_topic" model="res.groups">
<field name="name">粮储班子会议题</field>
<field name="category_id" ref="module_category_issue_library"/>
</record>
<!-- 粮储管理员群组 -->
<record id="group_grain_admin" model="res.groups">
<field name="name">粮储议题管理员</field>
<field name="category_id" ref="module_category_issue_library"/>
<field name="implied_ids" eval="[(4, ref('group_grain_party_topic')), (4, ref('group_grain_team_topic'))]"/>
<field name="users" eval="[(4, ref('base.user_admin'))]"/>
</record>
<!-- 议题管理员群组 -->
<record id="group_topic_admin" model="res.groups">
<field name="name">议题管理员</field>
<field name="category_id" ref="module_category_issue_library"/>
<field name="implied_ids" eval="[(4, ref('group_party_topic')), (4, ref('group_team_topic')), (4, ref('group_board_topic'))]"/>
<field name="implied_ids" eval="[(4, ref('group_party_topic')), (4, ref('group_team_topic')), (4, ref('group_board_topic')) ,
(4, ref('group_property_admin')),(4, ref('property_group_party_topic')),(4, ref('property_group_team_topic')),(4, ref('group_grain_admin')),
(4, ref('group_grain_party_topic')),(4, ref('group_grain_team_topic'))]"/>
<field name="users" eval="[(4, ref('base.user_admin'))]"/>
</record>
</odoo>
yuthon_issue/views/issue_approval_views.xml
+2 -1
View File
@@ -25,7 +25,7 @@
<sheet>
<group col="4" string="个人信息">
<group>
<field name="user_id"/>
<field name="employee_id"/>
<field name="is_attend"/>
</group>
<group>
@@ -56,6 +56,7 @@
<tree editable="bottom">
<field name="issue_approval_id" column_invisible="1"/>
<field name="issue_library_id"/>
<field name="employee_id"/>
<field name="approval_decision_sequence"/>
<field name="is_party"/>
<field name="is_class"/>
yuthon_issue/views/issue_library_views.xml
+901 -154
View File
File diff suppressed because it is too large Load Diff
yuthon_issue/views/menus.xml
+186 -44
View File
@@ -20,15 +20,10 @@
<menuitem id="tianhe_issue_library_menu_approval"
parent="tianhe_issue_library_menu"
name="审批中"
name="已审批"
action="issue_library_action_approval"
sequence="5"/>
<menuitem id="tianhe_issue_library_menu_will"
parent="tianhe_issue_library_menu"
name="待上会"
action="issue_library_action_will"
sequence="6"/>
<menuitem id="tianhe_issue_library_menu_on_meet"
parent="tianhe_issue_library_menu"
@@ -42,53 +37,18 @@
action="issue_library_action_cancel"
sequence="15"/>
<!-- 物管，粮储 议题库管理 -->
<menuitem id="tianhe_other_issue_library_menu"
parent="tianhe_issue_library_menu_root"
name="子公司议题库"
sequence="8"/>
<menuitem id="tianhe_other_issue_library_approval"
parent="tianhe_other_issue_library_menu"
name="审批中"
action="issue_library_action_approval2"
sequence="2"/>
<menuitem id="tianhe_other_issue_library_will"
parent="tianhe_other_issue_library_menu"
name="待上会"
action="issue_library_action_will2"
sequence="3"/>
<menuitem id="tianhe_other_issue_library_done"
parent="tianhe_other_issue_library_menu"
name="已上会"
action="issue_library_action_done2"
sequence="4"/>
<menuitem id="tianhe_other_issue_library_cancel"
parent="tianhe_other_issue_library_menu"
name="已取消"
action="issue_library_action_cancel2"
sequence="5"/>
<menuitem id="tianhe_issue_library_all2"
parent="tianhe_other_issue_library_menu"
name="全部"
action="issue_library_action2"
sequence="1"/>
<menuitem id="issue_approval_menu"
parent="tianhe_issue_library_menu_root"
name="议题审批"
action="issue_library_approval_action"
sequence="9"/>
sequence="28"/>
<menuitem id="issue_meeting_minutes_menu"
parent="tianhe_issue_library_menu_root"
name="会议纪要"
action="action_issue_meeting_minutes"
sequence="12"/>
sequence="30"/>
<menuitem id="issue_approval_decision_menu"
parent="tianhe_issue_library_menu_root"
@@ -172,7 +132,7 @@
<!--董事会议题-->
<menuitem id="tianhe_issue_library_menu_root5"
<menuitem id="tianhe_issue_library_menu_root5"
name="董事会议题库"
parent="tianhe_issue_library_menu_root"
groups="group_board_topic"
@@ -202,5 +162,187 @@
action="issue_library_action_cancel5"
sequence="9"/>
<!-- 物管党之议题库-->
<menuitem id="tianhe_issue_library_menu_root6"
parent="tianhe_issue_library_menu_root"
name="物管党之委议题库"
groups="property_group_party_topic"
sequence="10"/>
<menuitem id="issue_library_menu6"
parent="tianhe_issue_library_menu_root6"
name="全部"
action="issue_library_action6"
sequence="1"/>
<menuitem id="tianhe_other_issue_library_will6"
parent="tianhe_issue_library_menu_root6"
name="待上会"
action="issue_library_action_will6"
sequence="5"/>
<menuitem id="tianhe_other_issue_library_done6"
parent="tianhe_issue_library_menu_root6"
name="已上会"
action="issue_library_action_done6"
sequence="7"/>
<menuitem id="tianhe_other_issue_library_cancel6"
parent="tianhe_issue_library_menu_root6"
name="已取消"
action="issue_library_action_cancel6"
sequence="9"/>
<!--物管班子会议题库-->
<menuitem id="tianhe_issue_library_menu_root7"
parent="tianhe_issue_library_menu_root"
name="物管班子会议题库"
groups="property_group_team_topic"
sequence="12"/>
<menuitem id="issue_library_menu7"
parent="tianhe_issue_library_menu_root7"
name="全部"
action="issue_library_action7"
sequence="1"/>
<menuitem id="tianhe_other_issue_library_will7"
parent="tianhe_issue_library_menu_root7"
name="待上会"
action="issue_library_action_will7"
sequence="5"/>
<menuitem id="tianhe_other_issue_library_done7"
parent="tianhe_issue_library_menu_root7"
name="已上会"
action="issue_library_action_done7"
sequence="7"/>
<menuitem id="tianhe_other_issue_library_cancel7"
parent="tianhe_issue_library_menu_root7"
name="已取消"
action="issue_library_action_cancel7"
sequence="9"/>
<!--粮储党之议题库-->
<menuitem id="tianhe_issue_library_menu_root9"
parent="tianhe_issue_library_menu_root"
name="粮储党之委议题库"
groups="group_grain_party_topic"
sequence="16"/>
<menuitem id="issue_library_menu9"
parent="tianhe_issue_library_menu_root9"
name="全部"
action="issue_library_action9"
sequence="1"/>
<menuitem id="tianhe_other_issue_library_will9"
parent="tianhe_issue_library_menu_root9"
name="待上会"
action="issue_library_action_will9"
sequence="5"/>
<menuitem id="tianhe_other_issue_library_done9"
parent="tianhe_issue_library_menu_root9"
name="已上会"
action="issue_library_action_done9"
sequence="7"/>
<menuitem id="tianhe_other_issue_library_cancel9"
parent="tianhe_issue_library_menu_root9"
name="已取消"
action="issue_library_action_cancel9"
sequence="9"/>
<!--粮储班子议题库-->
<menuitem id="tianhe_issue_library_menu_root10"
parent="tianhe_issue_library_menu_root"
name="粮储班子会议题库"
groups="group_grain_team_topic"
sequence="18"/>
<menuitem id="issue_library_menu10"
parent="tianhe_issue_library_menu_root10"
name="全部"
action="issue_library_action10"
sequence="1"/>
<menuitem id="tianhe_other_issue_library_will10"
parent="tianhe_issue_library_menu_root10"
name="待上会"
action="issue_library_action_will10"
sequence="5"/>
<menuitem id="tianhe_other_issue_library_done10"
parent="tianhe_issue_library_menu_root10"
name="已上会"
action="issue_library_action_done10"
sequence="7"/>
<menuitem id="tianhe_other_issue_library_cancel10"
parent="tianhe_issue_library_menu_root10"
name="已取消"
action="issue_library_action_cancel10"
sequence="9"/>
<!--物管议题库-->
<menuitem id="tianhe_issue_library_menu_root11"
parent="tianhe_issue_library_menu_root"
name="物管议题库"
groups="group_property_admin"
sequence="9"/>
<menuitem id="issue_library_menu11"
parent="tianhe_issue_library_menu_root11"
name="全部"
action="issue_library_action11"
sequence="1"/>
<menuitem id="tianhe_other_issue_library_will11"
parent="tianhe_issue_library_menu_root11"
name="已审批"
action="issue_library_action_will11"
sequence="5"/>
<menuitem id="tianhe_other_issue_library_done11"
parent="tianhe_issue_library_menu_root11"
name="已上会"
action="issue_library_action_done11"
sequence="7"/>
<menuitem id="tianhe_other_issue_library_cancel11"
parent="tianhe_issue_library_menu_root11"
name="已取消"
action="issue_library_action_cancel11"
sequence="9"/>
<!--粮储议题库-->
<menuitem id="tianhe_issue_library_menu_root12"
parent="tianhe_issue_library_menu_root"
name="粮储议题库"
groups="group_grain_team_topic"
sequence="15"/>
<menuitem id="issue_library_menu12"
parent="tianhe_issue_library_menu_root12"
name="全部"
action="issue_library_action12"
sequence="1"/>
<menuitem id="tianhe_other_issue_library_will12"
parent="tianhe_issue_library_menu_root12"
name="已审批"
action="issue_library_action_will12"
sequence="5"/>
<menuitem id="tianhe_other_issue_library_done12"
parent="tianhe_issue_library_menu_root12"
name="已上会"
action="issue_library_action_done12"
sequence="7"/>
<menuitem id="tianhe_other_issue_library_cancel12"
parent="tianhe_issue_library_menu_root12"
name="已取消"
action="issue_library_action_cancel12"
sequence="9"/>
</odoo>
yuthon_performance/models/yuthon_index_employee.py
-12
View File
@@ -29,18 +29,6 @@ class YuthonIndexEmployee(models.Model):
}}
def put_assessment_tasks1_approval(self):
pass
# index_applicant_ids = self.env["yuthon.index.employee"].browse(
# self._context.get('active_ids', self._context.get('active_id')))
# for record in index_applicant_ids:
# return {
# "type": "ir.actions.act_window",
# "res_model": 'yuthon.assessment.tasks1',
# "res_id": record.id,
# "name":"员工考核任务",
# "context":{
# "default_employee_id":record.users_role_ids.ids
# }
# }
def open_record(self):