!445 zhou

Merge pull request !445 from 李鹏宇/dev_zhou

yuthon_hr_employee/models/yuthon_job_lv.py

@@ -25,6 +25,14 @@ class YuthonJobLv(models.Model):
     create_time = fields.Datetime(string="生效日期", default=fields.Datetime.now)
     end_time = fields.Datetime(string="失效日期")
 
+    #天河粮储
+    post_subsidy = fields.Float(string="岗位补贴(原职级工资)", group_operator=None)
+    monthly_performance = fields.Float(string="月度绩效", group_operator=None)
+    duty_pay = fields.Float(string="值班费", group_operator=None)
+    assignment_subsidy = fields.Float(string="作业环境补贴", group_operator=None)
+    temporary_performance = fields.Float(string="临时绩效补贴", group_operator=None)
+
+
     @api.model
     def read_group(self, domain, fields, groupby, offset=0, limit=None, orderby=False, lazy=True):
         res = super(YuthonJobLv, self).read_group(domain, fields, groupby, offset=offset, limit=limit, orderby=orderby,

yuthon_hr_employee/views/yuthon_job_lv_views.xml

@@ -74,12 +74,35 @@
         <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_hr_employee.view_yuthon_job_lv_tree3')})]"/>
     </record>
-
+    <record id="view_yuthon_job_lv_tree4" model="ir.ui.view">
+        <field name="name">yuthon.job.lv.tree</field>
+        <field name="model">yuthon.job.lv</field>
+        <field name="arch" type="xml">
+            <tree editable="bottom">
+                <field name="sequence"/>
+                <field name="lv"/>
+                <field name="name"/>
+                <field name="base_wage"/>
+                <field name="post_subsidy"/>
+                <field name="post_wage"/>
+                <field name="monthly_performance"/>
+                <field name="duty_pay"/>
+                <field name="assignment_subsidy"/>
+                <field name="temporary_performance"/>
+                <field name="all_wage"/>
+                <field name="yuthon_company" required="1"/>
+                <field name="create_time"/>
+                <field name="end_time"/>
+            </tree>
+        </field>
+    </record>
     <record id="view_yuthon_job_lv_action4" model="ir.actions.act_window">
         <field name="name">天河粮储职级</field>
         <field name="res_model">yuthon.job.lv</field>
         <field name="view_mode">tree</field>
         <field name="domain">[('yuthon_company', '=', 'thlc')]</field>
+        <field name="view_ids" eval="[(5, 0, 0),
+         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_hr_employee.view_yuthon_job_lv_tree4')})]"/>
         <field name="context">{'search_default_group_lv': 1}</field>
     </record>
        <!--  Menus  -->