From e7c71ee7657541de9675c1f18a110495eb45f331 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sun, 6 Apr 2025 14:57:06 +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

---
 room/views/room_booking_views.xml             |  2 +-
 room/views/room_room_views.xml                |  4 +-
 .../views/soong_user_role_views.xml           |  6 +-
 .../views/soong_workflow_inspector_views.xml  |  2 +-
 yuthon_holiday/views/hr_leave_batch.xml       |  4 +-
 .../views/yuthon_fixes_approval_views.xml     |  4 +-
 yuthon_hr_attendance/views/card_approval.xml  |  4 +-
 yuthon_hr_attendance/views/duty_approval.xml  |  4 +-
 yuthon_hr_attendance/views/go_approval.xml    |  2 +-
 .../hr_attendance_detail_wechat_views.xml     |  6 +-
 .../views/hr_attendance_month_views.xml       |  8 +-
 .../views/hr_attendance_views.xml             |  4 +-
 .../inherit_planning_slot_template_views.xml  |  2 +-
 .../views/overtime_approval.xml               |  4 +-
 .../views/remove_holiday_approval.xml         |  4 +-
 .../views/yuthon_abnormal_approval_views.xml  |  4 +-
 .../yuthon_adjustments_approval_views.xml     |  6 +-
 .../views/yuthon_customer_approval_views.xml  |  4 +-
 .../views/yuthon_run_planning_views.xml       |  2 +-
 .../views/yuthon_shift_approval_views.xml     |  2 +-
 .../views/yuthon_shift_planning_views.xml     |  2 +-
 .../views/yuthon_special_approval_views.xml   |  2 +-
 .../views/inherit_hr_applicant_views.xml      |  4 +-
 .../views/yuthon_job_postings_views.xml       |  2 +-
 .../views/yuthon_medical_manage_views.xml     |  6 +-
 .../views/yuthon_medical_rule_views.xml       |  2 +-
 .../wizard/hr_employee_time_wizard_views.xml  |  2 +-
 .../views/yuthon_interview_approval_views.xml |  2 +-
 .../views/yuthon_onboard_approval_views.xml   |  2 +-
 .../views/yuthon_inspection_items_views.xml   |  4 +-
 .../views/yuthon_inspection_route_views.xml   |  4 +-
 .../views/yuthon_inspection_scores_views.xml  |  4 +-
 .../views/yuthon_inspection_views.xml         |  4 +-
 .../views/issue_approval_decision_views.xml   |  2 +-
 yuthon_issue/views/issue_approval_views.xml   |  8 +-
 .../views/yuthon_lessee_notice.xml            |  4 +-
 .../views/property_report_repair.xml          |  4 +-
 .../views/yuthon_maintain_desktop_views.xml   |  4 +-
 .../views/yuthon_confirm_users_views.xml      |  2 +-
 yuthon_notice/views/yuthon_notice_views.xml   |  8 +-
 .../yuthon_official_incoming_labor_views.xml  |  4 +-
 .../yuthon_official_incoming_normal_views.xml |  6 +-
 .../yuthon_official_incoming_party_views.xml  |  4 +-
 .../views/yuthon_official_labor_views.xml     |  4 +-
 .../views/yuthon_official_party_views.xml     |  4 +-
 .../views/yuthon_official_views.xml           |  4 +-
 .../views/yuthon_duty_management.xml          |  4 +-
 .../views/yuthon_employee_appraisal.xml       |  2 +-
 .../views/yuthon_employee_approval.xml        |  8 +-
 .../views/yuthon_employee_performance.xml     |  4 +-
 .../views/yuthon_grading_tasks.xml            |  4 +-
 yuthon_performance/views/yuthon_kpi_tasks.xml |  4 +-
 .../views/yuthon_tissue_duty_approval.xml     |  8 +-
 yuthon_property/__manifest__.py               |  4 +-
 .../models/property_evaluation_plan.py        | 36 +++-----
 yuthon_property/models/yuthon_property.py     | 38 +++++++-
 yuthon_property/security/ir.model.access.csv  |  4 +-
 .../static/src/js/evaluation_create_button.js | 29 +++++++
 .../src/xml/evaluation_create_button.xml      | 10 +++
 .../views/property_electric_reading_views.xml |  2 +-
 .../views/property_evaluation_plan_view.xml   |  7 +-
 .../views/property_water_reading_views.xml    |  2 +-
 .../views/yuthon_property_views.xml           |  9 +-
 yuthon_property/wizard/__init__.py            |  2 +-
 .../wizard/evaluation_plan_wizard.py          | 32 +++++++
 ...s.xml => evaluation_plan_wizard_views.xml} | 11 ++-
 .../wizard/rental_scheme_wizard.py            | 35 --------
 .../models/property_evaluate_application.py   | 87 +++----------------
 .../models/property_lease_contract.py         | 14 +++
 .../security/ir.model.access.csv              |  1 -
 .../views/perperty_claim_approval_views.xml   |  4 +-
 .../property_borrowing_approval_views.xml     |  4 +-
 .../views/property_eligibility.xml            |  2 +-
 .../property_evaluate_application_views.xml   | 64 ++++----------
 .../views/property_intention_views.xml        |  4 +-
 .../views/property_lease_contract.xml         | 10 +--
 .../views/property_transfer_views.xml         |  2 +-
 .../views/inherit_hr_payslip_views.xml        |  4 +-
 .../views/yuthon_payroll_project_views.xml    |  4 +-
 .../views/yuthon_office_supplies_views.xml    |  8 +-
 .../views/yuthon_care_condolences_views.xml   |  2 +-
 .../views/yuthon_message_approval_views.xml   |  6 +-
 .../views/yuthon_trade_activities.xml         |  4 +-
 yuthon_trade/views/yuthon_trade_premium.xml   |  4 +-
 84 files changed, 316 insertions(+), 339 deletions(-)
 create mode 100644 yuthon_property/static/src/js/evaluation_create_button.js
 create mode 100644 yuthon_property/static/src/xml/evaluation_create_button.xml
 create mode 100644 yuthon_property/wizard/evaluation_plan_wizard.py
 rename yuthon_property/wizard/{rental_scheme_wizard_views.xml => evaluation_plan_wizard_views.xml} (64%)
 delete mode 100644 yuthon_property/wizard/rental_scheme_wizard.py

diff --git a/room/views/room_booking_views.xml b/room/views/room_booking_views.xml
index c7afa24d2..9abccebc9 100644
--- a/room/views/room_booking_views.xml
+++ b/room/views/room_booking_views.xml
@@ -152,7 +152,7 @@
                             <field name="room_id" string="会议地点"/>
                         </group>
                         <group>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                             <field name="meeting_type_id" required="1"/>
                         </group>
                     </group>
diff --git a/room/views/room_room_views.xml b/room/views/room_room_views.xml
index 9dcd48c04..309d20620 100644
--- a/room/views/room_room_views.xml
+++ b/room/views/room_room_views.xml
@@ -70,7 +70,7 @@
             <tree>
                 <field name="name"/>
                 <field name="office_address"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="is_available" string="Is Currently Available"/>
                 <field name="next_booking_start"/>
             </tree>
@@ -117,7 +117,7 @@
                             <field name="meeting_type_template"/>
                             <field name="meet_document_id"/>
                             <field name="office_address"/>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                             <field name="short_code" invisible="1"/>
                         </group>
                         <!--                        <group>-->
diff --git a/soong_workflow/views/soong_user_role_views.xml b/soong_workflow/views/soong_user_role_views.xml
index e019f21fd..2923c9301 100644
--- a/soong_workflow/views/soong_user_role_views.xml
+++ b/soong_workflow/views/soong_user_role_views.xml
@@ -29,7 +29,7 @@
             <tree>
                 <field name="number" required="1"/>
                 <field name="name" required="1"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="user_type"/>
                 <field name="personnel_ids" widget="many2many_tags" force_save="1"/>
                 <field name="number_people"/>
@@ -58,7 +58,7 @@
                         <group>
                            <field name="number"/>
                             <field name="user_type"/>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                             <field name="create_time"/>
                             <field name="end_time"/>
                         </group>
@@ -79,7 +79,7 @@
         <field name="arch" type="xml">
             <search>
                 <field name="name"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <searchpanel>
                     <field name="department_id" enable_counters="1"/>
                 </searchpanel>
diff --git a/soong_workflow/views/soong_workflow_inspector_views.xml b/soong_workflow/views/soong_workflow_inspector_views.xml
index a61046b25..b53509f81 100644
--- a/soong_workflow/views/soong_workflow_inspector_views.xml
+++ b/soong_workflow/views/soong_workflow_inspector_views.xml
@@ -7,7 +7,7 @@
             <tree>
                 <field name="name"/>
                 <field name="code"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="start_data"/>
                 <field name="end_data"/>
             </tree>
diff --git a/yuthon_holiday/views/hr_leave_batch.xml b/yuthon_holiday/views/hr_leave_batch.xml
index 0c77cdc40..a692c5a1a 100644
--- a/yuthon_holiday/views/hr_leave_batch.xml
+++ b/yuthon_holiday/views/hr_leave_batch.xml
@@ -8,7 +8,7 @@
                 <tree string="请假审批">
                     <field name="employee_id" column_invisible="1"/>
                     <field name="name"/>
-                    <field name="users_id"/>
+                    <field name="users_id" widget="ztree_select"/>
                 </tree>
             </field>
         </record>
@@ -47,7 +47,7 @@
                         </div>
                         <group>
                             <group>
-                                <field name="users_id"/>
+                                <field name="users_id" widget="ztree_select"/>
                                 <field name="employee_id" invisible="1" force_save="1"/>
                                 <field name="text"/>
                                 <field name="work_end" invisible="1"/>
diff --git a/yuthon_holiday/views/yuthon_fixes_approval_views.xml b/yuthon_holiday/views/yuthon_fixes_approval_views.xml
index a02aba483..744f2188e 100644
--- a/yuthon_holiday/views/yuthon_fixes_approval_views.xml
+++ b/yuthon_holiday/views/yuthon_fixes_approval_views.xml
@@ -6,8 +6,8 @@
         <field name="arch" type="xml">
             <tree string="假期修正审批">
             <field name="name"/>
-            <field name="users_id"/>
-            <field name="department_id"/>
+            <field name="users_id" widget="ztree_select"/>
+            <field name="department_id" widget="ztree_select"/>
             </tree>
         </field>
     </record>
diff --git a/yuthon_hr_attendance/views/card_approval.xml b/yuthon_hr_attendance/views/card_approval.xml
index bb446c5ba..43bbdf919 100644
--- a/yuthon_hr_attendance/views/card_approval.xml
+++ b/yuthon_hr_attendance/views/card_approval.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="name"/>
-                <field name="users_id"/>
+                <field name="users_id" widget="ztree_select"/>
                 <field name="attendance_id"/>
                 <field name="replacement_time"/>
             </tree>
@@ -45,7 +45,7 @@
                        <field name="name"/>
                        <field name="work_end" invisible="1"/>
                         <field name="reason_application"/>
-                        <field name="users_id"/>
+                        <field name="users_id" widget="ztree_select"/>
                         <field name="employee_id" invisible="1"/>
                         <field name="shift_id" invisible="shift_name"/>
                         <field name="shift_name" invisible="shift_id"/>
