!4137 !4136 添加功能

Merge pull request !4137 from 李鹏宇/dev

soong_workflow/wizard/soong_workflow_comment_wizard.py

@@ -426,6 +426,10 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                 })
 
                 # 更新业务记录状态
+                related_record = self.env[self.res_model].browse(self.res_id)
+                if hasattr(related_record, 'self_users_ids'):
+                    user_ids = [employee.user_id.id for employee in self.employee_ids if employee.user_id]
+                    related_record.self_users_ids = [(6, 0, user_ids)] if user_ids else [(5,)]
                 record_id.write({'state': self.trans_link_id.name})
             if self.node_btn_name == '结束':
                 # 抄送传阅日志
@@ -486,6 +490,10 @@ class SoongWorkflowCommentWizard(models.TransientModel):
             })
             workflow_record_id = self.env['soong.workflow.record'].search([('code', '=', record_id.code)])
             workflow_record_id.employee_ids = self.employee_ids
+            related_record = self.env[self.res_model].browse(self.res_id)
+            if hasattr(related_record, 'self_users_ids'):
+                user_ids = [employee.user_id.id for employee in self.employee_ids if employee.user_id]
+                related_record.self_users_ids = [(6, 0, user_ids)] if user_ids else [(5,)]
             return self.node_btn_id.with_context(cx).run()
         if self.node_btn_name == '结束':
             record_id.log_ids[-1].comment = self.comment
@@ -546,7 +554,17 @@ class SoongWorkflowCommentWizard(models.TransientModel):
             if log_ids[-1].approval_state == '2':
                 raise UserError('当前状态不可以收回')
             self.env['soong.workflow.record'].search([('code', '=', record_id.code)]).write({"employee_ids": self.env.user.employee_id.id,})
+            related_record = self.env[self.res_model].browse(self.res_id)
+            if hasattr(related_record, 'self_users_ids'):
+                related_record.self_users_ids = [(6, 0, [self.env.user.id])]
             log_ids[-1].unlink()
             log_ids[-2].write({'approval_state': '1'})
             record_id.write({'state': log_ids[-2].name})
         return self.node_btn_id.with_context(cx).run()
+
+
+    def update_self_users_ids(self):
+        related_record = self.env[self.res_model].browse(self.res_id)
+        if hasattr(related_record, 'self_users_ids'):
+            user_ids = [employee.user_id.id for employee in self.employee_ids if employee.user_id]
+            related_record.self_users_ids = [(6, 0, user_ids)] if user_ids else [(5,)]

yuthon_hr_employee_approval/models/yuthon_onboard_approval.py

@@ -30,7 +30,10 @@ class YuthonOnboardApproval(models.Model):
     reason = fields.Text(string="正文")
     work_end = fields.Boolean(string="结束")
     bank = fields.Char(string='开户行')
-    use_user_type = fields.Selection(related='users_id.employee_id.use_user_type', string="用工形式")
+    use_user_type = fields.Selection(
+        [('formal_one', '正式合同(一签)'), ('labor', '劳务协议'), ('formal_two', '正式合同(二签)'),
+         ('formal_none', '正式合同(无固定)'),
+         ('part_time', '兼职协议'), ('employment', '用工协议'), ('internship', '实习协议')], string="用工形式")
     job_id = fields.Many2one('hr.job', string="岗位")
     department_id1 = fields.Many2one('hr.department', string="部门")
     onboarding_status = fields.Selection([('none', '待入职'), ('onboarding', '已入职')], string='审批后员工状态', default='none')

yuthon_maintain/models/inherit_maintenance_equipment.py

@@ -35,11 +35,8 @@ class InheritMaintenanceEquipment(models.Model):
     employee_ids = fields.Many2many('hr.employee', string="员工")
     is_jtbb = fields.Boolean(compute='_compute_company_id')
     mainten_state = fields.Selection([('ing', '使用中'), ('finish', '暂停')], string="设备状态")
-    equipment_model = fields.Char(string="型号")
     equipment_number = fields.Char(string="数量")
     equipment_unit = fields.Char(string="单位")
-    equipment_price = fields.Float(string="原值")
-    equipment_date = fields.Date(string="寿命")
 
     @api.depends('company_id')
     def _compute_company_id(self):

yuthon_maintain/views/maintenance_equipment_views.xml

@@ -18,6 +18,20 @@
             <xpath expr="//field[@name='technician_user_id']" position="attributes">
                 <attribute name="string">管理员</attribute>
             </xpath>
+            <xpath expr="//field[@name='model']" position="after">、
+                <field name="mainten_state"/>
+                <field name="equipment_number"/>
+                <field name="equipment_unit"/>
+            </xpath>
+            <xpath expr="//field[@name='model']" position="attributes">
+                    <attribute name="string">型号</attribute>
+            </xpath>
+            <xpath expr="//field[@name='cost']" position="attributes">
+                    <attribute name="string">原值</attribute>
+            </xpath>
+            <xpath expr="//field[@name='warranty_date']" position="attributes">
+                    <attribute name="string">寿命</attribute>
+            </xpath>
             <xpath expr="//page[@name='maintenance']" position="after">
                 <page string="关联流程">
                     <field name="equipment_approval_line_ids">
@@ -71,11 +85,11 @@
             <field name="arch" type="xml">
                     <xpath expr="//tree/field[@name='name']" position="after">
                         <field name="mainten_state"/>
-                        <field name="equipment_model"/>
+                        <field name="model" sting="型号"/>
                         <field name="equipment_number"/>
                         <field name="equipment_unit"/>
-                        <field name="equipment_price"/>
-                        <field name="equipment_date"/>
+                        <field name="cost" string="原值"/>
+                        <field name="warranty_date" string="寿命"/>
                     </xpath>
                     <xpath expr="//tree/field[@name='employee_id']" position="attributes">
                         <attribute name="column_invisible">1</attribute>