完成计划权限，优化警告错误

2023-11-29 20:58:12 +08:00
parent ca0b59e95b
commit 2cf4958f46
4 changed files with 89 additions and 13 deletions
--- a/sf_plan_management/models/base.py
+++ b/sf_plan_management/models/base.py
@@ -23,6 +23,21 @@ class ProcedureEquipmentResourceSetting(models.Model):
    create_time = fields.Datetime(string='新增时间', default=lambda self: fields.Datetime.now(), readonly=True)
    participate_in_scheduling = fields.Boolean(string='参与排程', default=True)

+    # check_status = fields.Selection([('unchecked', '未审核'), ('checked', '已审核')], '审核状态', default='unchecked')
+    check_status = fields.Boolean(string='启用状态', default=False, readonly=True)
+
+    def action_check(self):
+        """
+        审核启用
+        """
+        self.check_status = True
+
+    def action_uncheck(self):
+        """
+        审核禁用
+        """
+        self.check_status = False
+
    @api.depends('work_center_name_id')
    def _compute_equipment_name_id(self):
        for record in self:
--- a/sf_plan_management/models/calendar_base.py
+++ b/sf_plan_management/models/calendar_base.py
@@ -38,6 +38,19 @@ class WorkLogSetting(models.Model):
    update_time = fields.Datetime(string='更新时间', default=lambda self: fields.Datetime.now())

    setting_to_calendar_ids = fields.One2many('sf.work.schedule.calendar', 'name_id', '工作日历')
+    check_status = fields.Boolean(string='启用状态', default=False, readonly=True)
+
+    def action_check(self):
+        """
+        审核启用
+        """
+        self.check_status = True
+
+    def action_uncheck(self):
+        """
+        审核禁用
+        """
+        self.check_status = False

    @api.depends('working_shift_ids')
    def _compute_working_shift_ids(self):
@@ -157,13 +170,13 @@ class WorkLogSetting(models.Model):
        :return:
        """
        weekdays = {
-            '星期一': 'Monday',    'Monday': 'Monday',
-            '星期二': 'Tuesday',   'Tuesday': 'Tuesday',
+            '星期一': 'Monday', 'Monday': 'Monday',
+            '星期二': 'Tuesday', 'Tuesday': 'Tuesday',
            '星期三': 'Wednesday', 'Wednesday': 'Wednesday',
-            '星期四': 'Thursday',  'Thursday': 'Thursday',
-            '星期五': 'Friday',    'Friday': 'Friday',
-            '星期六': 'Saturday',  'Saturday': 'Saturday',
-            '星期日': 'Sunday',    'Sunday': 'Sunday',
+            '星期四': 'Thursday', 'Thursday': 'Thursday',
+            '星期五': 'Friday', 'Friday': 'Friday',
+            '星期六': 'Saturday', 'Saturday': 'Saturday',
+            '星期日': 'Sunday', 'Sunday': 'Sunday',
        }
        english_weekdays = []
        for chinese_weekday in chinese_weekdays:
@@ -179,13 +192,13 @@ class WorkLogSetting(models.Model):
        :return:
        """
        weekdays = {
-            '星期一': 'Monday',    'Monday': 'Monday',
-            '星期二': 'Tuesday',   'Tuesday': 'Tuesday',
+            '星期一': 'Monday', 'Monday': 'Monday',
+            '星期二': 'Tuesday', 'Tuesday': 'Tuesday',
            '星期三': 'Wednesday', 'Wednesday': 'Wednesday',
-            '星期四': 'Thursday',  'Thursday': 'Thursday',
-            '星期五': 'Friday',    'Friday': 'Friday',
-            '星期六': 'Saturday',  'Saturday': 'Saturday',
-            '星期日': 'Sunday',    'Sunday': 'Sunday',
+            '星期四': 'Thursday', 'Thursday': 'Thursday',
+            '星期五': 'Friday', 'Friday': 'Friday',
+            '星期六': 'Saturday', 'Saturday': 'Saturday',
+            '星期日': 'Sunday', 'Sunday': 'Sunday',
        }
        weekday = weekdays.get(chinese_weekday)
        if weekday:
@@ -233,6 +246,19 @@ class WorkingShift(models.Model):
    start_time = fields.Datetime('班次开始时间')
    end_time = fields.Datetime('班次结束时间')
    remark = fields.Char('备注')
+    check_status = fields.Boolean(string='启用状态', default=False, readonly=True)
+
+    def action_check(self):
+        """
+        审核启用
+        """
+        self.check_status = True
+
+    def action_uncheck(self):
+        """
+        审核禁用
+        """
+        self.check_status = False


 class DayOff(models.Model):
@@ -247,6 +273,19 @@ class DayOff(models.Model):
        ('Friday ', '星期五'),
        ('Saturday ', '星期六'),
        ('Sunday ', '星期日')], '休息日名称')
+    check_status = fields.Boolean(string='启用状态', default=False, readonly=True)
+
+    def action_check(self):
+        """
+        审核启用
+        """
+        self.check_status = True
+
+    def action_uncheck(self):
+        """
+        审核禁用
+        """
+        self.check_status = False


 class WorkScheduleCalendar(models.Model):
--- a/sf_plan_management/views/plan_base_view.xml
+++ b/sf_plan_management/views/plan_base_view.xml
@@ -16,6 +16,10 @@
                <field name="status"/>
                <field name="update_person"/>
                <field name="update_time"/>
+
+                <field name="check_status" widget="boolean_toggle"/>
+                <button name="action_check" string="启用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
+                <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/>
                <button string="查看日历"
                        type="object"
                        name="open_work_schedule_calendar"
@@ -46,6 +50,8 @@
                    </div>
                    <group>
                        <group>
+
+                            <field name="check_status" widget="boolean_toggle"/>
                            <field name="code"/>
                            <field name="day_off_ids" widget="many2many_tags" placeholder="请选择"
                                   options="{'no_create': True, 'no_quick_create': True}"/>
@@ -82,6 +88,9 @@
        <field name="arch" type="xml">
            <tree string="休息日" editable="bottom" delete="0">
                <field name="name"/>
+                <field name="check_status" widget="boolean_toggle"/>
+                <button name="action_check" string="启用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
+                <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/>
            </tree>
        </field>
    </record>
@@ -104,6 +113,9 @@
                <field name="start_time" placeholder="请选择"/>
                <field name="end_time" placeholder="请选择"/>
                <field name="remark"/>
+                <field name="check_status" widget="boolean_toggle"/>
+                <button name="action_check" string="启用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
+                <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/>
            </tree>
        </field>
    </record>
@@ -221,6 +233,10 @@
                <field name="status"/>
                <field name="participate_in_scheduling"/>
                <field name="name" invisible="True"/>
+
+                <field name="check_status" widget="boolean_toggle"/>
+                <button name="action_check" string="启用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
+                <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/>
            </tree>
        </field>
    </record>
@@ -230,6 +246,10 @@
        <field name="model">sf.procedure.equipment.resource.setting</field>
        <field name="arch" type="xml">
            <form string="产线设备资源设置">
+                <header>
+                    <button name="action_check" string="启用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
+                    <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/>
+                </header>
                <sheet>
                    <div>
                        <h1>
@@ -238,6 +258,8 @@
                    </div>
                    <group>
                        <group>
+
+                            <field name="check_status" widget="boolean_toggle"/>
                            <field name="work_center_name_id" placeholder="请选择"/>
                            <field name="production_capacity"/>
                            <field name="working_calendar_id" placeholder="请选择"/>