diff --git a/yuthon_hr_attendance/views/duty_approval.xml b/yuthon_hr_attendance/views/duty_approval.xml
index 1f9f800fa..85884583e 100644
--- a/yuthon_hr_attendance/views/duty_approval.xml
+++ b/yuthon_hr_attendance/views/duty_approval.xml
@@ -6,7 +6,7 @@
             <tree>
                 <field name="name"/>
                 <field name="department_id" optional="hide"/>
-                <field name="users_id"/>
+                <field name="users_id" widget="ztree_select"/>
             </tree>
         </field>
     </record>
@@ -49,7 +49,7 @@
                     </div>
                     <group col="2">
                         <group>
-                            <field name="users_id"/>
+                            <field name="users_id" widget="ztree_select"/>
                             <field name="validity"/>
                             <field name="work_end" invisible="1"/>
                             <field name="issues_result" invisible="is_issues == False"/>
diff --git a/yuthon_hr_attendance/views/go_approval.xml b/yuthon_hr_attendance/views/go_approval.xml
index 2cac1f8b0..c80cfa665 100644
--- a/yuthon_hr_attendance/views/go_approval.xml
+++ b/yuthon_hr_attendance/views/go_approval.xml
@@ -7,7 +7,7 @@
         <field name="arch" type="xml">
             <tree>
                <field name="name"/>
-                <field name="users_id"/>
+                <field name="users_id" widget="ztree_select"/>
             </tree>
         </field>
     </record>
diff --git a/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml b/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml
index 69c95d9b7..0b68f7383 100644
--- a/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml
@@ -34,8 +34,8 @@
                 <header>
                     <button name="get_hr_attendance_time" type="object" string="手动计算" display="always"/>
                 </header>
-                <field name="employee_id"/>
-                <field name="department_id"/>
+                <field name="employee_id" widget="ztree_select"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="groupname"/>
                 <field name="checkin_type"/>
                 <field name="checkin_time"/>
@@ -50,7 +50,7 @@
             <form string="hr attendance detail">
                  <sheet>
                     <group>
-                        <field name="employee_id"/>
+                        <field name="employee_id" widget="ztree_select"/>
                         <field name="department_id"/>
                         <field name="groupname"/>
                         <field name="checkin_type"/>
diff --git a/yuthon_hr_attendance/views/hr_attendance_month_views.xml b/yuthon_hr_attendance/views/hr_attendance_month_views.xml
index 5a11b2e5e..9c17ec965 100644
--- a/yuthon_hr_attendance/views/hr_attendance_month_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_month_views.xml
@@ -63,8 +63,8 @@
                     <button class="oe_stat_button" name="update_attendance_month" string="更新考勤明细" type="object"
                             icon="fa-bars"/>
                 </header>
-                <field name="employee_id"/>
-                <field name="department_id" optional="hide"/>
+                <field name="employee_id" widget="ztree_select"/>
+                <field name="department_id" optional="hide" widget="ztree_select"/>
                 <field name="current_year"/>
                 <field name="current_month"/>
                 <field name="entry_date"/>
@@ -203,8 +203,8 @@
                 <sheet>
                     <group>
                         <group>
-                            <field name="employee_id"/>
-                            <field name="department_id"/>
+                            <field name="employee_id" widget="ztree_select"/>
+                            <field name="department_id" widget="ztree_select"/>
                             <field name="current_year"/>
                             <field name="current_month"/>
                             <field name="required_attendance_days"/>
diff --git a/yuthon_hr_attendance/views/hr_attendance_views.xml b/yuthon_hr_attendance/views/hr_attendance_views.xml
index 91d737fc9..2c556e5d6 100644
--- a/yuthon_hr_attendance/views/hr_attendance_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_views.xml
@@ -28,7 +28,7 @@
                 <button name="button_card_approval" type="object" string="补卡" class="oe_highlight" invisible="not (is_abnormal or is_early_card or is_late_card or absenteeism_card or is_no_card)"/>
                 <button name="button_duty_approval" type="object" string="外出" class="oe_highlight" invisible="not (is_abnormal or is_early_card or is_late_card or absenteeism_card or is_no_card)"/>
                 <button name="button_correct_approval" type="object" string="修正" class="oe_highlight" groups="yuthon_hr_attendance.group_he_attendance_planning_manager" invisible="is_approval"/>
-                <button name="button_source" type="object" string="来源" class="oe_highlight"/>
+                <button name="button_source" type="object" string="详情" class="oe_highlight"/>
             </tree>
         </field>
     </record>
@@ -54,7 +54,7 @@
         <field name="model">hr.attendance</field>
         <field name="arch" type="xml">
             <search>
-                <field name="employee_id"/>
+                <field name="employee_id" widget="ztree_select"/>
             </search>
         </field>
     </record>
diff --git a/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml b/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml
index 0cf34557e..120ace2f7 100644
--- a/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml
+++ b/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml
@@ -8,7 +8,7 @@
                 <field name="planning_name" string="名称"/>
             </xpath>
             <xpath expr="//field[@name='role_id']" position="after">
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="end_time2" widget="float_time"/>
                 <field name="day2"/>
                 <field name="color"  widget="color_picker" optional="show"/>
diff --git a/yuthon_hr_attendance/views/overtime_approval.xml b/yuthon_hr_attendance/views/overtime_approval.xml
index 3fcaef696..947ec3f45 100644
--- a/yuthon_hr_attendance/views/overtime_approval.xml
+++ b/yuthon_hr_attendance/views/overtime_approval.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="name"/>
-                <field name="users_id"/>
+                <field name="users_id" widget="ztree_select"/>
                 <field name="department_id" optional="hide"/>
             </tree>
         </field>
@@ -52,7 +52,7 @@
                         </h1>
                     </div>
                     <group string="审批事项">
-                        <field name="users_id"/>
+                        <field name="users_id" widget="ztree_select"/>
                         <field name="work_end" invisible="1"/>
                         <field name="reason_application"/>
                         <field name="issues_result" invisible="is_issues == False"/>
diff --git a/yuthon_hr_attendance/views/remove_holiday_approval.xml b/yuthon_hr_attendance/views/remove_holiday_approval.xml
index b40bef41a..d59bfda01 100644
--- a/yuthon_hr_attendance/views/remove_holiday_approval.xml
+++ b/yuthon_hr_attendance/views/remove_holiday_approval.xml
@@ -7,7 +7,7 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="name"/>
-                <field name="users_id"/>
+                <field name="users_id" widget="ztree_select"/>
                 <field name="department_id"/>
                 <field name="date"/>
                 <field name="statu"/>
@@ -54,7 +54,7 @@
                     </group>
                     <group string="审批人信息">
                         <group>
-                            <field name="users_id"/>
+                            <field name="users_id" widget="ztree_select"/>
                             <field name="department_id"/>
                             <field name="date_start"/>
                             <field name="date_end"/>
diff --git a/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml b/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
index 8bf7d72fe..3e2bf40e9 100644
--- a/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree string="值班补卡审批">
             <field name="name"/>
-            <field name="users_id"/>
+            <field name="users_id" widget="ztree_select"/>
             <field name="department_id"/>
             </tree>
         </field>
@@ -53,7 +53,7 @@
                     </group>
                     <group string="个人信息">
                         <group>
-                            <field name="users_id"/>
+                            <field name="users_id" widget="ztree_select"/>
                             <field name="department_id"/>
                         </group>
                     </group>
diff --git a/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml b/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
index 989a7852c..011ee53a6 100644
--- a/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
@@ -6,8 +6,8 @@
         <field name="arch" type="xml">
             <tree string="值班调休审批">
             <field name="name"/>
-            <field name="users_id"/>
-            <field name="department_id"/>
+            <field name="users_id" widget="ztree_select"/>
+            <field name="department_id" widget="ztree_select"/>
             </tree>
         </field>
     </record>
@@ -53,7 +53,7 @@
                     </group>
                     <group col="2">
                         <group>
-                            <field name="users_id"/>
+                            <field name="users_id" widget="ztree_select"/>
                         </group>
                         <group>
                             <field name="replacement_data"/>
diff --git a/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml b/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
index 3e94120c7..d204771b4 100644
--- a/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree string="客服值班审批">
                 <field name="name"/>
-                <field name="users_id"/>
+                <field name="users_id" widget="ztree_select"/>
             </tree>
         </field>
     </record>
@@ -50,7 +50,7 @@
                     </group>
                     <group string="个人信息" col="2">
                         <group>
-                            <field name="users_id"/>
+                            <field name="users_id" widget="ztree_select"/>
                             <field name="employee_id" invisible="1"/>
                         </group>
                         <group>
diff --git a/yuthon_hr_attendance/views/yuthon_run_planning_views.xml b/yuthon_hr_attendance/views/yuthon_run_planning_views.xml
index 2b24c5129..146fb033c 100644
--- a/yuthon_hr_attendance/views/yuthon_run_planning_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_run_planning_views.xml
@@ -32,7 +32,7 @@
                             <tree editable="bottom">
                                 <field name="engineering_planning_id" column_invisible="1"/>
                                 <field name="sequence" />
-                                <field name="employee_id"/>
+                                <field name="employee_id" widget="ztree_select"/>
                             </tree>
                         </field>
                     </group>
diff --git a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
index 4cc2d206f..08e1047fc 100644
--- a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree string="值班换班审批">
             <field name="name"/>
-            <field name="users_id"/>
+            <field name="users_id" widget="ztree_select"/>
             <field name="department_id" optional="hide"/>
             </tree>
         </field>
diff --git a/yuthon_hr_attendance/views/yuthon_shift_planning_views.xml b/yuthon_hr_attendance/views/yuthon_shift_planning_views.xml
index b0cb5a2b8..bfb5184e2 100644
--- a/yuthon_hr_attendance/views/yuthon_shift_planning_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_shift_planning_views.xml
@@ -31,7 +31,7 @@
                         <field name="planning_a_ids" string=" ">
                             <tree editable="bottom">
                                 <field name="sequence" widget="handle" />
-                                <field name="employee_id"/>
+                                <field name="employee_id" widget="ztree_select"/>
                                 <field name="regular_holidays"/>
                             </tree>
                         </field>
diff --git a/yuthon_hr_attendance/views/yuthon_special_approval_views.xml b/yuthon_hr_attendance/views/yuthon_special_approval_views.xml
index 3b69e08e5..398a7c269 100644
--- a/yuthon_hr_attendance/views/yuthon_special_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_special_approval_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree string="特殊加班">
                 <field name="name"/>
-                <field name="users_id"/>
+                <field name="users_id" widget="ztree_select"/>
                 <field name="department_id" optional="hide"/>
             </tree>
         </field>
diff --git a/yuthon_hr_employee/views/inherit_hr_applicant_views.xml b/yuthon_hr_employee/views/inherit_hr_applicant_views.xml
index 6daa4191d..753ce0d5c 100644
--- a/yuthon_hr_employee/views/inherit_hr_applicant_views.xml
+++ b/yuthon_hr_employee/views/inherit_hr_applicant_views.xml
@@ -26,7 +26,7 @@
                             </group>
                             <group>
                                 <field name="colleges"/>
-                                <field name="department_id" string="部门"/>
+                                <field name="department_id" string="部门" widget="ztree_select"/>
                                 <field name="company_id" required="1"/>
                                 <field name="tage_ids" widget="many2many_tags"/>
                             </group>
