!2914 !2913 添加功能

Merge pull request !2914 from 李鹏宇/dev

soong_workflow/views/kklw_workflow_approval_views.xml

@@ -12,7 +12,7 @@
                    <t t-name="kanban-box">
                         <div class="oe_module_vignette">
                             <div class="oe_module_desc" style="display: flex; justify-content: space-between;">
-                                <div class="o_left_container" style="flex: 1; max-width: 40%;">
+                                <div class="o_left_container" style="flex: 1; max-width: 50%;">
                                     <h4 class="o_kanban_record_title">
                                         <field name="name"/>
                                     </h4>

yuthon_hr_employee/views/yuthon_hr_employee_views.xml

@@ -431,6 +431,20 @@
             </tree>
         </field>
     </record>
+    <!--会员列表-->
+    <record id="view_employee_member_tree" model="ir.ui.view">
+        <field name="name">hr.employee.member</field>
+        <field name="model">hr.employee</field>
+        <field name="arch" type="xml">
+            <tree string="会员列表" crate="false" delete="false" editable="bottom">
+                <field name="name" readonly="1"/>
+                <field name="work_phone" readonly="1"/>
+                <field name="department_id" readonly="1"/>
+                <field name="job_id" readonly="1"/>
+                <field name="company_id" column_invisible="1"/>
+            </tree>
+        </field>
+    </record>
     <record id="view_employee_inherit_filter" model="ir.ui.view">
         <field name="name">hr.employee.inherit.search</field>
         <field name="model">hr.employee</field>
@@ -467,6 +481,15 @@
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_hr_employee.view_employee_contacts_tree')}),
          (0, 0, {'view_mode': 'form', 'view_id': ref('hr.view_employee_form')})]"/>
     </record>
+    <record id="all_employee_member_action" model="ir.actions.act_window">
+        <field name="name">会员列表</field>
+        <field name="res_model">hr.employee</field>
+        <field name="domain">[('is_membership','=',True)]</field>
+        <field name="view_mode">tree,kanban,form,search</field>
+        <field name="view_ids" eval="[(5, 0, 0),
+         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_hr_employee.view_employee_member_tree')}),
+         (0, 0, {'view_mode': 'form', 'view_id': ref('hr.view_employee_form')})]"/>
+    </record>
     <record id="hr.open_view_employee_list_my" model="ir.actions.act_window">
         <field name="view_mode">tree,kanban,form,activity,graph,pivot,hierarchy</field>
     </record>

yuthon_work_brand/views/executive_manage.xml

@@ -178,11 +178,16 @@
               name="工会"
               web_icon="yuthon_work_brand,static/description/union.png"
               sequence="75"/>
+    <menuitem id="all_employee_member_list_board"
+              name="会员列表"
+              parent="union_root_board"
+              action="yuthon_hr_employee.all_employee_member_action"
+              sequence="1"/>
     <menuitem id="executive_work_condolences"
               name="节日慰问"
               parent="union_root_board"
               action="yuthon_trade.action_yuthon_work_condolences"
-              sequence="1"/>
+              sequence="5"/>
     <menuitem id="executive_care_activities_menu"
               name="关怀慰问"
               parent="union_root_board"