Merge pull request !8221 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-01-22 12:48:11 +00:00
committed by Gitee
3 changed files with 6 additions and 21 deletions
-1
View File
@@ -19,7 +19,6 @@
'data/employee_recruitment_time_data.xml',
'data/publish_applicant_setting_data.xml',
'security/ir.model.access.csv',
'security/company_rule.xml',
'views/yuthon_hr_employee_views.xml',
'views/yuthon_hr_department_views.xml',
'views/applicant_tage_setting_views.xml',
@@ -80,34 +80,20 @@
<field name="model">issue.approval.decision</field>
<field name="arch" type="xml">
<search>
<searchpanel>
<field name="decision_type_on_id"/>
</searchpanel>
<group expand="1">
<filter name="group_decision_type_on_id" string="事项类别上级"
context="{'group_by': 'decision_type_on_id'}"/>
<filter name="group_decision_type_id" string="事项类别" context="{'group_by': 'decision_type_id'}"/>
<filter string="适用范围" name="group_scope" context="{'group_by': 'scope'}"/>
<filter name="group_management_matters_id" string="管理事项" context="{'group_by': 'management_matters_id'}"/>
</group>
</search>
</field>
</record>
<record id="issue_approval_decision_search" model="ir.ui.view">
<field name="name">issue.approval.decision.search</field>
<field name="model">issue.approval.decision</field>
<field name="priority">20</field>
<field name="arch" type="xml">
<search>
<field name="specifics"/>
</search>
</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>
<field name="view_mode">tree,form,search</field>
<field name="context">{'group_decision_type_id': 1, 'group_management_matters_id': 1}</field>
</record>
<record id="all_update_issue" model="ir.actions.server">
+4 -4
View File
@@ -198,7 +198,7 @@
<tree editable="bottom">
<field name="ordinal"/>
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id" class="list_ids_width"/>
<field name="issue_approval_decision_id" class="list_ids_width" context="{'search_default_group_scope': 1}"/>
<field name="council_id" readonly="1" groups="yuthon_salary.group_jtbb_user" string="党总支"/>
<field name="council_id" readonly="1" groups="yuthon_salary.group_wg_user, yuthon_salary.group_lc_user" string="党支部"/>
<field name="team_meet_id" readonly="1"/>
@@ -408,7 +408,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id" class="list_ids_width"/>
<field name="issue_approval_decision_id" class="list_ids_width" context="{'search_default_group_scope': 1}"/>
<field name="council_id" readonly="1"/>
<field name="district_state_id" readonly="1"/>
<field name="district_government_id" readonly="1"/>
@@ -565,7 +565,7 @@
<tree editable="bottom">
<field name="ordinal"/>
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id" class="list_ids_width"/>
<field name="issue_approval_decision_id" class="list_ids_width" context="{'search_default_group_scope': 1}"/>
<field name="team_meet_id" readonly="1"/>
<field name="district_state_id" readonly="1"/>
<field name="district_government_id" readonly="1"/>
@@ -712,7 +712,7 @@
<tree editable="bottom">
<field name="ordinal"/>
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id" class="list_ids_width"/>
<field name="issue_approval_decision_id" class="list_ids_width" context="{'search_default_group_scope': 1}"/>
<field name="board_meet_id" readonly="1"/>
<field name="district_state_id" readonly="1"/>
<field name="district_government_id" readonly="1"/>