@@ -79,7 +79,7 @@
                 <attribute name="string">岗位</attribute>
             </xpath>
             <xpath expr="//field[@name='name']" position="after">
-                <field name="department_id" string="部门"/>
+                <field name="department_id" string="部门" widget="ztree_select"/>
                 <field name="is_interview_status" string="状态"/>
             </xpath>
             <xpath expr="//field[@name='create_date']" position="attributes">
diff --git a/yuthon_hr_employee/views/yuthon_job_postings_views.xml b/yuthon_hr_employee/views/yuthon_job_postings_views.xml
index a96e307ed..8437b79c1 100644
--- a/yuthon_hr_employee/views/yuthon_job_postings_views.xml
+++ b/yuthon_hr_employee/views/yuthon_job_postings_views.xml
@@ -22,7 +22,7 @@
                     </div>
                     <group col="4">
                     <group>
-                        <field name="user_id" required="1" string="申报员"/>
+                        <field name="user_id" required="1" string="申报员" widget="ztree_select"/>
                         <field name="recruit_start_date"/>
                     </group>
                     <group>
diff --git a/yuthon_hr_employee/views/yuthon_medical_manage_views.xml b/yuthon_hr_employee/views/yuthon_medical_manage_views.xml
index 2957dd0fd..dba33da80 100644
--- a/yuthon_hr_employee/views/yuthon_medical_manage_views.xml
+++ b/yuthon_hr_employee/views/yuthon_medical_manage_views.xml
@@ -8,7 +8,7 @@
                 <header>
                     <button name="property_reimbursement_form" string="提交体检费报销审批" type="object" class="oe_highlight"/>
                 </header>
-                <field name="employee_id"/>
+                <field name="employee_id" widget="ztree_select"/>
                 <field name="company_id" required="1" optional="show"/>
                 <field name="this_year_usage"/>
                 <field name="this_year_quota"/>
@@ -32,9 +32,9 @@
             <form string="体检费管理" create="0">
                 <sheet>
                     <div class="oe_title">
-                        <label for="employee_id"/>
+                        <label for="employee_id" widget="ztree_select"/>
                         <h1>
-                            <field name="employee_id"/>
+                            <field name="employee_id" widget="ztree_select"/>
                         </h1>
                     </div>
                     <group>
diff --git a/yuthon_hr_employee/views/yuthon_medical_rule_views.xml b/yuthon_hr_employee/views/yuthon_medical_rule_views.xml
index 819c93aad..858a9173f 100644
--- a/yuthon_hr_employee/views/yuthon_medical_rule_views.xml
+++ b/yuthon_hr_employee/views/yuthon_medical_rule_views.xml
@@ -12,7 +12,7 @@
                 <field name="cap"/>
                 <field name="allowance_unmarried_women"/>
                 <field name="allowance_married_women"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="extension_years"/>
                 <field name="company_id" required="1" optional="show"/>
                 <field name="start_date"/>
diff --git a/yuthon_hr_employee/wizard/hr_employee_time_wizard_views.xml b/yuthon_hr_employee/wizard/hr_employee_time_wizard_views.xml
index 1bc684c8b..456405773 100644
--- a/yuthon_hr_employee/wizard/hr_employee_time_wizard_views.xml
+++ b/yuthon_hr_employee/wizard/hr_employee_time_wizard_views.xml
@@ -7,7 +7,7 @@
             <form string="考勤时间表">
                 <sheet>
                     <group>
-                        <field name="department_id"/>
+                        <field name="department_id" widget="ztree_select"/>
                         <field name="employee_ids" widget="many2many_tags"/>
                         <field name="attendance_id"/>
                     </group>
diff --git a/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml
index 249b8f1bb..50c12dbd5 100644
--- a/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml
@@ -51,7 +51,7 @@
                         <field name="name"/>
                         <field name="job_id"/>
                         <field name="departments_id"/>
-                        <field name="users_id"/>
+                        <field name="users_id" widget="ztree_select"/>
                         <field name="work_end" invisible="1"/>
                         <field name="is_issues" invisible="is_issues == False"/>
                          <field name="department_id" invisible="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
index 2fae6a2f3..30b530469 100644
--- a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
@@ -48,7 +48,7 @@
                     <group string="审批信息">
                         <field name="name" required="1"/>
                         <field name="work_end" invisible="1"/>
-                        <field name="users_id"/>
+                        <field name="users_id" widget="ztree_select"/>
                         <field name="reason"/>
                         <field name="issues_result" invisible="is_issues == False"/>
                     </group>
diff --git a/yuthon_inspection/views/yuthon_inspection_items_views.xml b/yuthon_inspection/views/yuthon_inspection_items_views.xml
index 9129343fd..c5ea475bb 100644
--- a/yuthon_inspection/views/yuthon_inspection_items_views.xml
+++ b/yuthon_inspection/views/yuthon_inspection_items_views.xml
@@ -11,7 +11,7 @@
                 <field name="items_check"/>
                 <field name="items_line"/>
                 <field name="items_outcome"/>
-                <field name="user_id"/>
+                <field name="user_id" widget="ztree_select"/>
                 <field name="items_time"/>
             </tree>
         </field>
@@ -31,7 +31,7 @@
                         </group>
                         <group>
                             <field name="items_outcome"/>
-                            <field name="user_id"/>
+                            <field name="user_id" widget="ztree_select"/>
                             <field name="items_time"/>
                         </group>
                     </group>
diff --git a/yuthon_inspection/views/yuthon_inspection_route_views.xml b/yuthon_inspection/views/yuthon_inspection_route_views.xml
index fc60347ea..2ac995587 100644
--- a/yuthon_inspection/views/yuthon_inspection_route_views.xml
+++ b/yuthon_inspection/views/yuthon_inspection_route_views.xml
@@ -10,7 +10,7 @@
                 <field name="route_type"/>
                 <field name="sequence"/>
                 <field name="route_number"/>
-                <field name="user_id"/>
+                <field name="user_id" widget="ztree_select"/>
                 <field name="items_time"/>
             </tree>
         </field>
@@ -29,7 +29,7 @@
                         </group>
                         <group>
                             <field name="route_number"/>
-                            <field name="user_id"/>
+                            <field name="user_id" widget="ztree_select"/>
                             <field name="items_time"/>
                         </group>
                     </group>
diff --git a/yuthon_inspection/views/yuthon_inspection_scores_views.xml b/yuthon_inspection/views/yuthon_inspection_scores_views.xml
index 57ac81441..3274b4ba0 100644
--- a/yuthon_inspection/views/yuthon_inspection_scores_views.xml
+++ b/yuthon_inspection/views/yuthon_inspection_scores_views.xml
@@ -9,7 +9,7 @@
                 <field name="scores_code"/>
                 <field name="scores_location"/>
                 <field name="scores_job"/>
-                <field name="user_id"/>
+                <field name="user_id" widget="ztree_select"/>
                 <field name="scores_time"/>
                 <field name="scores_sign"/>
                 <field name="scores_photo"/>
@@ -30,7 +30,7 @@
 
                         </group>
                         <group>
-                            <field name="user_id"/>
+                            <field name="user_id" widget="ztree_select"/>
                             <field name="scores_time"/>
                             <field name="scores_sign"/>
                             <field name="scores_photo"/>
diff --git a/yuthon_inspection/views/yuthon_inspection_views.xml b/yuthon_inspection/views/yuthon_inspection_views.xml
index b993023fe..3d6b9b0d1 100644
--- a/yuthon_inspection/views/yuthon_inspection_views.xml
+++ b/yuthon_inspection/views/yuthon_inspection_views.xml
@@ -9,7 +9,7 @@
                 <field name="name"/>
                 <field name="state"/>
                 <field name="inspection_code"/>
-                <field name="user_id"/>
+                <field name="user_id" widget="ztree_select"/>
                 <field name="user_phone"/>
                 <field name="start_plan_time"/>
                 <field name="end_plan_time"/>
@@ -29,7 +29,7 @@
                             <field name="inspection_code"/>
                         </group>
                         <group>
-                            <field name="user_id"/>
+                            <field name="user_id" widget="ztree_select"/>
                             <field name="user_phone"/>
                             <field name="start_plan_time"/>
                             <field name="end_plan_time"/>
diff --git a/yuthon_issue/views/issue_approval_decision_views.xml b/yuthon_issue/views/issue_approval_decision_views.xml
index 1f892e75f..65abcb401 100644
--- a/yuthon_issue/views/issue_approval_decision_views.xml
+++ b/yuthon_issue/views/issue_approval_decision_views.xml
@@ -47,7 +47,7 @@
                         <group>
                             <field name="board_meet"/>
                             <field name="start_date"/>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                         </group>
                         <group>
                             <field name="district_bureau"/>
diff --git a/yuthon_issue/views/issue_approval_views.xml b/yuthon_issue/views/issue_approval_views.xml
index 6d11eab1f..9b9640ea7 100644
--- a/yuthon_issue/views/issue_approval_views.xml
+++ b/yuthon_issue/views/issue_approval_views.xml
@@ -8,7 +8,7 @@
                 <field name="issue_data" column_invisible="1"/>
                 <field name="decision_data" column_invisible="1"/>
                 <field name="name"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="issue_display" widget="json_template"/>
                 <field name="decision_display" widget="json_template"/>
             </tree>
@@ -49,14 +49,14 @@
                     </group>
                     <group col="4" string="个人信息">
                         <group>
-                            <field name="employee_id"/>
+                            <field name="employee_id" widget="ztree_select"/>
                             <field name="is_attend"/>
                         </group>
                         <group>
                             <field name="job_id"/>
                         </group>
                         <group>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                         </group>
                     </group>
                     <group>
@@ -72,7 +72,7 @@
                                 <tree editable="bottom">
                                     <field name="issue_approval_id" column_invisible="1"/>
                                     <field name="issue_library_id"/>
-                                    <field name="employee_id"/>
+                                    <field name="employee_id" widget="ztree_select"/>
                                     <field name="approval_decision_sequence"/>
                                     <field name="is_party"/>
                                     <field name="is_class"/>
diff --git a/yuthon_lessee_service/views/yuthon_lessee_notice.xml b/yuthon_lessee_service/views/yuthon_lessee_notice.xml
index c42d875ec..9514a097b 100644
--- a/yuthon_lessee_service/views/yuthon_lessee_notice.xml
+++ b/yuthon_lessee_service/views/yuthon_lessee_notice.xml
@@ -5,7 +5,7 @@
         <field name="model">yuthon.lessee.notice</field>
         <field name="arch" type="xml">
             <tree string="公告管理">
-                <field name="user_id" string="发布人"/>
+                <field name="user_id" string="发布人" widget="ztree_select"/>
                 <field name="notice_type_id" string="类型"/>
                 <field name="name"/>
                 <field name="department_id" column_invisible="1"/>
@@ -43,7 +43,7 @@
                             <field name="create_date"/>
                         </group>
                         <group>
-                            <field name="user_id" required="1"/>
+                            <field name="user_id" required="1" widget="ztree_select"/>
                             <field name="is_notice_roger"/>
                         </group>
                     </group>
