From 980975ad184fa98f16800901731f589a15c252fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Sat, 28 Feb 2026 15:24:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E4=BA=A4=E7=A1=AE=E8=AE=A4=E4=B9=A6?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8A=9E=E7=BB=93=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- soong_workflow/views/soong_workflow_record.xml | 9 +++++---- .../views/yuthon_file_processing_views.xml | 1 + .../views/yuthon_official_incoming_normal_views.xml | 1 + .../views/yuthon_sub_enterprises_view.xml | 1 + yuthon_property_approval/models/property_confirm.py | 8 ++++---- .../views/property_confirm_views.xml | 12 +++++++++++- .../views/inherit_purchase_order_views.xml | 1 + 7 files changed, 24 insertions(+), 9 deletions(-) diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml index 88f7dcc3e..9ab67e075 100644 --- a/soong_workflow/views/soong_workflow_record.xml +++ b/soong_workflow/views/soong_workflow_record.xml @@ -439,7 +439,7 @@ soong.workflow.record tree,kanban,search {'header_search_default_approve_state': 1, 'header_search_default_to_do':1, - 'check_employee': 1} + 'check_employee': 1, 'default_order': 'display_end_time desc'} [('is_to_do', '=', True)] @@ -451,7 +451,7 @@ soong.workflow.record tree,kanban,search {'header_search_default_approve_state': 1, 'header_search_default_to_do':1, - 'check_employee': 1} + 'check_employee': 1, 'default_order': 'display_end_time desc'} [('is_done', '=', True)] @@ -463,7 +463,7 @@ soong.workflow.record tree,kanban,search [('reclaim_state', '=', False), ('member_of_department', '=', True), ('is_company', '=', True),('approve_state','!=','start'),('approvals_group_id.name', '!=', '考勤')] - {'search_default_my_department_shifts': True,} + {'search_default_my_department_shifts': True, 'default_order': 'display_end_time desc'} @@ -475,6 +475,7 @@ [('is_company', '=', True), ('reclaim_state', '=', False), '|', ('approvals_group_id.name', '=', '人力资源'), ('approvals_group_id.name', '=', '考勤'), ('approve_state', '!=', 'start')] + {'default_order': 'display_end_time desc'} @@ -485,7 +486,7 @@ [('is_company', '=', True), ('reclaim_state', '=', False), ('approvals_group_id.name', '!=', '人力资源'), ('approvals_group_id.name', '!=', '考勤')] - {'search_default_my_department_shifts': True,} + {'search_default_my_department_shifts': True, 'default_order': 'display_end_time desc'} diff --git a/yuthon_official/views/yuthon_file_processing_views.xml b/yuthon_official/views/yuthon_file_processing_views.xml index 7b60778fd..1ba8905d2 100644 --- a/yuthon_official/views/yuthon_file_processing_views.xml +++ b/yuthon_official/views/yuthon_file_processing_views.xml @@ -108,6 +108,7 @@ yuthon.file.processing [('is_display', '=', True)] tree,form + {'default_order': 'completion_time desc'} 触发逻辑 diff --git a/yuthon_official/views/yuthon_official_incoming_normal_views.xml b/yuthon_official/views/yuthon_official_incoming_normal_views.xml index 4fcbcac10..fac0a35c6 100644 --- a/yuthon_official/views/yuthon_official_incoming_normal_views.xml +++ b/yuthon_official/views/yuthon_official_incoming_normal_views.xml @@ -108,5 +108,6 @@ yuthon.official.incoming.normal [('is_company','=',True), ('is_void','=',False)] tree,form + {'default_order': 'display_end_time desc'} \ No newline at end of file diff --git a/yuthon_official/views/yuthon_sub_enterprises_view.xml b/yuthon_official/views/yuthon_sub_enterprises_view.xml index 35b9da8a8..59aae21ae 100644 --- a/yuthon_official/views/yuthon_sub_enterprises_view.xml +++ b/yuthon_official/views/yuthon_sub_enterprises_view.xml @@ -79,6 +79,7 @@ [('is_display','=', True)] yuthon.sub.enterprises tree,form + {'default_order': 'completion_time desc'} diff --git a/yuthon_property_approval/models/property_confirm.py b/yuthon_property_approval/models/property_confirm.py index db98c3f93..01d47b2b8 100644 --- a/yuthon_property_approval/models/property_confirm.py +++ b/yuthon_property_approval/models/property_confirm.py @@ -16,9 +16,9 @@ class PropertyConfirm(models.Model): lessee = fields.Char(string="承租方") active = fields.Boolean('Active', default=True, tracking=True) work_end = fields.Boolean(string="结束") - - - - + is_chapter = fields.Selection([('yes', '是'), ('no', '否')], string='是否用章', default='no') + property_name = fields.Char(string='物业信息') + approval_unit = fields.Char(string='发送单位') + type_stamp_ids = fields.Many2many('seals.type.setting', string='用章类型') diff --git a/yuthon_property_approval/views/property_confirm_views.xml b/yuthon_property_approval/views/property_confirm_views.xml index 3f48ca15f..f99188616 100644 --- a/yuthon_property_approval/views/property_confirm_views.xml +++ b/yuthon_property_approval/views/property_confirm_views.xml @@ -17,6 +17,14 @@
+ + + + + + + +