From 808f57adfb1d04166e1eeade38eb8146b96d9864 Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Fri, 14 Jul 2023 15:01:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=A8=A1=E5=9E=8B=E6=96=B0=E5=A2=9E=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=97=A5=E5=8E=86=E6=8C=89=E9=94=AE=EF=BC=8C=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_plan_management/models/base.py           |  2 +-
 sf_plan_management/models/calendar_base.py  |  7 +++++++
 sf_plan_management/views/menu_view.xml      | 12 ++++++------
 sf_plan_management/views/plan_base_view.xml |  6 +++++-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/sf_plan_management/models/base.py b/sf_plan_management/models/base.py
index 57df9566..ca6e4693 100644
--- a/sf_plan_management/models/base.py
+++ b/sf_plan_management/models/base.py
@@ -36,7 +36,7 @@ class ProcedureEquipmentResourceSetting(models.Model):
     @api.depends('work_center_name_id')
     def _onchange_work_center_name_id(self):
         for record in self:
-            record.equipment_name_id = record.work_center_name_id.equipment_ids
+            record.equipment_name_id = record.work_center_name_id.equipment_id
 
     @api.onchange('equipment_name_id')
     def _onchange_equipment_name_id(self):
diff --git a/sf_plan_management/models/calendar_base.py b/sf_plan_management/models/calendar_base.py
index 6304d2e1..99e5f070 100644
--- a/sf_plan_management/models/calendar_base.py
+++ b/sf_plan_management/models/calendar_base.py
@@ -184,6 +184,7 @@ class WorkLogSetting(models.Model):
                     'name_id': self.id,
                     'calendar_code': self.code,
                     'date_time': single_date})
+
     @staticmethod
     def daterange(start_date, end_date):
         """
@@ -193,6 +194,12 @@ class WorkLogSetting(models.Model):
         for n in range(int((end_date - start_date).days)):
             yield start_date + timedelta(n)
 
+    def open_work_schedule_calendar(self):
+        action = self.env.ref('sf_plan_management.sf_work_schedule_calendar_act')
+        result = action.read()[0]
+        result['domain'] = [('name_id', '=', self.id)]
+        return result
+
 
 class WorkingShift(models.Model):
     _name = 'sf.working.shift'
diff --git a/sf_plan_management/views/menu_view.xml b/sf_plan_management/views/menu_view.xml
index 793f381d..e50f6fa9 100644
--- a/sf_plan_management/views/menu_view.xml
+++ b/sf_plan_management/views/menu_view.xml
@@ -40,10 +40,10 @@
               sequence="15"
     />
 
-    <menuitem id="menu_sf_work_schedule_calendar"
-              name="工作日历"
-              parent="menu_sf_basic_setting"
-              action="sf_work_schedule_calendar_act"
-              sequence="15"
-    />
+<!--    <menuitem id="menu_sf_work_schedule_calendar"-->
+<!--              name="工作日历"-->
+<!--              parent="menu_sf_basic_setting"-->
+<!--              action="sf_work_schedule_calendar_act"-->
+<!--              sequence="15"-->
+<!--    />-->
 </odoo>
\ No newline at end of file
diff --git a/sf_plan_management/views/plan_base_view.xml b/sf_plan_management/views/plan_base_view.xml
index 16e25874..a10ccf89 100644
--- a/sf_plan_management/views/plan_base_view.xml
+++ b/sf_plan_management/views/plan_base_view.xml
@@ -16,7 +16,11 @@
                 <field name="status"/>
                 <field name="update_person"/>
                 <field name="update_time"/>
-<!--                <button string="查看日历" type="object" name="sf_work_schedule_calendar_act"/>-->
+                <button string="查看日历"
+                        type="object"
+                        name="open_work_schedule_calendar"
+                        class="oe_highlight"
+                />
             </tree>
         </field>
     </record>