diff --git a/yuthon_maintain/views/property_report_repair.xml b/yuthon_maintain/views/property_report_repair.xml
index 4a93d10d8..2a5764b8d 100644
--- a/yuthon_maintain/views/property_report_repair.xml
+++ b/yuthon_maintain/views/property_report_repair.xml
@@ -44,13 +44,13 @@
                     </div>
                     <group string="基本信息" col="3">
                          <group>
-                            <field name="users_id"/>
+                            <field name="users_id" widget="ztree_select"/>
                         </group>
                         <group>
                             <field name="repairer_date"/>
                         </group>
                         <group>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                         </group>
                     </group>
                     <group string="设备信息">
diff --git a/yuthon_maintain/views/yuthon_maintain_desktop_views.xml b/yuthon_maintain/views/yuthon_maintain_desktop_views.xml
index 28f9956bc..5e3367472 100644
--- a/yuthon_maintain/views/yuthon_maintain_desktop_views.xml
+++ b/yuthon_maintain/views/yuthon_maintain_desktop_views.xml
@@ -8,7 +8,7 @@
                 <field name="desktop_id"/>
                 <field name="account"/>
                 <field name="purchase_date"/>
-                <field name="users_id"/>
+                <field name="users_id" widget="ztree_select"/>
             </tree>
         </field>
     </record>
@@ -39,7 +39,7 @@
                             <field name="password"/>
                             <field name="desktop_type"/>
                             <field name="purchase_date"/>
-                            <field name="users_id"/>
+                            <field name="users_id" widget="ztree_select"/>
                         </group>
                     </group>
                     <group>
diff --git a/yuthon_notice/views/yuthon_confirm_users_views.xml b/yuthon_notice/views/yuthon_confirm_users_views.xml
index 4d7e0e570..07e16f0b1 100644
--- a/yuthon_notice/views/yuthon_confirm_users_views.xml
+++ b/yuthon_notice/views/yuthon_confirm_users_views.xml
@@ -9,7 +9,7 @@
                 <header>
                     <button class="oe_stat_button" name="reminders_notice" string="批量催办" type="object" icon="fa-bars"/>
                 </header>
-                <field name="employee_id"/>
+                <field name="employee_id" widget="ztree_select"/>
                 <field name="notice_id"/>
                 <field name="notice_code"/>
                 <field name="state"/>
diff --git a/yuthon_notice/views/yuthon_notice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml
index ced5595a5..9363ffacc 100644
--- a/yuthon_notice/views/yuthon_notice_views.xml
+++ b/yuthon_notice/views/yuthon_notice_views.xml
@@ -9,7 +9,7 @@
                   decoration-muted="notice_state == 'stop'">
                 <field name="name" required="1"/>
                 <field name="notice_type_id" string="类型"/>
-                <field name="users_id" string="发布人"/>
+                <field name="users_id" string="发布人" widget="ztree_select"/>
                 <field name="department_id" column_invisible="1"/>
                 <field name="users_ids" column_invisible="1"/>
                 <field name="create_date"/>
@@ -57,7 +57,7 @@
                             <field name="notice_type_id" required="1"/>
                         </group>
                         <group>
-                            <field name="users_id" required="1"/>
+                            <field name="users_id" required="1" widget="ztree_select"/>
                         </group>
                         <group>
                             <field name="work_end" invisible="1"/>
@@ -108,7 +108,7 @@
                   js_class="custom_notice_tree_button">
                 <field name="name"/>
                 <field name="notice_type_id" string="类型"/>
-                <field name="users_id" string="发布人"/>
+                <field name="users_id" string="发布人" widget="ztree_select"/>
                 <field name="is_notice_roger"/>
                 <field name="department_id" column_invisible="1"/>
                 <field name="users_ids" column_invisible="1"/>
@@ -129,7 +129,7 @@
                         <field name="notice_type_id" required="1" string="发布类型"/>
                     </group>
                     <group>
-                        <field name="users_id" required="1"/>
+                        <field name="users_id" required="1" widget="ztree_select"/>
                     </group>
                     <group>
                         <field name="read_number"/>
diff --git a/yuthon_official/views/yuthon_official_incoming_labor_views.xml b/yuthon_official/views/yuthon_official_incoming_labor_views.xml
index a33581615..6c0de0afc 100644
--- a/yuthon_official/views/yuthon_official_incoming_labor_views.xml
+++ b/yuthon_official/views/yuthon_official_incoming_labor_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="name"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="date"/>
                 <field name="statu"/>
             </tree>
@@ -62,7 +62,7 @@
                             <field name="remarks"/>
                         </group>
                         <group>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                             <field name="main_flats"/>
                             <field name="copy_flats"/>
                             <field name="servings_number"/>
diff --git a/yuthon_official/views/yuthon_official_incoming_normal_views.xml b/yuthon_official/views/yuthon_official_incoming_normal_views.xml
index a82363a55..d143fd3c0 100644
--- a/yuthon_official/views/yuthon_official_incoming_normal_views.xml
+++ b/yuthon_official/views/yuthon_official_incoming_normal_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="name"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="time_date"/>
             </tree>
         </field>
@@ -58,8 +58,8 @@
                             <field name="remarks"/>
                         </group>
                         <group>
-                            <field name="users_id"/>
-                            <field name="department_id"/>
+                            <field name="users_id" widget="ztree_select"/>
+                            <field name="department_id" widget="ztree_select"/>
                             <field name="main_flats"/>
                             <field name="servings_number"/>
                             <field name="is_supervising"/>
diff --git a/yuthon_official/views/yuthon_official_incoming_party_views.xml b/yuthon_official/views/yuthon_official_incoming_party_views.xml
index c233c55e4..9450f69e7 100644
--- a/yuthon_official/views/yuthon_official_incoming_party_views.xml
+++ b/yuthon_official/views/yuthon_official_incoming_party_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="name"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="date"/>
                 <field name="statu"/>
             </tree>
@@ -56,7 +56,7 @@
                         </group>
                         <group>
                             <field name="date"/>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                             <field name="main_flats"/>
                             <field name="copy_flats"/>
                             <field name="servings_number"/>
diff --git a/yuthon_official/views/yuthon_official_labor_views.xml b/yuthon_official/views/yuthon_official_labor_views.xml
index 3281966c9..37983007a 100644
--- a/yuthon_official/views/yuthon_official_labor_views.xml
+++ b/yuthon_official/views/yuthon_official_labor_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="name"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="date"/>
                 <field name="statu"/>
             </tree>
@@ -49,7 +49,7 @@
                             <field name="official_documents_ids" widget="preview_many2many"/>
                         </group>
                         <group>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                             <field name="main_flats"/>
                             <field name="copy_flats"/>
                             <field name="servings_number"/>
diff --git a/yuthon_official/views/yuthon_official_party_views.xml b/yuthon_official/views/yuthon_official_party_views.xml
index 9d34ba4c7..a860af874 100644
--- a/yuthon_official/views/yuthon_official_party_views.xml
+++ b/yuthon_official/views/yuthon_official_party_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="name"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="date"/>
                 <field name="statu"/>
             </tree>
@@ -57,7 +57,7 @@
                             <field name="date"/>
                         </group>
                         <group>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                             <field name="main_flats"/>
                             <field name="copy_flats"/>
                             <field name="servings_number"/>
diff --git a/yuthon_official/views/yuthon_official_views.xml b/yuthon_official/views/yuthon_official_views.xml
index d404fb8e7..7fcc676f1 100644
--- a/yuthon_official/views/yuthon_official_views.xml
+++ b/yuthon_official/views/yuthon_official_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="name"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="official_partner_id"/>
                 <field name="date"/>
             </tree>
@@ -66,7 +66,7 @@
                             <field name="official_documents_ids" widget="many2many_tags"/>
                         </group>
                         <group>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                             <field name="come_file_id"/>
                             <field name="incoming_file_id"/>
                             <field name="main_flats"/>
diff --git a/yuthon_performance/views/yuthon_duty_management.xml b/yuthon_performance/views/yuthon_duty_management.xml
index 5aba7a317..bc480ade4 100644
--- a/yuthon_performance/views/yuthon_duty_management.xml
+++ b/yuthon_performance/views/yuthon_duty_management.xml
@@ -5,7 +5,7 @@
         <field name="model">yuthon.duty.management</field>
         <field name="arch" type="xml">
             <tree string="责任书">
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="name"/>
                 <field name="start_index_time"/>
                 <field name="end_index_time"/>
@@ -28,7 +28,7 @@
                     <group>
                         <group>
                             <field name="work_end" invisible="1"/>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                              <field name="total_weights"/>
                         </group>
                         <group>
diff --git a/yuthon_performance/views/yuthon_employee_appraisal.xml b/yuthon_performance/views/yuthon_employee_appraisal.xml
index 798ab9da9..4fe4531fd 100644
--- a/yuthon_performance/views/yuthon_employee_appraisal.xml
+++ b/yuthon_performance/views/yuthon_employee_appraisal.xml
@@ -38,7 +38,7 @@
                     <group col="2" string="被考核者的基本信息">
                         <group>
                             <field name="be_examiners"/>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                         </group>
                         <group>
                             <field name="assessment_cycle"/>
diff --git a/yuthon_performance/views/yuthon_employee_approval.xml b/yuthon_performance/views/yuthon_employee_approval.xml
index b12dd263f..c20142de0 100644
--- a/yuthon_performance/views/yuthon_employee_approval.xml
+++ b/yuthon_performance/views/yuthon_employee_approval.xml
@@ -7,8 +7,8 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="name"/>
-                <field name="users_id"/>
-                <field name="department_id"/>
+                <field name="users_id" widget="ztree_select"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="creation_time"/>
             </tree>
         </field>
@@ -22,14 +22,14 @@
                 <sheet>
                     <group col="3">
                         <group>
-                            <field name="users_id"/>
+                            <field name="users_id" widget="ztree_select"/>
                             <field name="code"/>
                             <field name="creation_time"/>
                         </group>
                         <group>
                             <field name="work_end" invisible="1"/>
                             <field name="job_id"/>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                         </group>
                         <group/>
                     </group>
diff --git a/yuthon_performance/views/yuthon_employee_performance.xml b/yuthon_performance/views/yuthon_employee_performance.xml
index 0deed3625..633f06d9c 100644
--- a/yuthon_performance/views/yuthon_employee_performance.xml
+++ b/yuthon_performance/views/yuthon_employee_performance.xml
@@ -7,7 +7,7 @@
             <tree string="责任书"
                   decoration-danger="index_statu == 'void'"
                   decoration-success="index_statu == 'work'">
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="name"/>
                 <field name="start_index_time"/>
                 <field name="end_index_time"/>
@@ -29,7 +29,7 @@
                     </div>
                     <group>
                         <group>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                             <field name="index_statu"/>
                             <field name="examiners"/>
                         </group>
diff --git a/yuthon_performance/views/yuthon_grading_tasks.xml b/yuthon_performance/views/yuthon_grading_tasks.xml
index 0176a316c..5d62b0339 100644
--- a/yuthon_performance/views/yuthon_grading_tasks.xml
+++ b/yuthon_performance/views/yuthon_grading_tasks.xml
@@ -7,7 +7,7 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="name"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="index_time"/>
             </tree>
         </field>
@@ -25,7 +25,7 @@
                     </div>
                     <group col="2">
                         <group>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                         </group>
                         <group>
                               <field name="index_time"/>
