From c84da79f45a1e57817bf3220567a17d32b9ca3d2 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Mon, 9 Jun 2025 10:26:15 +0800
Subject: [PATCH 1/2] =?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
---
yuthon_hr_attendance/views/go_approval.xml | 8 ++++----
.../views/property_split_approval_views.xml | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/yuthon_hr_attendance/views/go_approval.xml b/yuthon_hr_attendance/views/go_approval.xml
index e4162b0ea..e24475c58 100644
--- a/yuthon_hr_attendance/views/go_approval.xml
+++ b/yuthon_hr_attendance/views/go_approval.xml
@@ -69,13 +69,13 @@
-
+
-
-
+
-
+
+
diff --git a/yuthon_property_approval/views/property_split_approval_views.xml b/yuthon_property_approval/views/property_split_approval_views.xml
index c7615fd35..6e309bfc8 100644
--- a/yuthon_property_approval/views/property_split_approval_views.xml
+++ b/yuthon_property_approval/views/property_split_approval_views.xml
@@ -69,6 +69,7 @@
+
From b32af663b7e38c8c6221b05255cffc768408436c Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Mon, 9 Jun 2025 11:30:27 +0800
Subject: [PATCH 2/2] =?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
---
yuthon_hr_attendance/views/card_approval.xml | 6 ++++
yuthon_hr_attendance/views/duty_approval.xml | 6 ++++
yuthon_hr_attendance/views/go_approval.xml | 33 ++++++++++++-------
.../views/overtime_approval.xml | 6 ++++
.../views/overtime_page_views.xml | 6 ++++
.../views/remove_holiday_approval.xml | 6 ++++
.../views/yuthon_abnormal_approval_views.xml | 6 ++++
.../yuthon_adjustments_approval_views.xml | 6 ++++
.../views/yuthon_customer_approval_views.xml | 6 ++++
.../views/yuthon_shift_approval_views.xml | 6 ++++
.../views/yuthon_special_approval_views.xml | 6 ++++
.../yuthon_regularization_approval_views.xml | 6 ++++
.../views/yuthon_renewal_approval_views.xml | 6 ++++
.../views/yuthon_retired_approval_views.xml | 6 ++++
.../views/yuthon_reward_approval_views.xml | 6 ++++
.../views/yuthon_service_approval_views.xml | 6 ++++
.../yuthon_social_files_approval_view.xml | 6 ++++
.../views/yuthon_transfer_approval_views.xml | 6 ++++
yuthon_issue/views/issue_approval_views.xml | 6 ++++
yuthon_issue/views/issue_library_views.xml | 24 ++++++++++++++
.../views/issue_meeting_minutes_views.xml | 6 ++++
.../views/property_report_repair.xml | 6 ++++
.../views/property_report_repair.xml | 6 ++++
yuthon_notice/views/yuthon_notice_views.xml | 6 ++++
.../yuthon_official_incoming_labor_views.xml | 6 ++++
.../yuthon_official_incoming_party_views.xml | 6 ++++
.../views/yuthon_official_views.xml | 6 ++++
.../property_accounting_approval_views.xml | 6 ++++
.../property_accounts_approval_views.xml | 6 ++++
.../views/property_approval_views.xml | 6 ++++
.../views/property_design_approval_views.xml | 6 ++++
.../views/property_early_quitting.xml | 6 ++++
.../views/property_eligibility.xml | 6 ++++
.../property_engineering_approval_views.xml | 6 ++++
.../views/property_handover_views.xml | 6 ++++
.../views/property_intention_views.xml | 6 ++++
.../views/property_lease_extension.xml | 6 ++++
.../views/property_management.xml | 6 ++++
.../views/property_management_fee.xml | 6 ++++
.../views/property_meeting_approval_views.xml | 6 ++++
.../views/property_merge_approval_views.xml | 6 ++++
.../views/property_penalty_proportion.xml | 6 ++++
.../views/property_penalty_relief.xml | 6 ++++
.../views/property_project_approval_views.xml | 6 ++++
.../views/property_project_works_viwes.xml | 6 ++++
.../views/property_record_views.xml | 6 ++++
.../views/property_rent_relief.xml | 6 ++++
.../views/property_rental_conditions.xml | 6 ++++
.../views/property_rental_form_views.xml | 6 ++++
.../views/property_service_approval_views.xml | 6 ++++
.../views/property_split_approval_views.xml | 6 ++++
.../views/property_sporadic_works_views.xml | 6 ++++
.../property_supervising_approval_views.xml | 6 ++++
.../views/property_transaction_confirmed.xml | 6 ++++
.../views/property_transfer_views.xml | 6 ++++
.../views/parking_fee_approval_views.xml | 6 ++++
.../views/trade_project_approval_views.xml | 6 ++++
.../views/trade_reward_approval_views.xml | 6 ++++
.../views/yuthon_business_approval_viwes.xml | 6 ++++
.../views/yuthon_message_approval_views.xml | 6 ++++
.../views/yuthon_mutual_approval_views.xml | 6 ++++
.../views/yuthon_seals_approval_views.xml | 6 ++++
.../views/yuthon_task_approval_views.xml | 6 ++++
yuthon_trade/views/yuthon_trade_premium.xml | 6 ++++
yuthon_will_task/models/yuthon_will_task.py | 22 ++++++++++++-
65 files changed, 439 insertions(+), 12 deletions(-)
diff --git a/yuthon_hr_attendance/views/card_approval.xml b/yuthon_hr_attendance/views/card_approval.xml
index 1ed4e0f78..a9d6ccc4b 100644
--- a/yuthon_hr_attendance/views/card_approval.xml
+++ b/yuthon_hr_attendance/views/card_approval.xml
@@ -59,6 +59,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_attendance/views/duty_approval.xml b/yuthon_hr_attendance/views/duty_approval.xml
index 174643ee0..1ad024a2a 100644
--- a/yuthon_hr_attendance/views/duty_approval.xml
+++ b/yuthon_hr_attendance/views/duty_approval.xml
@@ -75,6 +75,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_attendance/views/go_approval.xml b/yuthon_hr_attendance/views/go_approval.xml
index e24475c58..a9b700482 100644
--- a/yuthon_hr_attendance/views/go_approval.xml
+++ b/yuthon_hr_attendance/views/go_approval.xml
@@ -49,16 +49,22 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
@@ -66,6 +72,7 @@
+
@@ -78,12 +85,10 @@
+
-
-
-
@@ -93,6 +98,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_attendance/views/overtime_approval.xml b/yuthon_hr_attendance/views/overtime_approval.xml
index 77dab9796..04136e154 100644
--- a/yuthon_hr_attendance/views/overtime_approval.xml
+++ b/yuthon_hr_attendance/views/overtime_approval.xml
@@ -81,6 +81,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_attendance/views/overtime_page_views.xml b/yuthon_hr_attendance/views/overtime_page_views.xml
index ec87538c8..087a015ec 100644
--- a/yuthon_hr_attendance/views/overtime_page_views.xml
+++ b/yuthon_hr_attendance/views/overtime_page_views.xml
@@ -27,6 +27,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_attendance/views/remove_holiday_approval.xml b/yuthon_hr_attendance/views/remove_holiday_approval.xml
index 1340f3bf4..ef58b7cac 100644
--- a/yuthon_hr_attendance/views/remove_holiday_approval.xml
+++ b/yuthon_hr_attendance/views/remove_holiday_approval.xml
@@ -55,6 +55,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml b/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
index d50d0c8dc..aa770989c 100644
--- a/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
@@ -58,6 +58,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml b/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
index 77f8527ff..1bc294978 100644
--- a/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
@@ -62,6 +62,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml b/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
index 3e94120c7..fae368d90 100644
--- a/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
@@ -58,6 +58,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
index 74e0d7f99..cced38b19 100644
--- a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
@@ -79,6 +79,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_attendance/views/yuthon_special_approval_views.xml b/yuthon_hr_attendance/views/yuthon_special_approval_views.xml
index 0fce9865d..b25946223 100644
--- a/yuthon_hr_attendance/views/yuthon_special_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_special_approval_views.xml
@@ -62,6 +62,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
index 26205f44b..864d9959b 100644
--- a/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
@@ -123,6 +123,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml
index 40cbf56fc..fc6ca7473 100644
--- a/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml
@@ -71,6 +71,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml
index 74896a7df..67975938f 100644
--- a/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml
@@ -107,6 +107,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml
index a346cff9f..faaac4f6c 100644
--- a/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml
@@ -80,6 +80,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml
index d43b8a050..22fa287d6 100644
--- a/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml
@@ -58,6 +58,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_social_files_approval_view.xml b/yuthon_hr_employee_approval/views/yuthon_social_files_approval_view.xml
index ffebe376d..1a772fa11 100644
--- a/yuthon_hr_employee_approval/views/yuthon_social_files_approval_view.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_social_files_approval_view.xml
@@ -84,6 +84,12 @@
+
+
+
+
+
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_transfer_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_transfer_approval_views.xml
index dd9c98bcf..10bbd3242 100644
--- a/yuthon_hr_employee_approval/views/yuthon_transfer_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_transfer_approval_views.xml
@@ -95,6 +95,12 @@
+
+
+
+
+
+
diff --git a/yuthon_issue/views/issue_approval_views.xml b/yuthon_issue/views/issue_approval_views.xml
index 3a21ed285..6051ccad5 100644
--- a/yuthon_issue/views/issue_approval_views.xml
+++ b/yuthon_issue/views/issue_approval_views.xml
@@ -73,6 +73,12 @@
+
+
+
+
+
+
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index 20186d86b..27a93f7b7 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -144,6 +144,12 @@
+
+
+
+
+
+
@@ -304,6 +310,12 @@
+
+
+
+
+
+
@@ -451,6 +463,12 @@
+
+
+
+
+
+
@@ -586,6 +604,12 @@
+
+
+
+
+
+
diff --git a/yuthon_issue/views/issue_meeting_minutes_views.xml b/yuthon_issue/views/issue_meeting_minutes_views.xml
index 6efccc306..5a224dd27 100644
--- a/yuthon_issue/views/issue_meeting_minutes_views.xml
+++ b/yuthon_issue/views/issue_meeting_minutes_views.xml
@@ -69,6 +69,12 @@
+
+
+
+
+
+
diff --git a/yuthon_lessee_service/views/property_report_repair.xml b/yuthon_lessee_service/views/property_report_repair.xml
index 2e548fb29..c169cfc6f 100644
--- a/yuthon_lessee_service/views/property_report_repair.xml
+++ b/yuthon_lessee_service/views/property_report_repair.xml
@@ -75,6 +75,12 @@
+
+
+
+
+
+
diff --git a/yuthon_maintain/views/property_report_repair.xml b/yuthon_maintain/views/property_report_repair.xml
index 07346d782..ac9d97bfb 100644
--- a/yuthon_maintain/views/property_report_repair.xml
+++ b/yuthon_maintain/views/property_report_repair.xml
@@ -90,6 +90,12 @@
+
+
+
+
+
+
diff --git a/yuthon_notice/views/yuthon_notice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml
index e6ee0bc49..8236a19bb 100644
--- a/yuthon_notice/views/yuthon_notice_views.xml
+++ b/yuthon_notice/views/yuthon_notice_views.xml
@@ -97,6 +97,12 @@
+
+
+
+
+
+
diff --git a/yuthon_official/views/yuthon_official_incoming_labor_views.xml b/yuthon_official/views/yuthon_official_incoming_labor_views.xml
index 6c0de0afc..d14dbdee6 100644
--- a/yuthon_official/views/yuthon_official_incoming_labor_views.xml
+++ b/yuthon_official/views/yuthon_official_incoming_labor_views.xml
@@ -71,6 +71,12 @@
+
+
+
+
+
+
diff --git a/yuthon_official/views/yuthon_official_incoming_party_views.xml b/yuthon_official/views/yuthon_official_incoming_party_views.xml
index 9450f69e7..9b70a4fe8 100644
--- a/yuthon_official/views/yuthon_official_incoming_party_views.xml
+++ b/yuthon_official/views/yuthon_official_incoming_party_views.xml
@@ -64,6 +64,12 @@
+
+
+
+
+
+
diff --git a/yuthon_official/views/yuthon_official_views.xml b/yuthon_official/views/yuthon_official_views.xml
index cef688c90..9e67bfa32 100644
--- a/yuthon_official/views/yuthon_official_views.xml
+++ b/yuthon_official/views/yuthon_official_views.xml
@@ -88,6 +88,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_accounting_approval_views.xml b/yuthon_property_approval/views/property_accounting_approval_views.xml
index 5d9bf73e3..42ff23a8e 100644
--- a/yuthon_property_approval/views/property_accounting_approval_views.xml
+++ b/yuthon_property_approval/views/property_accounting_approval_views.xml
@@ -90,6 +90,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_accounts_approval_views.xml b/yuthon_property_approval/views/property_accounts_approval_views.xml
index cb9cf86a8..fa3f25676 100644
--- a/yuthon_property_approval/views/property_accounts_approval_views.xml
+++ b/yuthon_property_approval/views/property_accounts_approval_views.xml
@@ -72,6 +72,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_approval_views.xml b/yuthon_property_approval/views/property_approval_views.xml
index 95c5c7117..e74286e0f 100644
--- a/yuthon_property_approval/views/property_approval_views.xml
+++ b/yuthon_property_approval/views/property_approval_views.xml
@@ -79,6 +79,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_design_approval_views.xml b/yuthon_property_approval/views/property_design_approval_views.xml
index 8cdb349de..9b3325d45 100644
--- a/yuthon_property_approval/views/property_design_approval_views.xml
+++ b/yuthon_property_approval/views/property_design_approval_views.xml
@@ -87,6 +87,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_early_quitting.xml b/yuthon_property_approval/views/property_early_quitting.xml
index 34b48afa9..4592d441a 100644
--- a/yuthon_property_approval/views/property_early_quitting.xml
+++ b/yuthon_property_approval/views/property_early_quitting.xml
@@ -68,6 +68,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_eligibility.xml b/yuthon_property_approval/views/property_eligibility.xml
index f271befb9..339f928e5 100644
--- a/yuthon_property_approval/views/property_eligibility.xml
+++ b/yuthon_property_approval/views/property_eligibility.xml
@@ -66,6 +66,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_engineering_approval_views.xml b/yuthon_property_approval/views/property_engineering_approval_views.xml
index a7b63d8d4..b54743f3f 100644
--- a/yuthon_property_approval/views/property_engineering_approval_views.xml
+++ b/yuthon_property_approval/views/property_engineering_approval_views.xml
@@ -77,6 +77,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_handover_views.xml b/yuthon_property_approval/views/property_handover_views.xml
index 3c4dfc53b..39f531341 100644
--- a/yuthon_property_approval/views/property_handover_views.xml
+++ b/yuthon_property_approval/views/property_handover_views.xml
@@ -79,6 +79,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_intention_views.xml b/yuthon_property_approval/views/property_intention_views.xml
index 77a1009e5..3b62c12bf 100644
--- a/yuthon_property_approval/views/property_intention_views.xml
+++ b/yuthon_property_approval/views/property_intention_views.xml
@@ -66,6 +66,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_lease_extension.xml b/yuthon_property_approval/views/property_lease_extension.xml
index 029e18030..d59048833 100644
--- a/yuthon_property_approval/views/property_lease_extension.xml
+++ b/yuthon_property_approval/views/property_lease_extension.xml
@@ -69,6 +69,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_management.xml b/yuthon_property_approval/views/property_management.xml
index 4c1f0db85..511f250e2 100644
--- a/yuthon_property_approval/views/property_management.xml
+++ b/yuthon_property_approval/views/property_management.xml
@@ -113,6 +113,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_management_fee.xml b/yuthon_property_approval/views/property_management_fee.xml
index c7705a7da..bdd638dcd 100644
--- a/yuthon_property_approval/views/property_management_fee.xml
+++ b/yuthon_property_approval/views/property_management_fee.xml
@@ -73,6 +73,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_meeting_approval_views.xml b/yuthon_property_approval/views/property_meeting_approval_views.xml
index 807eb27ae..b7c8d0d59 100644
--- a/yuthon_property_approval/views/property_meeting_approval_views.xml
+++ b/yuthon_property_approval/views/property_meeting_approval_views.xml
@@ -78,6 +78,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_merge_approval_views.xml b/yuthon_property_approval/views/property_merge_approval_views.xml
index da1764e5f..6a25f295b 100644
--- a/yuthon_property_approval/views/property_merge_approval_views.xml
+++ b/yuthon_property_approval/views/property_merge_approval_views.xml
@@ -88,6 +88,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_penalty_proportion.xml b/yuthon_property_approval/views/property_penalty_proportion.xml
index d4d358cec..120920977 100644
--- a/yuthon_property_approval/views/property_penalty_proportion.xml
+++ b/yuthon_property_approval/views/property_penalty_proportion.xml
@@ -54,6 +54,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_penalty_relief.xml b/yuthon_property_approval/views/property_penalty_relief.xml
index 74e0e8754..f1d591025 100644
--- a/yuthon_property_approval/views/property_penalty_relief.xml
+++ b/yuthon_property_approval/views/property_penalty_relief.xml
@@ -74,6 +74,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_project_approval_views.xml b/yuthon_property_approval/views/property_project_approval_views.xml
index 02e4a0347..07bfd82ae 100644
--- a/yuthon_property_approval/views/property_project_approval_views.xml
+++ b/yuthon_property_approval/views/property_project_approval_views.xml
@@ -52,6 +52,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_project_works_viwes.xml b/yuthon_property_approval/views/property_project_works_viwes.xml
index 95edd0f50..993e0f8c5 100644
--- a/yuthon_property_approval/views/property_project_works_viwes.xml
+++ b/yuthon_property_approval/views/property_project_works_viwes.xml
@@ -57,6 +57,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_record_views.xml b/yuthon_property_approval/views/property_record_views.xml
index 227ab3001..5216ce0e4 100644
--- a/yuthon_property_approval/views/property_record_views.xml
+++ b/yuthon_property_approval/views/property_record_views.xml
@@ -100,6 +100,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_rent_relief.xml b/yuthon_property_approval/views/property_rent_relief.xml
index 9e409b917..5a30e51d2 100644
--- a/yuthon_property_approval/views/property_rent_relief.xml
+++ b/yuthon_property_approval/views/property_rent_relief.xml
@@ -75,6 +75,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_rental_conditions.xml b/yuthon_property_approval/views/property_rental_conditions.xml
index 21444b1fb..0741362bf 100644
--- a/yuthon_property_approval/views/property_rental_conditions.xml
+++ b/yuthon_property_approval/views/property_rental_conditions.xml
@@ -98,6 +98,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_rental_form_views.xml b/yuthon_property_approval/views/property_rental_form_views.xml
index cc32eca41..ce0876122 100644
--- a/yuthon_property_approval/views/property_rental_form_views.xml
+++ b/yuthon_property_approval/views/property_rental_form_views.xml
@@ -74,6 +74,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_service_approval_views.xml b/yuthon_property_approval/views/property_service_approval_views.xml
index 614c90aac..1418e8ab9 100644
--- a/yuthon_property_approval/views/property_service_approval_views.xml
+++ b/yuthon_property_approval/views/property_service_approval_views.xml
@@ -79,6 +79,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_split_approval_views.xml b/yuthon_property_approval/views/property_split_approval_views.xml
index 6e309bfc8..ef872d863 100644
--- a/yuthon_property_approval/views/property_split_approval_views.xml
+++ b/yuthon_property_approval/views/property_split_approval_views.xml
@@ -89,6 +89,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_sporadic_works_views.xml b/yuthon_property_approval/views/property_sporadic_works_views.xml
index 85f918ecc..645b3ac0e 100644
--- a/yuthon_property_approval/views/property_sporadic_works_views.xml
+++ b/yuthon_property_approval/views/property_sporadic_works_views.xml
@@ -70,6 +70,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_supervising_approval_views.xml b/yuthon_property_approval/views/property_supervising_approval_views.xml
index 1634a97f0..5a18800d6 100644
--- a/yuthon_property_approval/views/property_supervising_approval_views.xml
+++ b/yuthon_property_approval/views/property_supervising_approval_views.xml
@@ -86,6 +86,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_transaction_confirmed.xml b/yuthon_property_approval/views/property_transaction_confirmed.xml
index 7c02e89b0..1836d0bca 100644
--- a/yuthon_property_approval/views/property_transaction_confirmed.xml
+++ b/yuthon_property_approval/views/property_transaction_confirmed.xml
@@ -56,6 +56,12 @@
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_transfer_views.xml b/yuthon_property_approval/views/property_transfer_views.xml
index b8d3265cd..7bff32afb 100644
--- a/yuthon_property_approval/views/property_transfer_views.xml
+++ b/yuthon_property_approval/views/property_transfer_views.xml
@@ -129,6 +129,12 @@
+
+
+
+
+
+
diff --git a/yuthon_trade/views/parking_fee_approval_views.xml b/yuthon_trade/views/parking_fee_approval_views.xml
index fe285f397..1a45e636b 100644
--- a/yuthon_trade/views/parking_fee_approval_views.xml
+++ b/yuthon_trade/views/parking_fee_approval_views.xml
@@ -49,6 +49,12 @@
+
+
+
+
+
+
diff --git a/yuthon_trade/views/trade_project_approval_views.xml b/yuthon_trade/views/trade_project_approval_views.xml
index 2dbb3c27a..e0881987d 100644
--- a/yuthon_trade/views/trade_project_approval_views.xml
+++ b/yuthon_trade/views/trade_project_approval_views.xml
@@ -88,6 +88,12 @@
+
+
+
+
+
+
diff --git a/yuthon_trade/views/trade_reward_approval_views.xml b/yuthon_trade/views/trade_reward_approval_views.xml
index 2b9249999..ef5cd0dde 100644
--- a/yuthon_trade/views/trade_reward_approval_views.xml
+++ b/yuthon_trade/views/trade_reward_approval_views.xml
@@ -60,6 +60,12 @@
+
+
+
+
+
+
diff --git a/yuthon_trade/views/yuthon_business_approval_viwes.xml b/yuthon_trade/views/yuthon_business_approval_viwes.xml
index 3aad4f120..6ffd60c6f 100644
--- a/yuthon_trade/views/yuthon_business_approval_viwes.xml
+++ b/yuthon_trade/views/yuthon_business_approval_viwes.xml
@@ -49,6 +49,12 @@
+
+
+
+
+
+
diff --git a/yuthon_trade/views/yuthon_message_approval_views.xml b/yuthon_trade/views/yuthon_message_approval_views.xml
index 659632bb0..c68bf775f 100644
--- a/yuthon_trade/views/yuthon_message_approval_views.xml
+++ b/yuthon_trade/views/yuthon_message_approval_views.xml
@@ -57,6 +57,12 @@
+
+
+
+
+
+
diff --git a/yuthon_trade/views/yuthon_mutual_approval_views.xml b/yuthon_trade/views/yuthon_mutual_approval_views.xml
index 04f38a6e7..8c2ff5569 100644
--- a/yuthon_trade/views/yuthon_mutual_approval_views.xml
+++ b/yuthon_trade/views/yuthon_mutual_approval_views.xml
@@ -74,6 +74,12 @@
+
+
+
+
+
+
diff --git a/yuthon_trade/views/yuthon_seals_approval_views.xml b/yuthon_trade/views/yuthon_seals_approval_views.xml
index 08dc35ed9..6061b9936 100644
--- a/yuthon_trade/views/yuthon_seals_approval_views.xml
+++ b/yuthon_trade/views/yuthon_seals_approval_views.xml
@@ -47,6 +47,12 @@
+
+
+
+
+
+
diff --git a/yuthon_trade/views/yuthon_task_approval_views.xml b/yuthon_trade/views/yuthon_task_approval_views.xml
index 72b050eec..6315cdef2 100644
--- a/yuthon_trade/views/yuthon_task_approval_views.xml
+++ b/yuthon_trade/views/yuthon_task_approval_views.xml
@@ -75,6 +75,12 @@
+
+
+
+
+
+
diff --git a/yuthon_trade/views/yuthon_trade_premium.xml b/yuthon_trade/views/yuthon_trade_premium.xml
index 46e6bda28..332b3fffb 100644
--- a/yuthon_trade/views/yuthon_trade_premium.xml
+++ b/yuthon_trade/views/yuthon_trade_premium.xml
@@ -60,6 +60,12 @@
+
+
+
+
+
+
diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py
index 92b25ec61..f588d1687 100644
--- a/yuthon_will_task/models/yuthon_will_task.py
+++ b/yuthon_will_task/models/yuthon_will_task.py
@@ -74,7 +74,7 @@ class YuthonWillTask(models.Model):
remarks = fields.Text(string='备注')
creation_time = fields.Date(string='创建时间', default=fields.Date.today())
employee_ids = fields.Many2many('hr.employee', 'will_task_employee_rel', 'custom_id', 'employee_id',
- string='人员', store=True, index=True)
+ string='人员', store=True, index=True, domain=lambda self: self._get_employee_domain())
employee_ids2 = fields.Many2many('hr.employee', 'will_task_employee_rel2', 'custom_id', 'employee_id',
string='司机', store=True, index=True)
users_ids = fields.Many2many('res.users', string='用户', store=True, index=True, default=lambda self: self.env.user)
@@ -86,6 +86,26 @@ class YuthonWillTask(models.Model):
is_this_company = fields.Boolean(string='是否为本公司', default=True)
task_state = fields.Selection([('will', '待办'), ('done', '已办'), ('cancel', '取消')], default='will', string='状态', store=True)
+ @api.onchange('is_this_company')
+ def _onchange_is_this_company(self):
+ """当是否为本公司字段变化时,更新员工列表和domain"""
+ if self.is_this_company:
+ # 获取当前用户所属的公司列表
+ company_ids = self.env.companies.ids
+ # 过滤已选员工,只保留属于当前公司的员工
+ self.employee_ids = self.employee_ids.filtered(
+ lambda emp: emp.company_id.id in company_ids
+ )
+ # 返回domain,限制可选员工为当前公司的员工
+ return {
+ 'domain': {
+ 'employee_ids': [('company_id', 'in', company_ids)]
+ }
+ }
+ else:
+ # 当不限制为本公司时,清空domain,允许选择所有员工
+ return {'domain': {'employee_ids': []}}
+
@api.onchange('employee_ids', 'user_id')
def _onchange_employee_ids(self):
user_ids = []