!3266 添加功能

Merge pull request !3266 from 李鹏宇/dev_zhou

soong_workflow/models/soong_workflow_inspector.py

@@ -25,7 +25,7 @@ class SoongWorkflowInspector(models.Model):
     inspector_result = fields.Text(string="完成情况")
     remarks = fields.Text(string='备注')
     document_ids = fields.Many2many('ir.attachment', string="附件")
-    inspector_document_id = fields.Many2one('ir.attachment', string="督办附件")
+    inspector_document_id = fields.Many2one('ir.attachment', string="归档附件")
     urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
                                      default='normal')
     inspector_line_ids = fields.One2many('soong.workflow.inspector.line', 'workflow_inspector_id', string='任务进度')

soong_workflow/views/soong_workflow_inspector_views.xml

@@ -7,7 +7,7 @@
             <tree>
                 <field name="name"/>
                 <field name="code"/>
-                <field name="department_id" widget="ztree_select"/>
+                <field name="department_id"/>
                 <field name="start_data"/>
                 <field name="end_data"/>
             </tree>
@@ -51,7 +51,7 @@
                     <group>
                         <field name="inspector_html"/>
                         <field name="inspector_text"/>
-                        <field name="department_ids" widget="many2many_tags"/>
+                        <field name="department_ids"/>
                         <field name="inspector_result"/>
                         <field name="end_data"/>
                         <field name="remarks"/>

yuthon_hr_attendance/models/hr_attendance.py

@@ -21,8 +21,13 @@ class HrAttendance(models.Model):
     is_early_card = fields.Boolean(string="早退", group_operator='count_true')
     is_late_card = fields.Boolean(string="迟到", group_operator='count_true')
     is_abnormal = fields.Boolean(string="异常", group_operator='count_true')
+    is_approval_no = fields.Boolean()
+    is_approval_early = fields.Boolean()
+    is_approval_late = fields.Boolean()
+    is_approval_abnormal = fields.Boolean()
     user_id = fields.Many2one(related='employee_id.user_id', store=True)
     absenteeism_card = fields.Boolean(string="旷工", group_operator='count_true')
+    is_approval_abs = fields.Boolean()
     work_time_type = fields.Selection([('close_day', '休息日'), ('work_day', '工作日')], string="工作时间类型")
     company_id = fields.Many2one(related='employee_id.company_id', string='公司', index=True, store=True)
     on_card_location = fields.Char(string="上班打卡地点")
@@ -189,11 +194,22 @@ class HrAttendance(models.Model):
 
     def revoke(self):
         self.check_in = self.approval_check_in
-        self.check_in = self.approval_check_out
+        self.check_out = self.approval_check_out
+        self.is_no_card = self.is_approval_no
+        self.is_early_card = self.is_approval_early
+        self.is_late_card = self.is_approval_late
+        self.is_abnormal = self.is_approval_abnormal
+        self.absenteeism_card =  self.is_approval_abs
+        self.is_red = False
 
     def button_correct_wizard(self):
         self.approval_check_in = self.check_in
-        self.approval_check_out = self.check_in
+        self.approval_check_out = self.check_out
+        self.is_approval_no = self.is_no_card
+        self.is_approval_early = self.is_early_card
+        self.is_approval_late = self.is_late_card
+        self.is_approval_abnormal = self.is_abnormal
+        self.is_approval_abs = self.absenteeism_card
         return {
             "type": "ir.actions.act_window",
             "name": "修正弹窗",