diff --git a/yuthon_performance/views/yuthon_kpi_tasks.xml b/yuthon_performance/views/yuthon_kpi_tasks.xml
index 123e5243a..58c7d51b9 100644
--- a/yuthon_performance/views/yuthon_kpi_tasks.xml
+++ b/yuthon_performance/views/yuthon_kpi_tasks.xml
@@ -7,7 +7,7 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="name"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="index_time"/>
             </tree>
         </field>
@@ -25,7 +25,7 @@
                     </div>
                     <group col="2">
                         <group>
-                              <field name="department_id"/>
+                              <field name="department_id" widget="ztree_select"/>
                         </group>
                         <group>
                               <field name="index_time"/>
diff --git a/yuthon_performance/views/yuthon_tissue_duty_approval.xml b/yuthon_performance/views/yuthon_tissue_duty_approval.xml
index ed376073b..3282307fa 100644
--- a/yuthon_performance/views/yuthon_tissue_duty_approval.xml
+++ b/yuthon_performance/views/yuthon_tissue_duty_approval.xml
@@ -7,8 +7,8 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="name"/>
-                <field name="users_id"/>
-                <field name="department_id"/>
+                <field name="users_id" widget="ztree_select"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="creation_time"/>
             </tree>
         </field>
@@ -22,14 +22,14 @@
                 <sheet>
                     <group col="3">
                         <group>
-                            <field name="users_id"/>
+                            <field name="users_id" widget="ztree_select"/>
                             <field name="code"/>
                             <field name="creation_time"/>
                         </group>
                         <group>
                             <field name="work_end" invisible="1"/>
                             <field name="job_id"/>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                         </group>
                         <group>
                             <field name="is_kpi"/>
diff --git a/yuthon_property/__manifest__.py b/yuthon_property/__manifest__.py
index cc0a4686e..44a09ec06 100644
--- a/yuthon_property/__manifest__.py
+++ b/yuthon_property/__manifest__.py
@@ -56,8 +56,8 @@
         'views/property_accounts_receivable_views.xml',
         'wizard/yuthon_property_wizard_views.xml',
         'wizard/property_meter_wizard_views.xml',
-        'wizard/rental_scheme_wizard_views.xml',
         'wizard/property_tenant_wizard_views.xml',
+        'wizard/evaluation_plan_wizard_views.xml',
         'wizard/property_water_wizard_views.xml',
         'wizard/property_statements_wizard_views.xml',
         'views/menuitem.xml',
@@ -68,9 +68,11 @@
             'yuthon_property/static/src/js/rent_create_button.js',
             'yuthon_property/static/src/js/bank_create_button.js',
             'yuthon_property/static/src/js/statements_create_button.js',
+            'yuthon_property/static/src/js/evaluation_create_button.js',
             'yuthon_property/static/src/xml/rent_create_button.xml',
             'yuthon_property/static/src/xml/bank_create_button.xml',
             'yuthon_property/static/src/xml/statements_create_button.xml',
+            'yuthon_property/static/src/xml/evaluation_create_button.xml',
         ],
     },
     'demo': [],
diff --git a/yuthon_property/models/property_evaluation_plan.py b/yuthon_property/models/property_evaluation_plan.py
index 300fb4171..75dad1829 100644
--- a/yuthon_property/models/property_evaluation_plan.py
+++ b/yuthon_property/models/property_evaluation_plan.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from odoo import models, fields, api
 from odoo.exceptions import UserError, ValidationError
 
@@ -20,6 +21,7 @@ class PropertyEvaluationPlan(models.Model):
                                         default='6')
     annual_increase_percentage = fields.Float(string='每年递增(%)', igits=(6, 2))
     remake = fields.Text(string='备注')
+    state = fields.Selection([('to', '待审批'), ('done', '已审批')], string="状态", default='to')
 
     def put_assessment_approval(self):
         property_evaluation_ids = self.env["property.evaluation.plan"].browse(
@@ -27,9 +29,12 @@ class PropertyEvaluationPlan(models.Model):
         form_id = self.env.ref('yuthon_property_approval.property_evaluate_application_form').id
         property_list = []
         for i in property_evaluation_ids:
+            if i.state == 'done':
+                raise UserError('该方案不可提交')
             property_list.append([0, 0, {
                 'property_evaluation_id': i.id,
             }])
+            i.write({'state': 'done'})
         return {
             'name': '提交物业评估',
             'view_mode': 'form',
@@ -38,28 +43,15 @@ class PropertyEvaluationPlan(models.Model):
             'views': [(form_id, 'form')],
             "context": {
                 'default_property_ids': property_list,
-                'default_is_property': True,
             }
         }
-
-    def rental_scheme_wizard(self):
-        property_evaluation_ids = self.env["property.evaluation.plan"].browse(
-            self._context.get('active_ids', self._context.get('active_id')))
-        evaluation = []
-        name_list = []
-        for i in property_evaluation_ids:
-            name = i.name
-            name_list.append(name)
-            evaluation.append(i.id)
-        name = ','.join(name_list)
+    def button_source(self):
+        domain = [('id', 'in', self.property_ids.ids)]
         return {
-            'name': '整租方案弹窗',
-            'type': 'ir.actions.act_window',
-            'view_mode': 'form',
-            'res_model': 'rental.scheme.wizard',
-            'target': 'new',
-            'context': {
-                'default_name': name,
-                'default_property_ids': evaluation
-            }
-        }
+            "name": "物业",
+            "type": "ir.actions.act_window",
+            "view_mode": "tree",
+            "res_model": "yuthon.property",
+            "domain": domain,
+            "target": "new",
+        }
\ No newline at end of file
diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py
index 208382cf7..0d07e3722 100644
--- a/yuthon_property/models/yuthon_property.py
+++ b/yuthon_property/models/yuthon_property.py
@@ -1,5 +1,6 @@
 from odoo import models, fields, api
 from odoo.exceptions import UserError, ValidationError
+from pypinyin import pinyin,lazy_pinyin
 
 
 class YuthonProperty(models.Model):
@@ -7,6 +8,7 @@ class YuthonProperty(models.Model):
     _description = '物业管理'
     _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin']
     _rec_name = 'name'
+    _order = 'first_letter'
 
     name = fields.Char(string="资产名称")
     users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
@@ -80,6 +82,22 @@ class YuthonProperty(models.Model):
     property_merge_approval_id = fields.Many2one('yuthon.property', string='关联物业信息')
     reference_ids = fields.One2many('yuthon.reference.conditions', 'yuthon_property_id', string='关联出租参考条件明细行')
 
+    first_letter = fields.Char(string="首字母", compute='_compute_first_letter', store=True)
+
+    @api.depends('name')
+    def _compute_first_letter(self):
+        for record in self:
+            name = record.name
+            if name:
+                first_char = name[0]
+                pinyin_list = lazy_pinyin(first_char)
+                if pinyin_list:
+                    record.first_letter = pinyin_list[0][0].upper()
+                else:
+                    record.first_letter = ''
+            else:
+                record.first_letter = ''
+
     @api.onchange('title_information_ids')
     def _onchange_title_information_ids(self):
         for rec in self:
@@ -223,11 +241,19 @@ class YuthonProperty(models.Model):
                 'remake': record.remark,
             })
             record.write({'state': 'ing'})
+        return {
+            "name": "物业评估方案",
+            'type': 'ir.actions.act_window',
+            'res_model': 'property.evaluation.plan',
+            "view_mode": "tree",
+        }
 
     def all_assessment_approval(self):
-         property_ids = self.env["yuthon.property"].browse(
-             self._context.get('active_ids', self._context.get('active_id')))
-         for record in property_ids:
+        property_ids = self.env["yuthon.property"].browse(
+         self._context.get('active_ids', self._context.get('active_id')))
+        for record in property_ids:
+            if record.state == 'ing':
+                raise UserError(f'{record.name}该物业已在评估，请勿重复提交')
             self.env['property.evaluation.plan'].create({
                 'name': record.name,
                 'property_ids': [(6, 0, [record.id])],
@@ -242,6 +268,12 @@ class YuthonProperty(models.Model):
                 'remake': record.remark,
             })
             record.write({'state': 'ing'})
+        return {
+            "name": "物业评估方案",
+            'type': 'ir.actions.act_window',
+            'res_model': 'property.evaluation.plan',
+            "view_mode": "tree",
+        }
 
     # 拆分
     def put_split_approval(self):
diff --git a/yuthon_property/security/ir.model.access.csv b/yuthon_property/security/ir.model.access.csv
index 712a0393e..947d1c41b 100644
--- a/yuthon_property/security/ir.model.access.csv
+++ b/yuthon_property/security/ir.model.access.csv
@@ -85,5 +85,5 @@ access_major_event_setting,major_event_setting,model_major_event_setting,base.gr
 access_yuthon_major_event_line,yuthon_major_event_line,model_yuthon_major_event_line,base.group_user,1,1,1,1
 access_property_floor_setting,property_floor_setting,model_property_floor_setting,base.group_user,1,1,1,1
 access_property_evaluation_plan,property_evaluation_plan,model_property_evaluation_plan,base.group_user,1,1,1,1
-access_rental_scheme_wizard,rental_scheme_wizard,model_rental_scheme_wizard,base.group_user,1,1,1,1
-access_evaluation_company,evaluation_company,model_evaluation_company,base.group_user,1,1,1,1
\ No newline at end of file
+access_evaluation_company,evaluation_company,model_evaluation_company,base.group_user,1,1,1,1
+access_evaluation_plan_wizard,evaluation_plan_wizard,model_evaluation_plan_wizard,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/yuthon_property/static/src/js/evaluation_create_button.js b/yuthon_property/static/src/js/evaluation_create_button.js
new file mode 100644
index 000000000..747859548
--- /dev/null
+++ b/yuthon_property/static/src/js/evaluation_create_button.js
@@ -0,0 +1,29 @@
+/** @odoo-module */
+import { ListController } from "@web/views/list/list_controller";
+import { registry } from '@web/core/registry';
+import { listView } from '@web/views/list/list_view';
+
+export class CustomEvaluationController extends ListController {
+   setup() {
+        super.setup();
+    }
+
+   openEvaluationWizard() {
+        this.actionService.doAction({
+            type: 'ir.actions.act_window',
+            res_model: 'evaluation.plan.wizard',
+            name: '评估方案',
+            view_mode: 'form',
+            view_type: 'form',
+            views: [[false, 'form']],
+            target: 'new', // 以弹窗形式打开
+            context: {},
+        });
+    }
+}
+
+registry.category("views").add("custom_evaluation_button", {
+    ...listView,
+    Controller: CustomEvaluationController,
+    buttonTemplate: "evaluation_module.ListView.Buttons",
+});
\ No newline at end of file
diff --git a/yuthon_property/static/src/xml/evaluation_create_button.xml b/yuthon_property/static/src/xml/evaluation_create_button.xml
new file mode 100644
index 000000000..7bad7cdd5
--- /dev/null
+++ b/yuthon_property/static/src/xml/evaluation_create_button.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<templates>
+    <t t-name="evaluation_module.ListView.Buttons" t-inherit="web.ListView.Buttons">
+        <xpath expr="//div[hasclass('o_list_buttons')]" position="after">
+            <button type="button" class="btn btn-primary" style="margin-left: 10px;" t-on-click="openEvaluationWizard">
+                新建
+            </button>
+        </xpath>
+    </t>
+</templates>
diff --git a/yuthon_property/views/property_electric_reading_views.xml b/yuthon_property/views/property_electric_reading_views.xml
index 7ca32a4e8..093abbfa5 100644
--- a/yuthon_property/views/property_electric_reading_views.xml
+++ b/yuthon_property/views/property_electric_reading_views.xml
@@ -9,7 +9,7 @@
                 <field name="position" optional="hide"/>
                 <field name="property_id"/>
                 <field name="lessee_id"/>
