diff --git a/yuthon_issue/__manifest__.py b/yuthon_issue/__manifest__.py
index cad30076b..31673b6f9 100644
--- a/yuthon_issue/__manifest__.py
+++ b/yuthon_issue/__manifest__.py
@@ -17,6 +17,8 @@
'security/issue_security_group.xml',
'security/ir.model.access.csv',
'data/issue_library_code_data.xml',
+ 'data/issue_meeting_code_data.xml',
+ 'data/issue_role_groups_data.xml',
'views/issue_library_views.xml',
'views/issue_type_views.xml',
'views/issue_approval_views.xml',
diff --git a/yuthon_issue/data/issue_meeting_code_data.xml b/yuthon_issue/data/issue_meeting_code_data.xml
new file mode 100644
index 000000000..c9f34977d
--- /dev/null
+++ b/yuthon_issue/data/issue_meeting_code_data.xml
@@ -0,0 +1,10 @@
+
+
+
+ 会议纪要编号
+ issue_meeting_minutes_code
+ HY%(y)s%(month)s%(day)s
+ 3
+
+
+
\ No newline at end of file
diff --git a/yuthon_issue/data/issue_role_groups_data.xml b/yuthon_issue/data/issue_role_groups_data.xml
new file mode 100644
index 000000000..d09adef02
--- /dev/null
+++ b/yuthon_issue/data/issue_role_groups_data.xml
@@ -0,0 +1,39 @@
+
+
+
+ 党支委议题
+ departmental_role
+
+
+ 班子会议题
+ departmental_role
+
+
+ 董事会议题
+ departmental_role
+
+
+ 物管议题管理员
+ departmental_role
+
+
+ 物管党支委议题
+ departmental_role
+
+
+ 物管班子会议题
+ departmental_role
+
+
+ 粮储党支委议题
+ departmental_role
+
+
+ 粮储班子会议题
+ departmental_role
+
+
+ 粮储议题管理员
+ departmental_role
+
+
\ No newline at end of file
diff --git a/yuthon_issue/models/issue_approval.py b/yuthon_issue/models/issue_approval.py
index 08c790aeb..a14d535d2 100644
--- a/yuthon_issue/models/issue_approval.py
+++ b/yuthon_issue/models/issue_approval.py
@@ -19,7 +19,7 @@ class IssueApproval(models.Model):
('thtjbb', '天河投资本部')], string="所属公司",
related='employee_id.yuthon_company')
meeting_details = fields.Char(string="会议详情")
- job_id = fields.Many2one('employee_id.job_id', string="岗位")
+ job_id = fields.Many2one(related='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='议题附件')
@@ -31,7 +31,7 @@ class IssueApproval(models.Model):
issue_display = fields.Char(string="议题事项", default='{"template": "yuthon_issue.html_issue_demo"}')
decision_display = fields.Char(string="决策清单", default='{"template": "yuthon_issue.html_decision_demo"}')
is_parent_unit = fields.Boolean(string="上级单位")
-
+ performance_id = fields.Many2one('issue.meeting.minutes')
def pub_meeting_minutes(self):
pass
diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py
index 3153282f9..786e2ef0d 100644
--- a/yuthon_issue/models/issue_library.py
+++ b/yuthon_issue/models/issue_library.py
@@ -104,7 +104,6 @@ class IssueLibrary(models.Model):
"res_model": "room.booking",
"views": [[form_id, "form"]],
"context": {
- 'default_name': '',
'default_room_booking_library_ids': [(6, 0, issue_active_ids.ids)],
}
}
diff --git a/yuthon_issue/models/issue_meeting_minutes.py b/yuthon_issue/models/issue_meeting_minutes.py
index 05dcdbb52..f09a3a132 100644
--- a/yuthon_issue/models/issue_meeting_minutes.py
+++ b/yuthon_issue/models/issue_meeting_minutes.py
@@ -11,10 +11,11 @@ class IssueMeetingMinutes(models.Model):
meeting_id = fields.Many2one('room.booking',string='会议名称', required=True)
meeting_type_id = fields.Many2one('room.meeting.type', string="会议类型")
meeting_date = fields.Datetime(string="会议时间")
+ code = fields.Char(string='编号', required=True, copy=False,
+ default=lambda self: self.env['ir.sequence'].next_by_code('issue_meeting_code_num_sequence'))
meeting_minutes_ids = fields.One2many('issue.meeting.minutes.line', 'meeting_minutes_id', string="会议纪要明细")
notice_documents_ids = fields.Many2many('documents.document', string="纪要签名附件")
-
class IssueMeetingMinutesLine(models.Model):
_name = 'issue.meeting.minutes.line'
_description = '会议纪要明细行'
diff --git a/yuthon_issue/views/issue_meeting_minutes_views.xml b/yuthon_issue/views/issue_meeting_minutes_views.xml
index 90e003400..7314c0c31 100644
--- a/yuthon_issue/views/issue_meeting_minutes_views.xml
+++ b/yuthon_issue/views/issue_meeting_minutes_views.xml
@@ -6,6 +6,7 @@
+
@@ -19,6 +20,7 @@
+