From 092d0b8fbc80ea0e3fff0febd1f4392da19ce767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Tue, 18 Nov 2025 11:38:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/scss/theme_config.scss         |  1 -
 .../views/soong_workflow_log_views.xml        |  7 ++-
 .../models/yuthon_reassignment_approval.py    |  2 +-
 .../views/property_menu_all.xml               | 58 +++++++++----------
 4 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/sh_backmate_theme_adv_enterprise/static/src/scss/theme_config.scss b/sh_backmate_theme_adv_enterprise/static/src/scss/theme_config.scss
index e8a515688..288478cb3 100644
--- a/sh_backmate_theme_adv_enterprise/static/src/scss/theme_config.scss
+++ b/sh_backmate_theme_adv_enterprise/static/src/scss/theme_config.scss
@@ -1400,7 +1400,6 @@
 
 .modal-xl {
   max-width: 1200px !important; /*你可改为100%/1200px/1600px等*/
-  max-height: 1600px !important;
 }
 .o_form_view .o_form_sheet_bg {
   max-width: 100% !important
diff --git a/soong_workflow/views/soong_workflow_log_views.xml b/soong_workflow/views/soong_workflow_log_views.xml
index 90ff1c8bc..e55c66502 100644
--- a/soong_workflow/views/soong_workflow_log_views.xml
+++ b/soong_workflow/views/soong_workflow_log_views.xml
@@ -14,11 +14,14 @@
                 <templates>
                       <t t-name="kanban-box">
                             <div class="o_kanban_record d-md-none card h-100">
-                                <div class="card-header">
+                                <div class="card-header d-flex justify-content-between align-items-center">
                                     <strong>
                                         <field name="name" />
                                     </strong>
-                                </div>
+                                    <span>
+                                        <field name="approval_state" widget="selection"/>
+                                    </span>
+                                 </div>
                                 <div class="card-body">
                                     <div class="mb-2">
                                         <small>经办人: [<field name="done_by" />] </small>
diff --git a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py
index 43c29f56d..bdd306993 100644
--- a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py
@@ -39,7 +39,7 @@ class YuthonReassignmentApproval(models.Model):
     self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])])
 
     #异动信息
-    change_kind = fields.Char(string="异动类型")
+    change_kind = fields.Selection([('promoted', '晋升'), ('demoted', '降职'), ('leveling', '平级调整'), ('seconded', '借调')], default="mqtt", string="异动类型")
     change_reason = fields.Text(string="异动原因")
     change_date = fields.Date(string="调动日期", default=lambda self: fields.Date.today())
     handover_date = fields.Date(string="移交日期", default=lambda self: fields.Date.today())
diff --git a/yuthon_property_approval/views/property_menu_all.xml b/yuthon_property_approval/views/property_menu_all.xml
index 2d5622ae5..5060974dd 100644
--- a/yuthon_property_approval/views/property_menu_all.xml
+++ b/yuthon_property_approval/views/property_menu_all.xml
@@ -63,36 +63,36 @@
             action="property_information_action"
             sequence="28"/>
 
-    <menuitem
-            id="property_contract_process_menu"
-            parent="yuthon_property.yuthon_property_estate_menu"
-            name="流程"
-            sequence="10"/>
-    <menuitem
-            id="property_accounts_approval_menu"
-            parent="property_contract_process_menu"
-            name="应收账单生成审批单"
-            action="view_property_accounts_approval_action"
-            sequence="1"/>
-    <menuitem
-            id="property_lease_extension_menu"
-            parent="property_contract_process_menu"
-            name="续租审批"
-            action="property_lease_extension_action"
-            sequence="3"/>
-    <menuitem
-            id="property_lease_renewal_menu"
-            parent="property_contract_process_menu"
-            name="租赁变更"
-            action="property_lease_renewal_action"
-            sequence="5"/>
+<!--    <menuitem-->
+<!--            id="property_contract_process_menu"-->
+<!--            parent="yuthon_property.yuthon_property_estate_menu"-->
+<!--            name="流程"-->
+<!--            sequence="10"/>-->
+<!--    <menuitem-->
+<!--            id="property_accounts_approval_menu"-->
+<!--            parent="property_contract_process_menu"-->
+<!--            name="应收账单生成审批单"-->
+<!--            action="view_property_accounts_approval_action"-->
+<!--            sequence="1"/>-->
+<!--    <menuitem-->
+<!--            id="property_lease_extension_menu"-->
+<!--            parent="property_contract_process_menu"-->
+<!--            name="续租审批"-->
+<!--            action="property_lease_extension_action"-->
+<!--            sequence="3"/>-->
+<!--    <menuitem-->
+<!--            id="property_lease_renewal_menu"-->
+<!--            parent="property_contract_process_menu"-->
+<!--            name="租赁变更"-->
+<!--            action="property_lease_renewal_action"-->
+<!--            sequence="5"/>-->
 
-    <menuitem
-            id="property_transfer_approval_menu"
-            parent="property_contract_process_menu"
-            name="物业交接审批"
-            action="view_property_transfer_action"
-            sequence="10"/>
+<!--    <menuitem-->
+<!--            id="property_transfer_approval_menu"-->
+<!--            parent="property_contract_process_menu"-->
+<!--            name="物业交接审批"-->
+<!--            action="view_property_transfer_action"-->
+<!--            sequence="10"/>-->
 
     <menuitem
             id="property_material_procurement_menu"