-                <field name="users_id" optional="hide"/>
+                <field name="users_id" optional="hide" widget="ztree_select"/>
                 <field name="state" optional="hide"/>
                 <field name="payment_account" optional="hide"/>
                 <field name="billing_period" optional="hide"/>
diff --git a/yuthon_property/views/property_evaluation_plan_view.xml b/yuthon_property/views/property_evaluation_plan_view.xml
index 4b9b47ad7..dcf6ed5ca 100644
--- a/yuthon_property/views/property_evaluation_plan_view.xml
+++ b/yuthon_property/views/property_evaluation_plan_view.xml
@@ -4,13 +4,12 @@
         <field name="name">property.evaluation.plan.tree</field>
         <field name="model">property.evaluation.plan</field>
         <field name="arch" type="xml">
-            <tree string="物业评估方案" editable="bottom">
+            <tree string="物业评估方案" editable="bottom" create="false" js_class="custom_evaluation_button">
                  <header>
                     <button name="put_assessment_approval" type="object" string="提交评估申请" class="btn btn-primary"/>
-                     <button name="rental_scheme_wizard" type="object" string="整租方案" class="btn btn-primary"/>
                  </header>
                 <field name="name"/>
-                <field name="property_ids" widget="many2many_tags"/>
+                <field name="property_ids" widget="many2many_tags" optional="hide"/>
                 <field name="evaluation_area"/>
                 <field name="assessment_category"/>
                 <field name="owner_id"/>
@@ -21,6 +20,8 @@
                 <field name="rent_id"/>
                 <field name="annual_increase_percentage"/>
                 <field name="remake"/>
+                <field name="state"/>
+                <button name="button_source" type="object" string="详情" class="btn btn-primary"/>
             </tree>
         </field>
     </record>
diff --git a/yuthon_property/views/property_water_reading_views.xml b/yuthon_property/views/property_water_reading_views.xml
index 2c4ac85a0..658bdbc92 100644
--- a/yuthon_property/views/property_water_reading_views.xml
+++ b/yuthon_property/views/property_water_reading_views.xml
@@ -9,7 +9,7 @@
                 <field name="position" optional="hide"/>
                 <field name="property_id"/>
                 <field name="lessee_id"/>
-                <field name="users_id" optional="hide"/>
+                <field name="users_id" optional="hide" widget="ztree_select"/>
                 <field name="state" optional="hide"/>
                 <field name="payment_account" optional="hide"/>
                 <field name="billing_period" optional="hide"/>
diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index dfdeba5de..ccedde9bf 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -9,6 +9,7 @@
                     <button name="put_merge_approval" string="合并" type="object" class="btn btn-primary"/>
                     <button name="put_property_handover" string="物业移交" type="object" class="btn btn-primary"/>
                     <button name="put_declare_approval" type="object" string="提交出租申报" class="btn btn-primary"/>
+                    <button name="all_assessment_approval" string="评估推送" type="object" class="btn btn-primary"/>
                 </header>
                 <field name="name" required="1"/>
                 <field name="title_deed"/>
@@ -16,6 +17,7 @@
                 <field name="rent_area" digits="[16, 4]"/>
                 <field name="equity_area" digits="[16, 4]"/>
                 <field name="state"/>
+                <field name="first_letter" column_invisible="1"/>
                 <button name="put_assessment_approval" type="object" string="评估推送" class="btn btn-primary" invisible="state == 'ing'"/>
                 <button name="put_split_approval" type="object" string="拆分" class="btn btn-primary" invisible="state != 'done'"/>
                 <button name="put_offline_approval" type="object" string="提交线下审批" class="btn btn-primary" invisible="state != 'done'"/>
@@ -367,11 +369,4 @@
         <field name="state">code</field>
         <field name="code">action = model.trigger_company_id()</field>
     </record>
-    <record id="all_data_update_assessment_approval" model="ir.actions.server">
-        <field name="name">批量评估推送</field>
-        <field name="model_id" ref="yuthon_property.model_yuthon_property"/>
-        <field name="binding_model_id" ref="yuthon_property.model_yuthon_property"/>
-        <field name="state">code</field>
-        <field name="code">action = model.all_assessment_approval()</field>
-    </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_property/wizard/__init__.py b/yuthon_property/wizard/__init__.py
index 7a60ed4bd..381b1b454 100644
--- a/yuthon_property/wizard/__init__.py
+++ b/yuthon_property/wizard/__init__.py
@@ -3,4 +3,4 @@ from . import property_meter_wizard
 from . import property_tenant_wizard
 from . import property_water_wizard
 from . import property_statements_wizard
-from . import rental_scheme_wizard
+from . import evaluation_plan_wizard
diff --git a/yuthon_property/wizard/evaluation_plan_wizard.py b/yuthon_property/wizard/evaluation_plan_wizard.py
new file mode 100644
index 000000000..c69d59be5
--- /dev/null
+++ b/yuthon_property/wizard/evaluation_plan_wizard.py
@@ -0,0 +1,32 @@
+from odoo import models, fields, api
+from odoo.exceptions import UserError, ValidationError
+
+
+class EvaluationPlanWizard(models.Model):
+    _name = 'evaluation.plan.wizard'
+    _description = '评估方案弹窗'
+
+    property_ids = fields.Many2many('yuthon.property', string='物业')
+
+    def confirm(self):
+        evaluation_area = 0
+        name_list = []
+        first_id = self.property_ids[0]
+        for i in self.property_ids:
+            name = i.name
+            name_list.append(name)
+            evaluation_area += i.evaluation_area
+        name = ','.join(name_list)
+        self.env['property.evaluation.plan'].create({
+            'name': name,
+            'assessment_category': 'rent_money',
+            'evaluation_area': evaluation_area,
+            'owner_id': first_id.title_information_ids[0].owner_id.id if first_id.title_information_ids else None,
+            'registered_id': first_id.title_information_ids[0].registered_id.id if first_id.title_information_ids else None,
+            'rent_id': first_id.reference_ids[0].rent_id.id if first_id.reference_ids else None,
+            'start_lease_period': first_id.reference_ids[0].start_lease_period if first_id.reference_ids else None,
+            'end_lease_period': first_id.reference_ids[0].end_lease_period if first_id.reference_ids else None,
+            'annual_increase_percentage': first_id.reference_ids[0].annual_increase_percentage if first_id.reference_ids else None,
+            'remake': first_id.remark,
+            'property_ids': self.property_ids.ids
+        })
\ No newline at end of file
diff --git a/yuthon_property/wizard/rental_scheme_wizard_views.xml b/yuthon_property/wizard/evaluation_plan_wizard_views.xml
similarity index 64%
rename from yuthon_property/wizard/rental_scheme_wizard_views.xml
rename to yuthon_property/wizard/evaluation_plan_wizard_views.xml
index fc01604b0..c63e389a2 100644
--- a/yuthon_property/wizard/rental_scheme_wizard_views.xml
+++ b/yuthon_property/wizard/evaluation_plan_wizard_views.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <record id="rental_scheme_wizard_form" model="ir.ui.view">
-        <field name="name">整租方案弹窗</field>
-        <field name="model">rental.scheme.wizard</field>
+    <record id="view_evaluation_plan_wizard_form" model="ir.ui.view">
+        <field name="name">evaluation.plan.wizard.form</field>
+        <field name="model">evaluation.plan.wizard</field>
         <field name="arch" type="xml">
-            <form string="整租方案弹窗">
+            <form>
                 <sheet>
                     <group>
-                        <field name="name"/>
-                        <field name="property_ids" widget="many2many_tags" invisible="1"/>
+                        <field name="property_ids" widget="many2many_tags" domain="[('state', '=', 'to')]"/>
                     </group>
                 </sheet>
                 <footer>
diff --git a/yuthon_property/wizard/rental_scheme_wizard.py b/yuthon_property/wizard/rental_scheme_wizard.py
deleted file mode 100644
index 79d3e5e60..000000000
--- a/yuthon_property/wizard/rental_scheme_wizard.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from odoo import models, fields, api, _, SUPERUSER_ID
-from odoo.exceptions import UserError, ValidationError
-from dateutil.relativedelta import relativedelta
-from datetime import datetime, time, timedelta
-
-class RentalSchemeWizard(models.Model):
-    _name = 'rental.scheme.wizard'
-    _description = '整租方案弹窗'
-
-    name = fields.Char(string='方案名称')
-    property_ids = fields.Many2many('property.evaluation.plan', string='关联物业备案申请')
-
-    def confirm(self):
-        evaluation_area = 0
-        all_property_ids = []
-        first_id = self.property_ids[0]
-        for record in self.property_ids:
-            evaluation_area += record.evaluation_area
-            all_property_ids += record.property_ids.ids
-        unique_property_ids = list(set(all_property_ids))
-        self.env['property.evaluation.plan'].create({
-            'name': self.name,
-            'evaluation_area': evaluation_area,
-            'assessment_category': first_id.assessment_category,
-            'owner_id': first_id.owner_id.id if first_id.owner_id else False,
-            'registered_id': first_id.registered_id.id if first_id.registered_id else False,
-            'registered_id2': first_id.registered_id2.id if first_id.registered_id2 else False,
-            'rent_id': first_id.rent_id.id if first_id.rent_id else False,
-            'start_lease_period': first_id.start_lease_period,
-            'end_lease_period': first_id.end_lease_period,
-            'annual_increase_percentage': first_id.annual_increase_percentage,
-            'is_pust': first_id.is_pust,
-            'remake': first_id.remake,
-            'property_ids': [(6, 0, unique_property_ids)]
-        })
\ No newline at end of file
diff --git a/yuthon_property_approval/models/property_evaluate_application.py b/yuthon_property_approval/models/property_evaluate_application.py
index 1eb5aaeaf..bccb5284e 100644
--- a/yuthon_property_approval/models/property_evaluate_application.py
+++ b/yuthon_property_approval/models/property_evaluate_application.py
@@ -20,13 +20,10 @@ class PropertyEvaluateApplication(models.Model):
     related_issues_id = fields.Many2one('issue.library', string="关联议题")
     is_experts = fields.Boolean(string="是否需要专家评审")
     notice_documents_ids = fields.Many2many('ir.attachment', string='议题附件')
-    evaluate_application_ids = fields.One2many('evaluate.application.line', 'property_message_id', string='楼盘信息明细行')
     property_ids = fields.One2many('yuthon.property.line', 'property_message_id' ,string='物业信息明细行')
     urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
                                      default='normal')
     active = fields.Boolean('Active', default=True, tracking=True)
-    is_premises = fields.Boolean(string="楼盘选择")
-    is_property = fields.Boolean(string='物业选择')
     evaluation_company_id = fields.Many2one('evaluation.company', string='公司')
     quote = fields.Float(string='报价')
     service_money = fields.Float(string='评估服务费总额')
