!237 zhou

Merge pull request !237 from 李鹏宇/dev_zhou

yuthon_hr_employee/views/yuthon_job_lv_views.xml

@@ -22,14 +22,14 @@
 
     <!--  Actions  -->
     <record id="view_yuthon_job_lv_action" model="ir.actions.act_window">
-        <field name="name">职级配置</field>
+        <field name="name">职级管理</field>
         <field name="res_model">yuthon.job.lv</field>
         <field name="view_mode">tree,form</field>
     </record>
     <!--  Menus  -->
     <menuitem
         id="menu_yuthon_job_lv"
-        name="职级配置"
+        name="职级管理"
         action="view_yuthon_job_lv_action"
         parent="hr.menu_config_employee"
         sequence="6"/>

yuthon_notice/models/yuthon_notice.py

@@ -10,19 +10,19 @@ class YuthonNotice(models.Model):
     _rec_name = 'name'
     _order = "sequence desc"
 
-    name = fields.Char(string='通知公告标题')
+    name = fields.Char(string='标题')
     code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('notice_code'))
-    user_id = fields.Many2one('res.users', string="创建人", default=lambda self: self.env.user)
+    user_id = fields.Many2one('res.users', string="发布人", default=lambda self: self.env.user)
     department_id = fields.Many2one(related='user_id.employee_id.department_id', string="部门")
     department_ids = fields.Many2many('hr.department', string='部门范围')
     employee_ids = fields.Many2many('hr.employee', string='人员范围')
     users_role_ids = fields.Many2many('soong.user.role', string='角色范围')
     company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储')], string="公司", compute="_compute_company", store=True)
-    notice_type_id = fields.Many2one('yuthon.notice.type', string="公告类型")
+    notice_type_id = fields.Many2one('yuthon.notice.type', string="类型")
     create_date = fields.Date(string="发布日期")
     start_date = fields.Date(string="生效日期", default=fields.Date.today())
     end_date = fields.Date(string="终止日期")
-    sequence = fields.Integer(string="顺序", default=1)
+    sequence = fields.Integer(string="顺序", default=1, compute='_compute_sequence')
     notice_state = fields.Selection([('no', '未发布'), ('yes', '已发布'), ('stop', '已终止')], default='no', string="公告状态")
     notice_documents_ids = fields.Many2many('documents.document', string="附件")
     is_notice_roger = fields.Selection([('yes', '已读'), ('no', '未读')], default='no', string="确认状态")
@@ -32,6 +32,7 @@ class YuthonNotice(models.Model):
     read_number = fields.Integer(string='阅读量', compute="_compute_read_number", store=True)
     approval_user_id = fields.Many2one('res.users', string="审核人")
     approval_date = fields.Datetime(string="审核日期")
+    is_sticky = fields.Boolean(string="是否置顶")
 
     @api.depends('user_id')
     def _compute_company(self):
@@ -66,6 +67,14 @@ class YuthonNotice(models.Model):
     def on_sequence(self):
         self.sequence = 1
 
+    @api.onchange('is_sticky')
+    def _compute_sequence(self):
+        for i in self:
+            if i.is_sticky:
+                i.sequence = 1
+            else:
+                i.sequence = 0
+
     def no_sequence(self):
         self.sequence = 0
 

yuthon_notice/views/yuthon_notice_views.xml

@@ -5,17 +5,19 @@
         <field name="model">yuthon.notice</field>
         <field name="arch" type="xml">
             <tree string="公告管理">
+                <field name="user_id" string="发布人"/>
+                <field name="notice_type_id" string="类型"/>
                 <field name="name"/>
-                <field name="user_id"/>
-                <field name="department_id"/>
-                <field name="notice_type_id"/>
-                <field name="company_page"/>
+                <field name="department_id" column_invisible="1"/>
+                <field name="company_page" column_invisible="1"/>
                 <field name="create_date"/>
