添加功能
This commit is contained in:
zhouzhou
@@ -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="公司领导")
|
||||
title = fields.Char(string='标题')
|
||||
contract_code = fields.Char(string='合同编号')
|
||||
contracted_status = fields.Selection([('first', '首签'), ('renew', '续签')], string='合同状态')
|
||||
|
||||
@@ -26,16 +26,28 @@
|
||||
<field name="name" required="1" />
|
||||
</h1>
|
||||
</div>
|
||||
<group col="4">
|
||||
<group col="2">
|
||||
<group>
|
||||
<field name="contract_code"/>
|
||||
<field name="title"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="contracted_status"/>
|
||||
</group>
|
||||
</group>
|
||||
<group>
|
||||
<field name="yuthon_company"/>
|
||||
</group>
|
||||
<group col="4" string="乙方信息">
|
||||
<group>
|
||||
<field name="worker_name" required="1"/>
|
||||
<field name="yuthon_company"/>
|
||||
<field name="documents_ids" widget="many2many_tags"/>
|
||||
<field name="date_birth"/>
|
||||
<field name="salary"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="nation"/>
|
||||
<field name="grades"/>
|
||||
<field name="grades_id"/>
|
||||
<field name="origin"/>
|
||||
<field name="social_security"/>
|
||||
</group>
|
||||
@@ -43,7 +55,6 @@
|
||||
<field name="political"/>
|
||||
<field name="education"/>
|
||||
<field name="onboard_time"/>
|
||||
<field name="documents_ids" widget="many2many_tags"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="probation_period"/>
|
||||
@@ -51,17 +62,30 @@
|
||||
<field name="contract_end"/>
|
||||
</group>
|
||||
</group>
|
||||
<group col="3">
|
||||
<group col="2">
|
||||
<group>
|
||||
<field name="account"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="bank"/>
|
||||
</group>
|
||||
</group>
|
||||
<group>
|
||||
<field name="oter"/>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="个人信息详情">
|
||||
<group col="2">
|
||||
<group>
|
||||
<field name="details_personal_information_form"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="details_recruitment_needs_form"/>
|
||||
<field name="details_interview_form"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="details_interview_form"/>
|
||||
</group>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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='备注')
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
@@ -0,0 +1,39 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<odoo>
|
||||
<record id="view_issue_approval_decision_tree" model="ir.ui.view">
|
||||
<field name="name">issue.approval.decision.tree</field>
|
||||
<field name="model">issue.approval.decision</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="决策清单">
|
||||
<field name="name"/>
|
||||
<field name="category_matter"/>
|
||||
<field name="specifics"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_issue_approval_decision_form" model="ir.ui.view">
|
||||
<field name="name">issue.approval.decision.form</field>
|
||||
<field name="model">issue.approval.decision</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="决策清单">
|
||||
<sheet>
|
||||
<div class="oe_title">
|
||||
<label for="name"/>
|
||||
<h1>
|
||||
<field name="name" required="1"/>
|
||||
</h1>
|
||||
</div>
|
||||
<group>
|
||||
<field name="category_matter"/>
|
||||
<field name="specifics"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record id="issue_approval_decision_action" model="ir.actions.act_window">
|
||||
<field name="name">决策清单</field>
|
||||
<field name="res_model">issue.approval.decision</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
</odoo>
|
||||
@@ -84,4 +84,10 @@
|
||||
name="董事会议题审批"
|
||||
action="issue_approval_boss_action"
|
||||
sequence="30"/>
|
||||
<menuitem
|
||||
id="issue_approval_decision_menu"
|
||||
parent="issue_approval_menu"
|
||||
name="决策清单"
|
||||
action="issue_approval_decision_action"
|
||||
sequence="40"/>
|
||||
</odoo>
|
||||
@@ -157,6 +157,11 @@
|
||||
name="董事会议题审批"
|
||||
action="yuthon_issue.issue_approval_boss_action"
|
||||
sequence="5"/>
|
||||
<menuitem id="issue_approval_decision_menu_board"
|
||||
parent="issue_approval_menu_board"
|
||||
name="决策清单"
|
||||
action="yuthon_issue.issue_approval_decision_action"
|
||||
sequence="7"/>
|
||||
<!-- 会议室 -->
|
||||
<menuitem id="room_menu_root_board"
|
||||
name="会议室"
|
||||
|
||||
Reference in New Issue
Block a user