@@ -79,46 +76,13 @@ class PropertyEvaluateApplication(models.Model):
             })
 
 
-class EvaluateApplicationLine(models.Model):
-    _name = 'evaluate.application.line'
-    _description = '楼盘信息明细行'
-
-    property_message_id = fields.Many2one('property.evaluate.application', string='关联评估申请')
-    premises_id = fields.Many2one('yuthon.premises.setting', string="楼盘")
-    owner_id = fields.Many2one('yuthon.owner.message', string="权属人")
-    assessment_category = fields.Selection([('rent_money', '租金'), ('value', '价值')], string="评估类别")
-    registered_id = fields.Many2one('yuthon.purpose.evidence', string='证载用途')
-    registered_id2 = fields.Many2one('yuthon.purpose.evidence', string='设定用途')
-    purpose_id = fields.Many2one('yuthon.resource.purpose', string="管理类型")
-    rent_id = fields.Many2one('rent.free.setting', string="办法")
-    start_lease_period = fields.Selection(selection=[(str(i), str(i)) for i in range(1, 7)], string='租期开始', default='1')
-    end_lease_period = fields.Selection(selection=[(str(i), str(i)) for i in range(1, 7)], string='租期结束', default='6')
-    annual_increase_percentage = fields.Float(string='每年递增(%)', igits=(6, 2))
-    rental_conditions = fields.Text(string='出租条件')
-    evaluation_area = fields.Float(string='评估面积（m²）')
-    remarks = fields.Text(string='备注')
-    property_floor_id = fields.Many2one('property.floor.setting', string="楼层")
-
-    def application_detail(self):
-        domain = [('state', '=', 'to')]
-        domain.append(('premises_id', '=', self.premises_id.id))
-        if self.property_floor_id:
-            domain.append(('property_floor_id', '=', self.property_floor_id.id))
-        return {
-            "name": _("物业"),
-            "type": "ir.actions.act_window",
-            "view_mode": "tree",
-            "res_model": "yuthon.property",
-            "target": "new",  # 使动作以弹窗形式打开
-            "domain": domain,
-        }
-
 class YuhtonPropertyLine(models.Model):
     _name = 'yuthon.property.line'
     _description = '物业信息评估明细'
 
     property_message_id = fields.Many2one('property.evaluate.application', string='关联评估申请')
     property_evaluation_id = fields.Many2one('property.evaluation.plan', string="关联物业评估方案")
+    property_ids = fields.Many2many(related='property_evaluation_id.property_ids',  string="物业信息")
     owner_id = fields.Many2one('yuthon.owner.message', related='property_evaluation_id.owner_id', string="权属人")
     assessment_category = fields.Selection(related='property_evaluation_id.assessment_category', string="评估类别")
     start_lease_period = fields.Selection(related='property_evaluation_id.start_lease_period', string='租期开始')
@@ -131,41 +95,16 @@ class YuhtonPropertyLine(models.Model):
     rent_id = fields.Many2one('rent.free.setting', string="办法")
     remarks = fields.Text(related='property_evaluation_id.remake', string='备注')
 
-    def set_property_state_to_ing(self):
-        domain = [('state', '=', 'to')]
-        domain.append(('premises_id', '=', self.premises_id.id))
-        if self.property_floor_id:
-            domain.append(('property_floor_id', '=', self.property_floor_id.id))
-        property_ids = self.env['yuthon.property'].search(domain)
-        for property in property_ids:
-            property.write({'state': 'ing'})
+    def application_detail(self):
+        return {
+            "name": "物业",
+            "type": "ir.actions.act_window",
+            "view_mode": "tree",
+            "res_model": "yuthon.property",
+            "target": "new",
+            "domain": [('id', 'in', self.property_ids.ids)],
+        }
 
-    # @api.depends('property_id.title_information_ids')
-    # def _compute_registered_id(self):
-    #     for record in self:
-    #         record.registered_id = record.property_id.title_information_ids[0].registered_id if record.property_id.title_information_ids else None
-    #
-    # @api.depends('property_id.title_information_ids')
-    # def _compute_owner_id(self):
-    #     for record in self:
-    #         record.owner_id = record.property_id.title_information_ids[0].owner_id if record.property_id.title_information_ids else None
-    #
-    # @api.depends('property_id.reference_ids')
-    # def _compute_rent_id(self):
-    #     for record in self:
-    #         record.rent_id = record.property_id.reference_ids[0].rent_id if record.property_id.reference_ids else None
-    #
-    # @api.depends('property_id.reference_ids')
-    # def _compute_start_lease_period(self):
-    #     for record in self:
-    #         record.start_lease_period = record.property_id.reference_ids[0].start_lease_period if record.property_id.reference_ids else None
-    #
-    # @api.depends('property_id.reference_ids')
-    # def _compute_end_lease_period(self):
-    #     for record in self:
-    #         record.end_lease_period = record.property_id.reference_ids[0].end_lease_period if record.property_id.reference_ids else None
-    #
-    # @api.depends('property_id.reference_ids')
-    # def _compute_annual_increase_percentage(self):
-    #     for record in self:
-    #         record.annual_increase_percentage = record.property_id.reference_ids[0].annual_increase_percentage if record.property_id.reference_ids else None
\ No newline at end of file
+
+class EvaluateApplicationLine(models.Model):
+    _name = 'evaluate.application.line'
\ No newline at end of file
diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py
index 3fb501572..a702fafdf 100644
--- a/yuthon_property_approval/models/property_lease_contract.py
+++ b/yuthon_property_approval/models/property_lease_contract.py
@@ -1167,12 +1167,20 @@ class PropertyLeaseContract(models.Model):
                 'assessment_category': 'rent_money',
             })
             record.write({'state': 'ing'})
+        return {
+            "name": "物业评估方案",
+            'type': 'ir.actions.act_window',
+            'res_model': 'property.evaluation.plan',
+            "view_mode": "tree",
+        }
 
     def all_put_evaluation_plan(self):
         contract_ids = self.env["property.lease.contract"].browse(self._context.get('active_ids', self._context.get('active_id')))
         for record in contract_ids:
             property_ids = []
             property_id = record.lease_ids[0].address_id
+            if record.state == 'done':
+                raise UserError(f'{record.name}该物业已评估，请勿重复评估')
             for lease_id in record.lease_ids:
                 property_ids.append(lease_id.address_id.id)
             self.env['property.evaluation.plan'].create({
@@ -1189,6 +1197,12 @@ class PropertyLeaseContract(models.Model):
                 'assessment_category': 'rent_money',
             })
             record.write({'state': 'ing'})
+        return {
+            "name": "物业评估方案",
+            'type': 'ir.actions.act_window',
+            'res_model': 'property.evaluation.plan',
+            "view_mode": "tree",
+        }
 
 class PropertyLeaseContractLine(models.Model):
     _name = 'property.lease.contract.line'
diff --git a/yuthon_property_approval/security/ir.model.access.csv b/yuthon_property_approval/security/ir.model.access.csv
index 2b0142db8..7760c2570 100644
--- a/yuthon_property_approval/security/ir.model.access.csv
+++ b/yuthon_property_approval/security/ir.model.access.csv
@@ -42,7 +42,6 @@ access_property_approval,property_approval,model_property_approval,base.group_us
 access_property_approval_line,property_approval_line,model_property_approval_line,base.group_user,1,1,1,1
 access_property_handover,property_handover,model_property_handover,base.group_user,1,1,1,1
 access_property_handover_line,property_handover_line,model_property_handover_line,base.group_user,1,1,1,1
-access_evaluate_application_line,evaluate_application_line,model_evaluate_application_line,base.group_user,1,1,1,1
 access_property_rental_form,property_rental_form,model_property_rental_form,base.group_user,1,1,1,1
 access_property_offline_registration,property_offline_registration,model_property_offline_registration,base.group_user,1,1,1,1
 access_quote_message_line,quote_message_line,model_quote_message_line,base.group_user,1,1,1,1
diff --git a/yuthon_property_approval/views/perperty_claim_approval_views.xml b/yuthon_property_approval/views/perperty_claim_approval_views.xml
index 908d2a656..9c9f78fbc 100644
--- a/yuthon_property_approval/views/perperty_claim_approval_views.xml
+++ b/yuthon_property_approval/views/perperty_claim_approval_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree string="业务报销审批">
                 <field name="name"/>
-                <field name="users_id"/>
+                <field name="users_id" widget="ztree_select"/>
                 <field name="total_received"/>
             </tree>
         </field>
@@ -40,7 +40,7 @@
                 <group string="审批事项">
                     <field name="work_end" invisible="1"/>
                     <field name="name"/>
-                    <field name="users_id"/>
+                    <field name="users_id" widget="ztree_select"/>
                     <field name="department_id"/>
                     <field name="reason"/>
                     <field name="total_received"/>
diff --git a/yuthon_property_approval/views/property_borrowing_approval_views.xml b/yuthon_property_approval/views/property_borrowing_approval_views.xml
index d828eae50..4fb71330e 100644
--- a/yuthon_property_approval/views/property_borrowing_approval_views.xml
+++ b/yuthon_property_approval/views/property_borrowing_approval_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree string="借支审批">
                 <field name="name"/>
-                <field name="users_id"/>
+                <field name="users_id" widget="ztree_select"/>
                 <field name="total_received"/>
                 <field name="trade_date"/>
             </tree>
@@ -41,7 +41,7 @@
                     <group string="审批事项">
                         <field name="work_end" invisible="1"/>
                         <field name="name"/>
-                        <field name="users_id"/>
+                        <field name="users_id" widget="ztree_select"/>
                         <field name="department_id"/>
                         <field name="reason"/>
                         <field name="total_received"/>
diff --git a/yuthon_property_approval/views/property_eligibility.xml b/yuthon_property_approval/views/property_eligibility.xml
index da517fea9..010d31163 100644
--- a/yuthon_property_approval/views/property_eligibility.xml
+++ b/yuthon_property_approval/views/property_eligibility.xml
@@ -49,7 +49,7 @@
                         <field name="notice_documents_ids" widget="preview_many2many"/>
                     </group>
                     <group string="个人信息">
-                        <field name="users_id"/>
+                        <field name="users_id" widget="ztree_select"/>
                         <field name="department_id"/>
                         <field name="sincerity_gold"/>
                     </group>
diff --git a/yuthon_property_approval/views/property_evaluate_application_views.xml b/yuthon_property_approval/views/property_evaluate_application_views.xml
index dc5732fab..f95b1e1b8 100644
--- a/yuthon_property_approval/views/property_evaluate_application_views.xml
+++ b/yuthon_property_approval/views/property_evaluate_application_views.xml
@@ -55,54 +55,26 @@
                         <field name="pay_way"/>
                         <field name="is_experts"/>
                     </group>
-                    <group col="2">
-                        <group>
-                            <field name="is_premises"/>
-                        </group>
-                        <group>
-                            <field name="is_property"/>
-                        </group>
-                    </group>
                     <notebook>
                         <page string="待评估物业出租方案明细表">