-                <field name="start_date"/>
-                <field name="end_date"/>
+                <field name="start_date" />
+                <field name="end_date" />
+                <field name="is_notice_roger" string="状态"/>
                 <button name="on_sequence" string="置顶" invisible="sequence != 0" type="object" class="btn-primary"/>
                 <button name="no_sequence" string="取消置顶" invisible="sequence != 1" type="object"
                         class="btn-primary"/>
+                <button name="look_up_notice_users" string="查阅情况" type="object" class="btn-primary"/>
                 <button name="stop_notice" string="终止" type="object" class="btn-primary"/>
                 <field name="sequence" column_invisible="1"/>
             </tree>
@@ -28,49 +30,42 @@
         <field name="arch" type="xml">
             <form string="公告管理">
                 <header>
-                    <button name="look_up_notice_users" string="查看确认信息" type="object" class="btn-primary"/>
                     <button name="notice_publish" string="发布"  type="object" class="btn-primary"/>
                 </header>
                 <sheet>
-                    <div class="oe_title">
-                        <label for="name"/>
-                        <h1>
-                            <field name="name" required="1"/>
-                        </h1>
-                    </div>
-                    <group>
-                        <field name="notice_text" widget="tinymce"/>
-                        <field name="notice_documents_ids" widget="many2many_tags"/>
-                        <field name="sequence" invisible="1"/>
+                    <group col="3">
+                            <group>
+                                <field name="company_page" string="发布公司"/>
+                                <field name="notice_type_id"/>
+                            </group>
+                            <group>
+                                <field name="department_id" string="发布部门"/>
+                                <field name="create_date"/>
+                            </group>
+                            <group>
+                                <field name="user_id" required="1"/>
+                                <field name="is_notice_roger"/>
+                            </group>
                     </group>
                     <group>
+                        <field name="name"/>
+                        <field name="notice_text" widget="tinymce"/>
+                        <field name="notice_documents_ids" widget="many2many_tags"/>
+                    </group>
+                    <group col="3">
                         <group>
-                            <field name="code"/>
-                            <field name="user_id"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="company_page" invisible="1"/>
-                            <field name="department_ids" widget="many2many_tags"/>
-                            <field name="employee_ids" widget="many2many_tags"/>
-                            <field name="users_role_ids" widget="many2many_tags"/>
+                            <field name="department_ids"  widget="many2many_tags"/>
                             <field name="is_change_notice"/>
-                            <field name="attn_notice"/>
                         </group>
                         <group>
-                            <field name="create_date"/>
-                            <field name="start_date"/>
-                            <field name="end_date"/>
-                            <field name="notice_state"/>
-                            <field name="notice_type_id"/>
-                            <field name="is_notice_roger"/>
+                            <field name="employee_ids"  widget="many2many_tags"/>
+                            <field name="is_sticky"/>
+                        </group>
+                        <group>
+                            <field name="users_role_ids"  widget="many2many_tags"/>
                         </group>
                     </group>
                 </sheet>
-                <div class="o_attachment_preview"/>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" groups="base.group_user"/>
-                    <field name="activity_ids"/>
-                    <field name="message_ids"/>
-                </div>
             </form>
         </field>
     </record>
@@ -80,12 +75,13 @@
         <field name="model">yuthon.notice</field>
         <field name="arch" type="xml">
             <search string="公告查询">
+                <filter string="标题" name="name"/>
+                <filter string="发布人" name="user_id"/>
                 <filter string="未发布" name="no " domain="[('notice_state', '=', 'no')]"/>
                 <filter string="已发布" name="done " domain="[('notice_state', '=', 'done')]"/>
-                <filter string="发布日期" name="create_date"/>
                 <group expand="0">
                     <filter name="group_statu" string="发布状态" context="{'group_by': 'notice_state'}"/>
-                    <filter name="group_type" string="发布类型" context="{'group_by': 'notice_type_id'}"/>
+                    <filter name="group_type" string="类型" context="{'group_by': 'notice_type_id'}"/>
                     <filter name="group_date" string="发布日期" context="{'group_by': 'create_date'}"/>
                 </group>
             </search>
