diff --git a/yuthon_approval/__manifest__.py b/yuthon_approval/__manifest__.py
index ca6bcd668..3a632047f 100644
--- a/yuthon_approval/__manifest__.py
+++ b/yuthon_approval/__manifest__.py
@@ -21,6 +21,7 @@
         'views/inherit_approval_request_views.xml',
         'views/approval_process_views.xml',
         'views/approval_notice_note_views.xml',
+        'views/holiday_setting.xml',
         'views/approval_user_views.xml',
         'views/issue_library_views.xml',
         'views/send_receive_messages_management.xml',
diff --git a/yuthon_approval/models/__init__.py b/yuthon_approval/models/__init__.py
index 7077ee15e..0cbbb6e50 100644
--- a/yuthon_approval/models/__init__.py
+++ b/yuthon_approval/models/__init__.py
@@ -5,4 +5,5 @@ from . import inherit_approval_request
 from . import approval_category_approver
 from . import approval_notice_note
 from . import issue_library
+from . import holiday_setting
 
diff --git a/yuthon_approval/models/holiday_setting.py b/yuthon_approval/models/holiday_setting.py
index 79b1c8e81..3184ed731 100644
--- a/yuthon_approval/models/holiday_setting.py
+++ b/yuthon_approval/models/holiday_setting.py
@@ -8,5 +8,18 @@ class HolidaySetting(models.Model):
     _description = '假期类型配置'
     _rec_name = 'name'
 
-    name = fields.Char(string="假期类型")
-
+    company_id = fields.Many2one('res.company', string='公司', index=True, default=lambda self: self.env.company)
+    department_id = fields.Many2one('hr.department', string='部门')
+    name = fields.Selection([('bride', '婚嫁'), ('maternity', '产假'),
+                                    ('family_planning', '计生假'), ('bereavement', '丧假'), ('years', '年假'),
+                                    ('family', '探亲假'), ('sick', '病假'), ('examination', '考试假'),
+                                    ('Parent_conference', '家长会假'), ('leave', '事假')], string="假期类型")
+    gender = fields.Selection([('man', '男'), ('woman', '女')], string="性别")
+    enjoyment_conditions = fields.Char(string="享受条件")
+    annual = fields.Char(string="年次")
+    holiday_days = fields.Char(string="假期天数")
+    travel_holiday = fields.Char(string="路程假")
+    reception = fields.Char(string="待遇")
+    rest_provision = fields.Char(string="休假规定")
+    rest_conditions = fields.Char(string="休假条件")
+    remark = fields.Char(string="备注")
diff --git a/yuthon_approval/security/approval_process.xml b/yuthon_approval/security/approval_process.xml
index 8fa61beb3..dcc72b686 100644
--- a/yuthon_approval/security/approval_process.xml
+++ b/yuthon_approval/security/approval_process.xml
@@ -12,5 +12,11 @@
             <field name="model_id" ref="model_issue_library"/>
             <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
         </record>
+
+        <record id="tianhe_holiday_setting" model="ir.rule">
+            <field name="name">假期多公司权限</field>
+            <field name="model_id" ref="model_holiday_setting"/>
+            <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_approval/security/ir.model.access.csv b/yuthon_approval/security/ir.model.access.csv
index d17274bd5..af5aa2b2e 100644
--- a/yuthon_approval/security/ir.model.access.csv
+++ b/yuthon_approval/security/ir.model.access.csv
@@ -7,6 +7,7 @@ access_approval_notice_wizard,approval_notice_wizard,model_approval_notice_wizar
 access_approval_refuse_wizard,approval_refuse_wizard,model_approval_refuse_wizard,base.group_user,1,1,1,1
 access_approval_notice_note_users,approval_notice_note_user,model_approval_notice_note,base.group_user,1,1,1,1
 access_issue_library,issue_library,model_issue_library,base.group_user,1,1,1,1
+access_holiday_setting,holiday_setting,model_holiday_setting,base.group_user,1,1,1,1
 
 
 
diff --git a/yuthon_approval/views/holiday_setting.xml b/yuthon_approval/views/holiday_setting.xml
new file mode 100644
index 000000000..3fb371295
--- /dev/null
+++ b/yuthon_approval/views/holiday_setting.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_holiday_setting_tree" model="ir.ui.view">
+        <field name="name">holiday.setting.tree</field>
+        <field name="model">holiday.setting</field>
+        <field name="arch" type="xml">
+            <tree string="假期类型配置">
+                <field name="name"/>
+                <field name="company_id"/>
+                <field name="department_id"/>
+                <field name="gender"/>
+                <field name="enjoyment_conditions"/>
+                <field name="annual"/>
+                <field name="holiday_days"/>
+                <field name="travel_holiday"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_holiday_setting_form" model="ir.ui.view">
+        <field name="name">holiday.setting.tree</field>
+        <field name="model">holiday.setting</field>
+        <field name="arch" type="xml">
+            <form string="假期类型配置">
+                <header>
+                    <widget name="attach_document" string="附加文档" action="message_post"/>
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <label for="name"/>
+                        <h3>
+                            <field name="name" colspan="3"/>
+                        </h3>
+                    </div>
+                    <group>
+                        <!--产假-->
+                        <group>
+                            <field name="gender" invisible="name != 'maternity'"/>
+                            <field name="enjoyment_conditions"/>
+                            <field name="holiday_days"/>
+                        </group>
+                        <group>
+                            <field name="reception"/>
+                            <field name="rest_provision"/>
+                            <field name="rest_conditions"/>
+                            <field name="remark"/>
+                            <field name="department_id"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_holiday_setting_filter" model="ir.ui.view">
+        <field name="name">holiday.setting.search</field>
+        <field name="model">holiday.setting</field>
+        <field name="arch" type="xml">
+            <search string="假期类型">
+            </search>
+        </field>
+    </record>
+
+    <record id="holiday_setting_action" model="ir.actions.act_window">
+        <field name="name">假期类型配置</field>
+        <field name="res_model">holiday.setting</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="view_holiday_setting_filter"/>
+    </record>
+
+    <menuitem
+            id="tianhe_holiday_setting_menu"
+            parent="approvals.approvals_menu_config"
+            sequence="20"
+            name="假期类型配置"
+            action="holiday_setting_action"/>
+</odoo>
\ No newline at end of file
diff --git a/yuthon_notice/__manifest__.py b/yuthon_notice/__manifest__.py
index 665be5816..6b7410d78 100644
--- a/yuthon_notice/__manifest__.py
+++ b/yuthon_notice/__manifest__.py
@@ -14,8 +14,8 @@
     'data': [
         'security/ir.model.access.csv',
         'data/approval_category_type_data.xml',
-        'views/notice_category.xml',
         'views/yuthon_ntice_views.xml',
+        'views/notice_category.xml',
     ],
     'installable': True,
     'application': True,
diff --git a/yuthon_notice/views/notice_category.xml b/yuthon_notice/views/notice_category.xml
index 54d8c79ce..6f7f3aff6 100644
--- a/yuthon_notice/views/notice_category.xml
+++ b/yuthon_notice/views/notice_category.xml
@@ -27,10 +27,10 @@
     </record>
 
     <menuitem
-        id="yuthon_notice_approval_menu"
-        parent="yuthon_notice_menu_config_root"
-        name="通知公告审批"
-        action="approval_notice_category_action"
-        sequence="10"/>
+            id="yuthon_notice_approval_menu"
+            parent="yuthon_notice_menu_config_root"
+            name="通知公告审批"
+            action="approval_notice_category_action"
+            sequence="10"/>
 
 </odoo>
\ No newline at end of file