diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
index e3a8deb08..62a683d0e 100644
--- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
@@ -17,15 +17,20 @@ class YuthonOnboardApproval(models.Model):
_inherit = ['soong.workflow.mixin']
- name = fields.Char(string='名称', default='入职申请表')
+ name = fields.Char(string='名称', default='人事合同')
code = fields.Char(string="编号",
default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_onboard_approval_code'))
worker_name = fields.Char(string='姓名')
+ department_id = fields.Many2one('hr.department', string="部门")
+ job_id = fields.Many2one('hr.job', string="岗位")
+
yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'),
- ('thlc', '天河粮储'), ('tctj', '天投城建')], string="所属公司")
+ ('thlc', '天河粮储'), ('tctj', '天投城建')], string="甲方")
date_birth = fields.Date(string='出生年月')
nation = fields.Selection(nation_list, string='民族')
- grades = fields.Many2one('yuthon.job.lv', string='职级')
+ grades_id = fields.Many2one('yuthon.job.lv', string='职级')
+ account = fields.Char(string='账号')
+ bank = fields.Char(string='开户行')
origin = fields.Char(string='籍贯')
political = fields.Selection([('cpc_dang', '中共党员'), ('nld', '民盟'),
('league_member', '共青团员'), ('people', '群众')], string="政治面貌")
@@ -35,7 +40,8 @@ class YuthonOnboardApproval(models.Model):
('two', '2个月'), ('three', '3个月'), ('year', '1年')], string='试用期')
contract_start = fields.Date(string='合同开始日期')
contract_end = fields.Date(string='合同结束日期')
- salary = fields.Float(string='薪资')
+ salary = fields.Float(string='基本工资')
+ oter = fields.Text(string='其他约定')
social_security = fields.Char(string='社保时长')
documents_ids = fields.Many2many('documents.document', string="附件")
@@ -46,9 +52,6 @@ class YuthonOnboardApproval(models.Model):
#合同
- handling_opinions = fields.Text(string="经办意见")
- complex_opinions = fields.Text(string="复合意见")
- department_manager = fields.Text(string="部门经理")
- demand_sector = fields.Text(string="需求部门")
- other_departments = fields.Text(string="其他部门")
- company_leadership = fields.Text(string="公司领导")
\ No newline at end of file
+ title = fields.Char(string='标题')
+ contract_code = fields.Char(string='合同编号')
+ contracted_status = fields.Selection([('first', '首签'), ('renew', '续签')], string='合同状态')
diff --git a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
index c9ae7741e..3f43b2135 100644
--- a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
@@ -26,16 +26,28 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -43,7 +55,6 @@
-
@@ -51,17 +62,30 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
+
+
+
diff --git a/yuthon_issue/__manifest__.py b/yuthon_issue/__manifest__.py
index 2ac78637e..3f2af4574 100644
--- a/yuthon_issue/__manifest__.py
+++ b/yuthon_issue/__manifest__.py
@@ -20,6 +20,7 @@
'views/issue_approval_class_views.xml',
'views/issue_approval_boss_views.xml',
'views/inherit_room_booking_views.xml',
+ 'views/issue_approval_decision_views.xml',
'views/menus.xml',
],
'installable': True,
diff --git a/yuthon_issue/models/__init__.py b/yuthon_issue/models/__init__.py
index 87f84b089..a4d7598e5 100644
--- a/yuthon_issue/models/__init__.py
+++ b/yuthon_issue/models/__init__.py
@@ -6,3 +6,4 @@ from . import issue_type
from . import issue_approval_class
from . import issue_approval_boss
from . import inherit_room_booking
+from . import issue_approval_decision
diff --git a/yuthon_issue/models/issue_approval_decision.py b/yuthon_issue/models/issue_approval_decision.py
new file mode 100644
index 000000000..737485fae
--- /dev/null
+++ b/yuthon_issue/models/issue_approval_decision.py
@@ -0,0 +1,21 @@
+from odoo import api, fields, models, tools
+from odoo.exceptions import ValidationError
+
+
+
+class IssueApprovalDecision(models.Model):
+ _name = "issue.approval.decision"
+ _description = '决策清单'
+ _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin']
+ _rec_name = 'name'
+
+ name = fields.Char(string='名称')
+ category_matter = fields.Char(string='事项类别')
+ specifics = fields.Char(string='具体事项')
+ council = fields.Selection([('1','审'), ('2','决'), ('3',' ')], string='党总委员会')
+ team_meet = fields.Selection([('1','审'), ('2','决'), ('3',' ')], string='经营班子会')
+ board_meet = fields.Selection([('1','审'), ('2','决'), ('3',' ')], string='董事会')
+ district_bureau = fields.Char(string='区政府、区财政局')
+ remarks = fields.Char(string='备注')
+
+
diff --git a/yuthon_issue/security/ir.model.access.csv b/yuthon_issue/security/ir.model.access.csv
index d1f18eba3..50ae9e467 100644
--- a/yuthon_issue/security/ir.model.access.csv
+++ b/yuthon_issue/security/ir.model.access.csv
@@ -3,4 +3,5 @@ access_issue_library,issue_library,model_issue_library,base.group_user,1,1,1,1
access_issue_approval_boss,issue_approval_boss,model_issue_approval_boss,base.group_user,1,1,1,1
access_issue_approval_class,issue_approval_class,model_issue_approval_class,base.group_user,1,1,1,1
access_issue_approval_party,issue_approval_party,model_issue_approval_party,base.group_user,1,1,1,1
+access_issue_approval_decision,issue_approval_decision,model_issue_approval_decision,base.group_user,1,1,1,1
diff --git a/yuthon_issue/views/issue_approval_decision_views.xml b/yuthon_issue/views/issue_approval_decision_views.xml
new file mode 100644
index 000000000..63182de95
--- /dev/null
+++ b/yuthon_issue/views/issue_approval_decision_views.xml
@@ -0,0 +1,39 @@
+
+
+
+ issue.approval.decision.tree
+ issue.approval.decision
+
+
+
+
+
+
+
+
+
+ issue.approval.decision.form
+ issue.approval.decision
+
+
+
+
+
+ 决策清单
+ issue.approval.decision
+ tree,form
+
+
diff --git a/yuthon_issue/views/menus.xml b/yuthon_issue/views/menus.xml
index eca8b842a..1c7eb2606 100644
--- a/yuthon_issue/views/menus.xml
+++ b/yuthon_issue/views/menus.xml
@@ -84,4 +84,10 @@
name="董事会议题审批"
action="issue_approval_boss_action"
sequence="30"/>
+
\ No newline at end of file
diff --git a/yuthon_work_brand/views/work_menus.xml b/yuthon_work_brand/views/work_menus.xml
index c2b6687aa..7d9d38b78 100644
--- a/yuthon_work_brand/views/work_menus.xml
+++ b/yuthon_work_brand/views/work_menus.xml
@@ -157,6 +157,11 @@
name="董事会议题审批"
action="yuthon_issue.issue_approval_boss_action"
sequence="5"/>
+