@@ -104,10 +100,14 @@
         <field name="model">yuthon.notice</field>
         <field name="arch" type="xml">
             <tree string="公告管理" create="false" edit="false" delete="false">
+                 <field name="user_id" string="发布人"/>
+                <field name="notice_type_id" string="类型"/>
                 <field name="name"/>
-                <field name="department_id"/>
+                <field name="department_id" column_invisible="1"/>
+                <field name="company_page" column_invisible="1"/>
                 <field name="create_date"/>
-                <field name="notice_state"/>
+                <field name="start_date" column_invisible="1"/>
+                <field name="end_date" column_invisible="1"/>
             </tree>
         </field>
     </record>
@@ -124,22 +124,20 @@
                 </div>
                 <group col="3">
                     <group>
-                        <field name="notice_type_id"/>
-                        <field name="approval_user_id"/>
-                        <field name="create_date"/>
+                        <field name="notice_type_id" required="1" string="发布类型"/>
+                        <field name="user_id" required="1"/>
+                    </group>
+                    <group>
+                        <field name="department_ids" widget="many2many_tags"/>
+                        <field name="employee_ids"  widget="many2many_tags"/>
                     </group>
                     <group>
-                        <field name="user_id"/>
-                        <field name="approval_date"/>
                         <field name="read_number"/>
-                    </group>
-                    <group>
-                        <field name="department_id"/>
+                        <field name="create_date"/>
                     </group>
                 </group>
                 <group>
                     <field name="notice_text" widget="tinymce"/>
-                    <field name="notice_documents_ids" widget="many2many_tags"/>
                 </group>
             </form>
         </field>

yuthon_work_brand/views/hr_menus.xml

@@ -27,34 +27,11 @@
               name="招聘管理"
               parent="human_resources_menu_root_board"
               sequence="1"/>
-    <menuitem id="hr_recruitment_app_menu_board"
-              name="应用"
-              parent="hr_recruitment_menu_root_board"
-              sequence="1"/>
-    <menuitem id="hr_recruitment_job_menu_board"
-              name="招聘需求"
-              parent="hr_recruitment_app_menu_board"
-              action="hr_recruitment.action_hr_job"
-              sequence="1"/>
-    <menuitem id="hr_job_postings_menu_board"
-              name="招聘信息"
-              parent="hr_recruitment_app_menu_board"
-              action="yuthon_hr_employee.yuthon_job_postings_action"
-              sequence="3"/>
     <menuitem id="hr_recruitment_all_menu_board"
-              name="全部申请"
-              parent="hr_recruitment_app_menu_board"
+              name="应聘信息"
+              parent="human_resources_menu_root_board"
               action="hr_recruitment.crm_case_categ0_act_job"
-              sequence="5"/>
-    <menuitem id="hr_recruitment_report_menu_board"
-              name="报告"
-              parent="hr_recruitment_menu_root_board"
               sequence="3"/>
-    <menuitem id="hr_recruitment_report_analyse_menu_board"
-              name="招聘分析"
-              parent="hr_recruitment_report_menu_board"
-              action="hr_recruitment.hr_applicant_action_analysis"
-              sequence="1"/>
     <menuitem id="hr_recruitment_setting_menu_board"
               name="配置"
               parent="hr_recruitment_menu_root_board"
@@ -64,11 +41,6 @@
               parent="hr_recruitment_setting_menu_board"
               action="hr_recruitment.action_hr_recruitment_configuration"
               sequence="1"/>
-    <menuitem id="hr_recruitment_work_job_menu_board"
-              name="工作岗位"
-              parent="hr_recruitment_menu_root_board"
-              action="hr.action_hr_job"
-              sequence="3"/>
     <menuitem id="hr_process_work_job_menu_board"
               name="流程"
               parent="hr_recruitment_menu_root_board"