-                            <group invisible="not is_premises">
-                                <field name="evaluate_application_ids" string=" ">
-                                    <tree editable="bottom">
-                                        <field name="property_message_id" column_invisible="1"/>
-                                        <field name="premises_id" required="1" class="list_width"/>
-                                        <field name="property_floor_id" domain="[('premises_ids', 'in', premises_id)]" class="list_width"/>
-                                        <field name="evaluation_area" string="评估面积m²"/>
-                                        <field name="assessment_category" string="评估类别"/>
-                                        <field name="owner_id"/>
-                                        <field name="registered_id"/>
-                                        <field name="registered_id2"/>
-                                        <field name="start_lease_period"/>
-                                        <field name="end_lease_period"/>
-                                        <field name="annual_increase_percentage"/>
-                                        <field name="rent_id" string="办法"/>
-                                        <field name="remarks" string="备注"/>
-                                        <button name="application_detail" string="详情" type="object" class="btn-primary"/>
-                                    </tree>
-                                </field>
-                            </group>
-                            <group invisible="not is_property">
-                                <field name="property_ids" string=" ">
-                                    <tree editable="bottom">
-                                        <field name="property_message_id" column_invisible="1"/>
-                                        <field name="property_evaluation_id" class="list_width"/>
-                                        <field name="evaluation_area"/>
-                                        <field name="assessment_category"/>
-                                        <field name="owner_id"/>
-                                        <field name="registered_id"/>
-                                        <field name="registered_id2"/>
-                                        <field name="start_lease_period"/>
-                                        <field name="end_lease_period"/>
-                                        <field name="annual_increase_percentage"/>
-                                        <field name="rent_id" string="办法"/>
-                                        <field name="remarks" string="备注"/>
-                                    </tree>
-                                </field>
-                            </group>
+                            <field name="property_ids">
+                                <tree editable="bottom">
+                                    <field name="property_message_id" column_invisible="1"/>
+                                    <field name="property_evaluation_id" class="list_width" string="物业"/>
+                                    <field name="property_ids" widget="many2many_tags" optional="hide"/>
+                                    <field name="evaluation_area"/>
+                                    <field name="assessment_category"/>
+                                    <field name="owner_id"/>
+                                    <field name="registered_id"/>
+                                    <field name="registered_id2"/>
+                                    <field name="start_lease_period"/>
+                                    <field name="end_lease_period"/>
+                                    <field name="annual_increase_percentage"/>
+                                    <field name="rent_id" string="办法"/>
+                                    <field name="remarks" string="备注"/>
+                                    <button name="application_detail" string="详情" type="object" class="btn-primary"/>
+                                </tree>
+                            </field>
                         </page>
                     </notebook>
                 </sheet>
diff --git a/yuthon_property_approval/views/property_intention_views.xml b/yuthon_property_approval/views/property_intention_views.xml
index b383137d1..77faee19f 100644
--- a/yuthon_property_approval/views/property_intention_views.xml
+++ b/yuthon_property_approval/views/property_intention_views.xml
@@ -7,7 +7,7 @@
             <tree>
                 <field name="name"/>
                 <field name="code"/>
-                <field name="users_id"/>
+                <field name="users_id" widget="ztree_select"/>
             </tree>
         </field>
     </record>
@@ -50,7 +50,7 @@
                         <field name="notice_documents_ids" widget="preview_many2many"/>
                     </group>
                     <group string="个人信息">
-                        <field name="users_id"/>
+                        <field name="users_id" widget="ztree_select"/>
                         <field name="department_id"/>
                     </group>
                      <notebook>
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 37414aa8f..79d47fea4 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -329,6 +329,9 @@
         <field name="model">property.lease.contract</field>
         <field name="arch" type="xml">
             <tree string="租赁合同审批">
+                 <header>
+                    <button name="all_put_evaluation_plan" string="评估推送" type="object" class="btn btn-primary"/>
+                 </header>
                 <field name="name"/>
                 <field name="contract_code" decoration-danger = "is_equal"/>
                 <field name="lessee_id"/>
@@ -765,11 +768,4 @@
         <field name="state">code</field>
         <field name="code">action = model.action_update_contract()</field>
     </record>
-    <record id="all_data_action_evaluation_plan" model="ir.actions.server">
-        <field name="name">批量评估推送</field>
-        <field name="model_id" ref="yuthon_property_approval.model_property_lease_contract"/>
-        <field name="binding_model_id" ref="yuthon_property_approval.model_property_lease_contract"/>
-        <field name="state">code</field>
-        <field name="code">action = model.all_put_evaluation_plan()</field>
-    </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_property_approval/views/property_transfer_views.xml b/yuthon_property_approval/views/property_transfer_views.xml
index 2bde923da..1070d290d 100644
--- a/yuthon_property_approval/views/property_transfer_views.xml
+++ b/yuthon_property_approval/views/property_transfer_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree string="物业移交">
                 <field name="name"/>
-                <field name="users_id"/>
+                <field name="users_id" widget="ztree_select"/>
                 <field name="start_date"/>
                 <field name="end_date"/>
             </tree>
diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml
index fdc77993a..444bbd389 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -171,7 +171,7 @@
         <field name="model">hr.payslip</field>
         <field name="arch" type="xml">
             <tree string="薪资计算" default_order="employee_id" js_class="custom_salary_button" editable="bottom">
-                <field name="employee_id" string="姓名"/>
+                <field name="employee_id" string="姓名" widget="ztree_select"/>
                 <field name="total_before_tax" decoration-danger="1" decoration-bf="1"/>
                 <field name="company_id" optional="hide" required="1"/>
                 <field name="base_salary"/>
@@ -211,7 +211,7 @@
         <field name="model">hr.payslip</field>
         <field name="arch" type="xml">
             <tree string="个税计算" default_order="employee_id" js_class="custom_salary_payslip_button">
-                <field name="employee_id" string="姓名"/>
+                <field name="employee_id" string="姓名" widget="ztree_select"/>
                 <field name="tax_payable" decoration-danger="1" decoration-bf="1"/>
                 <field name="struct_id" string="职级"/>
                 <field name="post_salary"/>
diff --git a/yuthon_salary/views/yuthon_payroll_project_views.xml b/yuthon_salary/views/yuthon_payroll_project_views.xml
index 441e10a58..045faca14 100644
--- a/yuthon_salary/views/yuthon_payroll_project_views.xml
+++ b/yuthon_salary/views/yuthon_payroll_project_views.xml
@@ -10,7 +10,7 @@
                 <field name="company_id" required="1" optional="hide"/>
                 <field name="before_tax"/>
                 <field name="attributes"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="conditional_formulas"/>
                 <field name="payroll_type_ids" widget="many2many_tags" domain="[('company_id', '=' ,company_id)]"/>
                 <field name="payroll_structure_ids" widget="many2many_tags" column_invisible="1"/>
@@ -40,7 +40,7 @@
                 <field name="name"/>
                 <field name="company_id" required="1" optional="hide"/>
                 <field name="attributes"/>
-                <field name="department_id"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="is_before_tax"/>
                 <field name="start_date"/>
                 <field name="end_date"/>
diff --git a/yuthon_sps_approval/views/yuthon_office_supplies_views.xml b/yuthon_sps_approval/views/yuthon_office_supplies_views.xml
index 10d1828f1..2e03343c6 100644
--- a/yuthon_sps_approval/views/yuthon_office_supplies_views.xml
+++ b/yuthon_sps_approval/views/yuthon_office_supplies_views.xml
@@ -6,8 +6,8 @@
         <field name="arch" type="xml">
             <tree string="办公用品申请">
                 <field name="name"/>
-                <field name="users_id"/>
-                <field name="department_id"/>
+                <field name="users_id" widget="ztree_select"/>
+                <field name="department_id" widget="ztree_select"/>
                 <field name="date"/>
             </tree>
         </field>
@@ -29,12 +29,12 @@
                     </group>
                     <group string="申请人信息" col="3">
                         <group>
-                            <field name="users_id"/>
+                            <field name="users_id" widget="ztree_select"/>
                             <field name="is_issues"/>
                             <field name="related_issues_id" invisible="not is_issues"/>
                         </group>
                         <group>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                             <field name="office_supplies_id"/>
                         </group>
                     </group>
diff --git a/yuthon_trade/views/yuthon_care_condolences_views.xml b/yuthon_trade/views/yuthon_care_condolences_views.xml
index d4b6ca211..0fa20610f 100644
--- a/yuthon_trade/views/yuthon_care_condolences_views.xml
+++ b/yuthon_trade/views/yuthon_care_condolences_views.xml
@@ -23,7 +23,7 @@
                     <group string="审批事项">
                         <field name="work_end" invisible="1"/>
                         <field name="name"/>
-                        <field name="users_id"/>
+                        <field name="users_id" widget="ztree_select"/>
                         <field name="reason"/>
                     </group>
                     <group string="个人信息">
diff --git a/yuthon_trade/views/yuthon_message_approval_views.xml b/yuthon_trade/views/yuthon_message_approval_views.xml
index 375c6c52a..41afd51a7 100644
--- a/yuthon_trade/views/yuthon_message_approval_views.xml
+++ b/yuthon_trade/views/yuthon_message_approval_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree string="信息发布审批">
                 <field name="name"/>
-                <field name="users_id"/>
+                <field name="users_id" widget="ztree_select"/>
                 <field name="publish_ids" widget="many2many_tags"/>
             </tree>
         </field>
@@ -46,8 +46,8 @@
                         </group>
                     </group>
                     <group string="基础信息">
-                        <field name="users_id"/>
-                        <field name="department_id"/>
+                        <field name="users_id" widget="ztree_select"/>
+                        <field name="department_id" widget="ztree_select"/>
                         <field name="phone"/>
                     </group>
                     <group string="发布设置">
diff --git a/yuthon_trade/views/yuthon_trade_activities.xml b/yuthon_trade/views/yuthon_trade_activities.xml
index 99a83f504..dfaa6e3d4 100644
--- a/yuthon_trade/views/yuthon_trade_activities.xml
+++ b/yuthon_trade/views/yuthon_trade_activities.xml
@@ -21,14 +21,14 @@
                     </group>
                     <group col="3">
                         <group>
-                            <field name="users_id"/>
+                            <field name="users_id" widget="ztree_select"/>
                             <field name="host_id"/>
                         </group>
                         <group>
                             <field name="joint_office_ids" widget="many2many_tags"/>
                         </group>
                         <group>
-                            <field name="department_id"/>
+                            <field name="department_id" widget="ztree_select"/>
                         </group>
                     </group>
                     <group>
diff --git a/yuthon_trade/views/yuthon_trade_premium.xml b/yuthon_trade/views/yuthon_trade_premium.xml
index 45cdeba6f..58edec9db 100644
--- a/yuthon_trade/views/yuthon_trade_premium.xml
+++ b/yuthon_trade/views/yuthon_trade_premium.xml
@@ -39,14 +39,14 @@
                     <group string="审批事项">
                         <group>
                             <field name="name"/>
-                            <field name="users_id"/>
+                            <field name="users_id" widget="ztree_select"/>
                             <field name="department_id" invisbiel="1"/>
                             <field name="documents_ids" widget="preview_many2many"/>
                         </group>
                     </group>
                     <group>
                         <field name="insurance_id"/>
-                        <field name="employee_id"/>
+                        <field name="employee_id" widget="ztree_select"/>
                         <field name="fee"/>
                         <field name="trade_date"/>
                     </group>