@@ -77,27 +49,22 @@
               name="招聘需求申请表"
               parent="hr_process_work_job_menu_board"
               action="yuthon_hr_employee_approval.yuthon_recruitment_approval_action"
-              sequence="3"/>
+              sequence="1"/>
     <menuitem id="hr_menu_interview_approval_root_board"
               name="面试信息表"
               parent="hr_process_work_job_menu_board"
               action="yuthon_hr_employee_approval.yuthon_interview_approval_action"
-              sequence="5"/>
+              sequence="3"/>
     <menuitem id="hr_process_onboard_menu_root_board"
               name="入职申请表"
               parent="hr_process_work_job_menu_board"
               action="yuthon_hr_employee_approval.yuthon_onboard_approval_action"
-              sequence="7"/>
+              sequence="5"/>
     <menuitem id="hr_process_manage_menu_root_board"
               name="个人信息登记表"
               parent="hr_process_work_job_menu_board"
               action="yuthon_hr_employee_approval.yuthon_message_login_action"
-              sequence="9"/>
-    <menuitem id="hr_menu_prepare_approval_root_board"
-              name="编制调整申请表"
-              parent="hr_process_work_job_menu_board"
-              action="yuthon_hr_employee_approval.yuthon_prepare_approval_action"
-              sequence="11"/>
+              sequence="7"/>
     <menuitem id="hr_recruitment_app2_menu_board"
               name="应用"
               parent="hr_recruitment_setting_menu_board"
@@ -108,12 +75,12 @@
               action="yuthon_hr_employee.hr_job_type_action"
               sequence="1"/>
     <menuitem id="publish_hire_setting_menu_board"
-              name="发布途径设置"
+              name="发布途径配置"
               parent="hr_recruitment_setting_menu_board"
               action="yuthon_hr_employee.publish_applicant_setting_action"
               sequence="3"/>
     <menuitem id="applicant_tage_setting_menu_board"
-              name="应聘标签设置"
+              name="应聘标签配置"
               parent="hr_recruitment_setting_menu_board"
               action="yuthon_hr_employee.applicant_tage_setting_action"
               sequence="5"/>
@@ -128,46 +95,66 @@
               action="hr.hr_contract_type_action"
               sequence="9"/>
     <menuitem id="hr_recruitment_degree_menu_board"
-              name="学历"
+              name="学历配置"
               parent="hr_recruitment_setting_menu_board"
               action="hr_recruitment.hr_recruitment_degree_action"
               sequence="11"/>
     <menuitem id="hr_recruitment_reason_menu_board"
-              name="拒绝原因"
+              name="拒绝原因配置"
               parent="hr_recruitment_setting_menu_board"
               action="hr_recruitment.hr_applicant_refuse_reason_action"
               sequence="13"/>
-    <menuitem id="hr_recruitment_label_menu_board"
-              name="标签"
-              parent="hr_recruitment_setting_menu_board"
-              action="hr_recruitment.hr_applicant_category_action"
-              sequence="15"/>
 
 
     <!--  人事  -->
     <menuitem id="hr_menu_root_board"
               name="人事管理"
               parent="human_resources_menu_root_board"
-              sequence="3"/>
+              sequence="5"/>
     <menuitem id="hr_employee_menu_root_board"
               name="员工"
               parent="hr_menu_root_board"
               sequence="1"/>
     <menuitem id="hr_employee_menu_root_board2"
-              name="员工"
+              name="花名册"
               parent="hr_employee_menu_root_board"
               action="hr.open_view_employee_list_my"
               sequence="1"/>
+    <menuitem id="hr_set_lv_menu_root_board"
+              name="职级管理"
+              parent="hr_employee_menu_root_board"
+              action="yuthon_hr_employee.view_yuthon_job_lv_action"
+              sequence="3"/>
+    <menuitem id="hr_recruitment_work_job_menu_board"
+              name="岗位编制"
+              parent="hr_employee_menu_root_board"
+              action="hr.action_hr_job"
+              sequence="5"/>
     <menuitem id="hr_employee_organization_menu_root_board"
               name="组织结构"
               parent="hr_employee_menu_root_board"
               action="hr_org_chart.action_hr_employee_org_chart"
-              sequence="3"/>
+              sequence="7"/>
     <menuitem id="hr_contract_menu_root_board"
-              name="合同"
+              name="合同管理"
               parent="hr_employee_menu_root_board"
               action="hr.open_view_employee_list_my"
-              sequence="5"/>
+              sequence="9"/>
+    <menuitem id="hr_menu_leaving_approval_root_board"
+              name="离职申请表"
+              parent="hr_employee_menu_root_board"
+              action="yuthon_hr_employee_approval.yuthon_leaving_approval_action"
+              sequence="11"/>
+    <menuitem id="hr_menu_reassignment_approval_root_board"
+              name="调岗申请"
+              parent="hr_employee_menu_root_board"
+              action="yuthon_hr_employee_approval.yuthon_reassignment_approval_action"
+              sequence="13"/>
+    <menuitem id="hr_menu_regularization_approval_root_board"
+              name="转正申请表"
+              parent="hr_employee_menu_root_board"
+              action="yuthon_hr_employee_approval.yuthon_regularization_approval_action"
+              sequence="15"/>
     <menuitem id="hr_department_menu_root_board"
               name="部门"
               parent="hr_menu_root_board"
@@ -191,61 +178,56 @@
               parent="hr_set_process_menu_root_board"
               action="yuthon_none_action"
               sequence="1"/>
-    <menuitem id="hr_menu_leaving_approval_root_board"
-              name="离职申请表"
+    <menuitem id="hr_menu_prepare_approval_root_board"
+              name="编制调整申请表"
               parent="hr_set_process_menu_root_board"
-              action="yuthon_hr_employee_approval.yuthon_leaving_approval_action"
+              action="yuthon_hr_employee_approval.yuthon_prepare_approval_action"
               sequence="3"/>
     <menuitem id="hr_menu_rank_approval_root_board"
               name="职级调整申请表"
               parent="hr_set_process_menu_root_board"
               action="yuthon_none_action"
               sequence="5"/>
-    <menuitem id="hr_menu_reassignment_approval_root_board"
-              name="调岗申请"
-              parent="hr_set_process_menu_root_board"
-              action="yuthon_hr_employee_approval.yuthon_reassignment_approval_action"
-              sequence="7"/>
     <menuitem id="hr_menu_reward_approval_root_board"
               name="员工奖罚"
               parent="hr_set_process_menu_root_board"
               action="yuthon_hr_employee_approval.yuthon_reward_approval_action"
-              sequence="11"/>
-    <menuitem id="hr_menu_regularization_approval_root_board"
-              name="转正申请表"
-              parent="hr_set_process_menu_root_board"
-              action="yuthon_none_action"
-              sequence="13"/>
+              sequence="7"/>
     <menuitem id="hr_menu_salary_approval_root_board"
               name="薪酬项目调整表"
               parent="hr_set_process_menu_root_board"
               action="yuthon_none_action"
-              sequence="15"/>
+              sequence="9"/>
     <menuitem id="hr_menu_service_approval_root_board"
               name="服务证明表"
               parent="hr_set_process_menu_root_board"
               action="yuthon_none_action"
-              sequence="17"/>
+              sequence="11"/>
+    <menuitem id="hr_menu_service_approval_root_board"
+              name="服务证明表"
+              parent="hr_set_process_menu_root_board"
+              action="yuthon_none_action"
+              sequence="13"/>
     <menuitem id="hr_menu_system_approval_root_board"
               name="制度调整申请表"
               parent="hr_set_process_menu_root_board"
               action="yuthon_none_action"
-              sequence="19"/>
+              sequence="15"/>
     <menuitem id="hr_menu_title_approval_root_board"
               name="职称聘任申请表"
               parent="hr_set_process_menu_root_board"
               action="yuthon_hr_employee_approval.yuthon_title_approval_action"
-              sequence="21"/>
+              sequence="17"/>
     <menuitem id="hr_menu_enrollment_approval_root_board"
               name="参保方案申请表"
               parent="hr_set_process_menu_root_board"
               action="yuthon_none_action"
-              sequence="23"/>
+              sequence="19"/>
     <menuitem id="hr_menu_transfer_approval_root_board"
               name="工作移交"
               parent="hr_set_process_menu_root_board"
               action="yuthon_hr_employee_approval.yuthon_transfer_approval_action"
-              sequence="25"/>
+              sequence="21"/>
     <menuitem id="hr_setting_menu_root_board"
               name="配置"
               parent="hr_menu_root_board"
@@ -274,11 +256,6 @@
               parent="hr_set_employee_menu_root_board"
               action="resource.action_resource_calendar_form"
               sequence="5"/>
-    <menuitem id="hr_set_lv_menu_root_board"
-              name="职级配置"
-              parent="hr_set_employee_menu_root_board"
-              action="yuthon_hr_employee.view_yuthon_job_lv_action"
-              sequence="7"/>
     <menuitem id="hr_set_role_menu_root_board"
               name="角色配置"
               parent="hr_set_employee_menu_root_board"
@@ -323,7 +300,7 @@
     <menuitem id="hr_attendance_root_board"
               name="考勤管理"
               parent="human_resources_menu_root_board"
-              sequence="5"/>
+              sequence="7"/>
     <menuitem id="hr_attendance_record_root_board"
               name="考勤记录"
               parent="hr_attendance_root_board"
@@ -388,7 +365,7 @@
     <menuitem id="training_manager_root_board"
               name="培训管理"
               parent="human_resources_menu_root_board"
-              sequence="7"/>
+              sequence="9"/>
     <menuitem id="employee_training_root_board"
               name="员工培训"
               parent="training_manager_root_board"
@@ -414,12 +391,12 @@
               name="薪资管理"
               parent="human_resources_menu_root_board"
               action="yuthon_none_action"
-              sequence="9"/>
+              sequence="11"/>
     <!--  绩效考核  -->
     <menuitem id="yuthon_performance_menu_config_root_board"
               name="绩效考核"
               parent="human_resources_menu_root_board"
-              sequence="11"/>
+              sequence="13"/>
     <menuitem id="yuthon_performance_duty_menu_board"
               parent="yuthon_performance_menu_config_root_board"
               name="绩效考核"
@@ -472,7 +449,7 @@
 <!--              sequence="3"-->
 <!--              action="yuthon_performance.yuthon_duty_approval_action"/>-->
 <!--    <menuitem id="yuthon_plan_approval_management_board"-->
-<!--              parent="yuthon_performance_approval_management_menu_board"-->
+<!--                 parent="yuthon_performance_approval_management_menu_board"-->
 <!--              name="个人计划变更"-->
 <!--              sequence="5"-->
 <!--              action="yuthon_performance.yuthon_plan_approval_action"/>-->
@@ -481,5 +458,5 @@
               name="配置"
               parent="human_resources_menu_root_board"
               action="yuthon_none_action"
-              sequence="13"/>
+              sequence="15"/>
 </odoo>

yuthon_work_brand/views/work_menus.xml

@@ -36,16 +36,12 @@
               name="通知公告管理"
               action="yuthon_notice.approval_notice_action"
               sequence="5"/>
-    <menuitem id="yuthon_confirm_users_menu_board"
-              parent="yuthon_notice_menu"
-              name="公告确认信息"
-              action="yuthon_notice.yuthon_confirm_users_action"
-              sequence="9"/>
     <menuitem id="yuthon_notice_type_menu_board"
               parent="yuthon_notice_menu"
               name="公告类型管理"
               action="yuthon_notice.approval_notice_type_action"
-              sequence="11"/>
+              sequence="7"/>
+
     <!--  工作流程  -->
     <menuitem id="menu_soong_workflow_root_board"
               name="工作流程"