From 41121d8e94a318f03139d915db8f146c858b6711 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Fri, 25 Jul 2025 22:35:18 +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 --- .../models/soong_workflow_inspector.py | 18 +----------------- .../wizard/soong_workflow_comment_wizard.py | 4 ++++ yuthon_holiday/models/inherit_hr_leave.py | 18 +----------------- .../models/yuthon_fixes_approval.py | 18 +----------------- yuthon_hr_attendance/models/card_approval.py | 18 +----------------- yuthon_hr_attendance/models/duty_approval.py | 18 +----------------- yuthon_hr_attendance/models/go_approval.py | 18 +----------------- yuthon_hr_attendance/models/leave_approval.py | 18 +----------------- .../models/overtime_approval.py | 18 +----------------- .../models/remove_holiday_approval.py | 18 +----------------- .../models/yuthon_abnormal_approval.py | 18 +----------------- .../models/yuthon_adjustments_approval.py | 18 +----------------- .../models/yuthon_customer_approval.py | 18 +----------------- .../models/yuthon_shift_approval.py | 18 +----------------- .../models/yuthon_special_approval.py | 18 +----------------- .../views/overtime_approval.xml | 1 + .../models/yuthon_account_approval.py | 18 +----------------- .../models/yuthon_appointment_approval.py | 18 +----------------- .../models/yuthon_department_change.py | 18 +----------------- .../models/yuthon_enrollment_approval.py | 18 +----------------- .../models/yuthon_interview_approval.py | 18 +----------------- .../models/yuthon_leaving_approval.py | 18 +----------------- .../models/yuthon_message_login.py | 18 +----------------- .../models/yuthon_onboard_approval.py | 18 +----------------- .../models/yuthon_prepare_approval.py | 18 +----------------- .../models/yuthon_reassignment_approval.py | 18 +----------------- .../models/yuthon_recruitment_approval.py | 18 +----------------- .../models/yuthon_regularization_approval.py | 18 +----------------- .../models/yuthon_renewal_approval.py | 18 +----------------- .../models/yuthon_retired_approval.py | 18 +----------------- .../models/yuthon_reward_approval.py | 18 +----------------- .../models/yuthon_service_approval.py | 18 +----------------- .../models/yuthon_social_files_approval.py | 18 +----------------- .../models/yuthon_transfer_approval.py | 18 +----------------- yuthon_notice/models/yuthon_notice.py | 19 +------------------ .../models/yuthon_offficial_incoming_party.py | 18 +----------------- yuthon_official/models/yuthon_official.py | 18 +----------------- .../models/yuthon_official_incoming_labor.py | 18 +----------------- .../models/yuthon_official_incoming_normal.py | 18 +----------------- .../models/yuthon_official_labor.py | 18 +----------------- .../models/yuthon_official_party.py | 18 +----------------- .../models/yuthon_employee_approval.py | 18 +----------------- .../models/yuthon_index_approval.py | 18 +----------------- .../models/yuthon_tissue_duty_approval.py | 18 +----------------- .../models/perperty_claim_approval.py | 18 +----------------- .../models/property_accounting_approval.py | 18 +----------------- .../models/property_accounts_approval.py | 18 +----------------- .../models/property_approval.py | 18 +----------------- .../models/property_borrowing_approval.py | 18 +----------------- .../models/property_capacity.py | 18 +----------------- .../models/property_construction_approval.py | 18 +----------------- .../models/property_current_approval.py | 18 +----------------- .../models/property_delegated_agent.py | 18 +----------------- .../models/property_design_approval.py | 18 +----------------- .../models/property_early_quitting.py | 18 +----------------- .../models/property_eligibility.py | 18 +----------------- .../models/property_engineering_approval.py | 18 +----------------- .../models/property_evaluate_application.py | 18 +----------------- .../models/property_fitment.py | 18 +----------------- .../models/property_handover.py | 18 +----------------- .../models/property_intention_approval.py | 18 +----------------- .../models/property_lease_contract.py | 18 +----------------- .../models/property_lease_extension.py | 18 +----------------- .../models/property_management.py | 18 +----------------- .../models/property_management_fee.py | 18 +----------------- .../models/property_meeting_approval.py | 18 +----------------- .../models/property_merge_approval.py | 18 +----------------- .../models/property_offline_registration.py | 18 +----------------- .../models/property_open_rent.py | 18 +----------------- .../models/property_penalty_relief.py | 18 +----------------- .../models/property_project_approval.py | 18 +----------------- .../models/property_project_works.py | 18 +----------------- .../models/property_record.py | 18 +----------------- .../models/property_renamed.py | 18 +----------------- .../models/property_rent_relief.py | 18 +----------------- .../models/property_rental_conditions.py | 18 +----------------- .../models/property_rental_form.py | 19 +------------------ .../models/property_service_approval.py | 18 +----------------- .../models/property_split_approval.py | 18 +----------------- .../models/property_sporadic_works.py | 17 +---------------- .../models/property_supervising_approval.py | 18 +----------------- .../models/property_transaction_confirmed.py | 18 +----------------- .../models/property_transfer_approval.py | 19 +------------------ .../models/yuthon_business_approval.py | 18 +----------------- .../models/yuthon_care_condolences.py | 18 +----------------- .../models/yuthon_message_approval.py | 18 +----------------- yuthon_trade/models/yuthon_mutual_approval.py | 18 +----------------- .../models/yuthon_personal_condolences.py | 18 +----------------- yuthon_trade/models/yuthon_seals_approval.py | 18 +----------------- yuthon_trade/models/yuthon_task_approval.py | 18 +----------------- .../models/yuthon_trade_activities.py | 18 +----------------- yuthon_trade/models/yuthon_trade_premium.py | 18 +----------------- .../models/yuthon_work_condolences.py | 18 +----------------- yuthon_will_task/models/yuthon_will_task.py | 19 ++----------------- 94 files changed, 98 insertions(+), 1566 deletions(-) diff --git a/soong_workflow/models/soong_workflow_inspector.py b/soong_workflow/models/soong_workflow_inspector.py index d9440137a..2bd9c942b 100644 --- a/soong_workflow/models/soong_workflow_inspector.py +++ b/soong_workflow/models/soong_workflow_inspector.py @@ -33,23 +33,7 @@ class SoongWorkflowInspector(models.Model): inspector_line2_ids = fields.One2many('soong.workflow.inspector.line2', 'workflow_inspector_id', string='督办明细') relevancy_type = fields.Selection([('none', '无')], string="关联流程类型") - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") class SoongWorkflowInspectorLine(models.Model): diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 2b08e30be..17864c7f9 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -379,6 +379,10 @@ class SoongWorkflowCommentWizard(models.TransientModel): workflow_record_id.users_ids = [(4, employee.user_id.id) for employee in self.employee_ids if employee.user_id] workflow_record_id.employee_ids = self.employee_ids workflow_record_id.approve_state = "pending" # 待审批 + 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}) for employee in self.employee_ids: diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index 10a572bb7..b95dd193c 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/yuthon_holiday/models/inherit_hr_leave.py @@ -458,23 +458,7 @@ class HolidaysRequestBatch(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_day') def _onchange_is_day(self): diff --git a/yuthon_holiday/models/yuthon_fixes_approval.py b/yuthon_holiday/models/yuthon_fixes_approval.py index 837b059b2..0d06377de 100644 --- a/yuthon_holiday/models/yuthon_fixes_approval.py +++ b/yuthon_holiday/models/yuthon_fixes_approval.py @@ -39,23 +39,7 @@ class YuthonFixesApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('holiday_status') def _onchange_holiday_status(self): diff --git a/yuthon_hr_attendance/models/card_approval.py b/yuthon_hr_attendance/models/card_approval.py index 8e41c84a2..e454bbbb7 100644 --- a/yuthon_hr_attendance/models/card_approval.py +++ b/yuthon_hr_attendance/models/card_approval.py @@ -35,23 +35,7 @@ class CardApprovals(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('attendance_id') def onchange_replacement_time(self): diff --git a/yuthon_hr_attendance/models/duty_approval.py b/yuthon_hr_attendance/models/duty_approval.py index 98123b044..c11586043 100644 --- a/yuthon_hr_attendance/models/duty_approval.py +++ b/yuthon_hr_attendance/models/duty_approval.py @@ -29,23 +29,7 @@ class DutyApprovals(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.depends('date_start', 'date_end') def _compute_duration(self): diff --git a/yuthon_hr_attendance/models/go_approval.py b/yuthon_hr_attendance/models/go_approval.py index 849bb2023..1acc0453f 100644 --- a/yuthon_hr_attendance/models/go_approval.py +++ b/yuthon_hr_attendance/models/go_approval.py @@ -47,23 +47,7 @@ class GoApprovals(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('start_day_selection', 'end_day_selection') def _onchange_selection_fields(self): diff --git a/yuthon_hr_attendance/models/leave_approval.py b/yuthon_hr_attendance/models/leave_approval.py index e496ac3a6..d6c332b4d 100644 --- a/yuthon_hr_attendance/models/leave_approval.py +++ b/yuthon_hr_attendance/models/leave_approval.py @@ -25,23 +25,7 @@ class LeaveApprovals(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") def leave_approval(self): pass \ No newline at end of file diff --git a/yuthon_hr_attendance/models/overtime_approval.py b/yuthon_hr_attendance/models/overtime_approval.py index 48c8be862..a432d151d 100644 --- a/yuthon_hr_attendance/models/overtime_approval.py +++ b/yuthon_hr_attendance/models/overtime_approval.py @@ -46,23 +46,7 @@ class OvertimeApprovals(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") def open_record(self): if self.start_time and self.end_time and self.employee_ids: diff --git a/yuthon_hr_attendance/models/remove_holiday_approval.py b/yuthon_hr_attendance/models/remove_holiday_approval.py index 515429a49..17a8ce3b6 100644 --- a/yuthon_hr_attendance/models/remove_holiday_approval.py +++ b/yuthon_hr_attendance/models/remove_holiday_approval.py @@ -31,23 +31,7 @@ class RemoveHolidayApprovals(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_attendance/models/yuthon_abnormal_approval.py b/yuthon_hr_attendance/models/yuthon_abnormal_approval.py index 7c5d2db39..c215c8de7 100644 --- a/yuthon_hr_attendance/models/yuthon_abnormal_approval.py +++ b/yuthon_hr_attendance/models/yuthon_abnormal_approval.py @@ -27,23 +27,7 @@ class YuthonAbnormalApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_attendance/models/yuthon_adjustments_approval.py b/yuthon_hr_attendance/models/yuthon_adjustments_approval.py index b3fee0ac7..e5369df1b 100644 --- a/yuthon_hr_attendance/models/yuthon_adjustments_approval.py +++ b/yuthon_hr_attendance/models/yuthon_adjustments_approval.py @@ -29,23 +29,7 @@ class YuthonAdjustmentsApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_attendance/models/yuthon_customer_approval.py b/yuthon_hr_attendance/models/yuthon_customer_approval.py index 95717f212..1612e0b2f 100644 --- a/yuthon_hr_attendance/models/yuthon_customer_approval.py +++ b/yuthon_hr_attendance/models/yuthon_customer_approval.py @@ -28,23 +28,7 @@ class YuthonCustomerApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_attendance/models/yuthon_shift_approval.py b/yuthon_hr_attendance/models/yuthon_shift_approval.py index 56c7f7776..cf5075e5e 100644 --- a/yuthon_hr_attendance/models/yuthon_shift_approval.py +++ b/yuthon_hr_attendance/models/yuthon_shift_approval.py @@ -36,23 +36,7 @@ class YuthonShiftApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_attendance/models/yuthon_special_approval.py b/yuthon_hr_attendance/models/yuthon_special_approval.py index 89e938c1a..518801879 100644 --- a/yuthon_hr_attendance/models/yuthon_special_approval.py +++ b/yuthon_hr_attendance/models/yuthon_special_approval.py @@ -32,23 +32,7 @@ class YuthonSpecialApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") def button_special_approval(self): role_a = self.env['planning.role'].search([('name', '=', '联安粮库')], limit=1) diff --git a/yuthon_hr_attendance/views/overtime_approval.xml b/yuthon_hr_attendance/views/overtime_approval.xml index 607ccefef..2473130c1 100644 --- a/yuthon_hr_attendance/views/overtime_approval.xml +++ b/yuthon_hr_attendance/views/overtime_approval.xml @@ -52,6 +52,7 @@ + diff --git a/yuthon_hr_employee_approval/models/yuthon_account_approval.py b/yuthon_hr_employee_approval/models/yuthon_account_approval.py index a333c8062..5c71f1eb7 100644 --- a/yuthon_hr_employee_approval/models/yuthon_account_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_account_approval.py @@ -10,20 +10,4 @@ class YuthonAccountApproval(models.Model): code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_account_approval_code')) active = fields.Boolean('Active', default=True, tracking=True) work_end = fields.Boolean(string="结束") - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file diff --git a/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py b/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py index cc620ffb8..c894c8750 100644 --- a/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py @@ -30,23 +30,7 @@ class YuthonAppointmentApproval(models.Model): def _get_default_name_title(self): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_employee_approval/models/yuthon_department_change.py b/yuthon_hr_employee_approval/models/yuthon_department_change.py index 54b2d4dcd..a40f4a5f1 100644 --- a/yuthon_hr_employee_approval/models/yuthon_department_change.py +++ b/yuthon_hr_employee_approval/models/yuthon_department_change.py @@ -31,23 +31,7 @@ class YuthonDepartmentChange(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py b/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py index 7d8079293..03336c698 100644 --- a/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py @@ -12,20 +12,4 @@ class YuthonEnrollmentApproval(models.Model): default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_enrollment_approval_code')) active = fields.Boolean('Active', default=True, tracking=True) work_end = fields.Boolean(string="结束") - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file diff --git a/yuthon_hr_employee_approval/models/yuthon_interview_approval.py b/yuthon_hr_employee_approval/models/yuthon_interview_approval.py index 3f9f2ba71..2ff2f077d 100644 --- a/yuthon_hr_employee_approval/models/yuthon_interview_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_interview_approval.py @@ -29,23 +29,7 @@ class YuthonInterviewApproval(models.Model): def _get_default_name_title(self): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") def scheduling_of_meetings(self): form_id = self.env.ref("room.room_booking_view_form").id diff --git a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py index cb2fac9ed..49d5a53d1 100644 --- a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py @@ -37,23 +37,7 @@ class YuthonLeavingApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) active = fields.Boolean('Active', default=True, tracking=True) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") def put_leaving(self): for record in self: diff --git a/yuthon_hr_employee_approval/models/yuthon_message_login.py b/yuthon_hr_employee_approval/models/yuthon_message_login.py index 81393dbe0..7a70a0494 100644 --- a/yuthon_hr_employee_approval/models/yuthon_message_login.py +++ b/yuthon_hr_employee_approval/models/yuthon_message_login.py @@ -125,23 +125,7 @@ class YuthonMessageLogin(models.Model): part_time_ids = fields.One2many('education.details.line1', 'diploma_id', string="学历证(非全日制)") degree_id_ids = fields.One2many('education.details.line2', 'degree_id', string="学位证") certificate_ids = fields.One2many('certificates.detail.line', 'certificate_id', string="专业证书") - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py index e4c2c6514..323019b6e 100644 --- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py @@ -69,23 +69,7 @@ class YuthonOnboardApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") def button_office_supply(self): form_id = self.env.ref('yuthon_sps_approval.view_yuthon_office_supplies_form').id diff --git a/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py b/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py index 1f310a948..895f389c5 100644 --- a/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py @@ -27,23 +27,7 @@ class YuthonPrepareApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('adjust_information_ids') def onchange_change_index_library_ids(self): diff --git a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py index d3421d60b..55b750da3 100644 --- a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py @@ -34,23 +34,7 @@ class YuthonReassignmentApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") #异动信息 change_kind = fields.Char(string="异动类型") diff --git a/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py b/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py index 70ce52d14..089c7cdcc 100644 --- a/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py @@ -28,23 +28,7 @@ class YuthonRecruitmentApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py index e04f2e7a1..cbcfa008f 100644 --- a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py @@ -50,23 +50,7 @@ class YuthonRegularizationPrepareApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") #试用信息明细行 trial_assessment_ids = fields.One2many('yuthon.trial.scenario.detail.line', 'regularization_login_id', string="试用期考核方案",help='请选择适用本人主岗的试用考核方案,或直接在下方填写') diff --git a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py index 0239e45cb..a8f7fcdd1 100644 --- a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py @@ -37,21 +37,5 @@ class YuthonRenewalApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") diff --git a/yuthon_hr_employee_approval/models/yuthon_retired_approval.py b/yuthon_hr_employee_approval/models/yuthon_retired_approval.py index b7410eb76..f5dde7af7 100644 --- a/yuthon_hr_employee_approval/models/yuthon_retired_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_retired_approval.py @@ -37,23 +37,7 @@ class YuthonRetiredApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") class YuthonHandoverLine(models.Model): diff --git a/yuthon_hr_employee_approval/models/yuthon_reward_approval.py b/yuthon_hr_employee_approval/models/yuthon_reward_approval.py index 3c4d97ad5..1757661d6 100644 --- a/yuthon_hr_employee_approval/models/yuthon_reward_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_reward_approval.py @@ -29,23 +29,7 @@ class YuthonRewardApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_employee_approval/models/yuthon_service_approval.py b/yuthon_hr_employee_approval/models/yuthon_service_approval.py index f144cb7b9..865c74609 100644 --- a/yuthon_hr_employee_approval/models/yuthon_service_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_service_approval.py @@ -26,23 +26,7 @@ class YuthonServiceApproval(models.Model): default='normal') active = fields.Boolean('Active', default=True, tracking=True) work_end = fields.Boolean(string="结束") - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_employee_approval/models/yuthon_social_files_approval.py b/yuthon_hr_employee_approval/models/yuthon_social_files_approval.py index c015e1893..72e4ba54c 100644 --- a/yuthon_hr_employee_approval/models/yuthon_social_files_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_social_files_approval.py @@ -40,21 +40,5 @@ class YuthonSocialFilesApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") diff --git a/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py b/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py index 60699a699..a6ad827a1 100644 --- a/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py @@ -41,23 +41,7 @@ class YutransferApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_notice/models/yuthon_notice.py b/yuthon_notice/models/yuthon_notice.py index 09db43683..3d68ca6e0 100644 --- a/yuthon_notice/models/yuthon_notice.py +++ b/yuthon_notice/models/yuthon_notice.py @@ -49,32 +49,15 @@ class YuthonNotice(models.Model): column2='user_id', string='用户' ) - users_ids1 = fields.Many2many( + self_users_ids = fields.Many2many( 'res.users', relation='yuthon_notice_current_users_rel', column1='notice_id', column2='user_id', string="当前经办人", store=True, - compute='_compute_users_ids' ) - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids1 = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids1 = [(6, 0, user_ids)] - else: - record.users_ids1 = False - @api.model_create_multi def create(self, vals_list): for i in vals_list: diff --git a/yuthon_official/models/yuthon_offficial_incoming_party.py b/yuthon_official/models/yuthon_offficial_incoming_party.py index f7f4ea630..3003df584 100644 --- a/yuthon_official/models/yuthon_offficial_incoming_party.py +++ b/yuthon_official/models/yuthon_offficial_incoming_party.py @@ -43,23 +43,7 @@ class YuthonOfficialIncomingParty(models.Model): active = fields.Boolean('Active', default=True, tracking=True) work_end = fields.Boolean(string="结束") - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_official/models/yuthon_official.py b/yuthon_official/models/yuthon_official.py index 118d168f4..bc1b27ad4 100644 --- a/yuthon_official/models/yuthon_official.py +++ b/yuthon_official/models/yuthon_official.py @@ -53,23 +53,7 @@ class YuthonOfficial(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") def supervising_button(self): diff --git a/yuthon_official/models/yuthon_official_incoming_labor.py b/yuthon_official/models/yuthon_official_incoming_labor.py index 1499c7aed..7fd9df4a9 100644 --- a/yuthon_official/models/yuthon_official_incoming_labor.py +++ b/yuthon_official/models/yuthon_official_incoming_labor.py @@ -43,23 +43,7 @@ class YuthonOfficialIncomingLabor(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_official/models/yuthon_official_incoming_normal.py b/yuthon_official/models/yuthon_official_incoming_normal.py index 4eca9bf40..47242301b 100644 --- a/yuthon_official/models/yuthon_official_incoming_normal.py +++ b/yuthon_official/models/yuthon_official_incoming_normal.py @@ -46,23 +46,7 @@ class YuthonOfficialIncomingNormal(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_official/models/yuthon_official_labor.py b/yuthon_official/models/yuthon_official_labor.py index 1ea0fa9f8..5cd7e46d2 100644 --- a/yuthon_official/models/yuthon_official_labor.py +++ b/yuthon_official/models/yuthon_official_labor.py @@ -35,20 +35,4 @@ class YuthonOfficialLabor(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file diff --git a/yuthon_official/models/yuthon_official_party.py b/yuthon_official/models/yuthon_official_party.py index 508fee65e..038cbd0c4 100644 --- a/yuthon_official/models/yuthon_official_party.py +++ b/yuthon_official/models/yuthon_official_party.py @@ -40,20 +40,4 @@ class YuthonOfficialParty(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file diff --git a/yuthon_performance/models/yuthon_employee_approval.py b/yuthon_performance/models/yuthon_employee_approval.py index 7154abbd2..20b78801a 100644 --- a/yuthon_performance/models/yuthon_employee_approval.py +++ b/yuthon_performance/models/yuthon_employee_approval.py @@ -23,23 +23,7 @@ class YuthonEmployeeApproval(models.Model): urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') work_end = fields.Boolean(string="结束") - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_performance/models/yuthon_index_approval.py b/yuthon_performance/models/yuthon_index_approval.py index f5762a331..9396bd20d 100644 --- a/yuthon_performance/models/yuthon_index_approval.py +++ b/yuthon_performance/models/yuthon_index_approval.py @@ -17,23 +17,7 @@ class YuthonIndexApproval(models.Model): new_index_library_ids = fields.One2many("new.index.management.line",'new_change_index_library_id',string="新组织指标库变更明细") work_end = fields.Boolean(string="结束") active = fields.Boolean('Active', default=True, tracking=True) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('change_index_library_ids') def onchange_change_index_library_ids(self): diff --git a/yuthon_performance/models/yuthon_tissue_duty_approval.py b/yuthon_performance/models/yuthon_tissue_duty_approval.py index b44778e04..dc363fc9c 100644 --- a/yuthon_performance/models/yuthon_tissue_duty_approval.py +++ b/yuthon_performance/models/yuthon_tissue_duty_approval.py @@ -26,23 +26,7 @@ class YuthonTissueDutyApproval(models.Model): urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') work_end = fields.Boolean(string="结束") - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/perperty_claim_approval.py b/yuthon_property_approval/models/perperty_claim_approval.py index 61238f298..c4bdd6e89 100644 --- a/yuthon_property_approval/models/perperty_claim_approval.py +++ b/yuthon_property_approval/models/perperty_claim_approval.py @@ -30,23 +30,7 @@ class PropertyClaimApproval(models.Model): def _get_default_name_title(self): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") class PropertyClaimLine(models.Model): _name = 'property.claim.line' diff --git a/yuthon_property_approval/models/property_accounting_approval.py b/yuthon_property_approval/models/property_accounting_approval.py index 8ea930da7..e11ccfef0 100644 --- a/yuthon_property_approval/models/property_accounting_approval.py +++ b/yuthon_property_approval/models/property_accounting_approval.py @@ -38,23 +38,7 @@ class PropertyAccountingApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") class AccountingWayLine(models.Model): diff --git a/yuthon_property_approval/models/property_accounts_approval.py b/yuthon_property_approval/models/property_accounts_approval.py index 83d6c91c0..260c8ebff 100644 --- a/yuthon_property_approval/models/property_accounts_approval.py +++ b/yuthon_property_approval/models/property_accounts_approval.py @@ -31,23 +31,7 @@ class PropertyAccountsApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") # 流程结束触发方法 def put_button(self): diff --git a/yuthon_property_approval/models/property_approval.py b/yuthon_property_approval/models/property_approval.py index 4b090e188..4b5f58be2 100644 --- a/yuthon_property_approval/models/property_approval.py +++ b/yuthon_property_approval/models/property_approval.py @@ -34,23 +34,7 @@ class PropertyApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") def put_message_in(self): # 导入按钮 return { diff --git a/yuthon_property_approval/models/property_borrowing_approval.py b/yuthon_property_approval/models/property_borrowing_approval.py index 6fef69fe4..921d870bb 100644 --- a/yuthon_property_approval/models/property_borrowing_approval.py +++ b/yuthon_property_approval/models/property_borrowing_approval.py @@ -26,23 +26,7 @@ class PropertyBorrowingApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) active = fields.Boolean('Active', default=True, tracking=True) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") class YuthonBorrowingLine(models.Model): diff --git a/yuthon_property_approval/models/property_capacity.py b/yuthon_property_approval/models/property_capacity.py index 90881ad75..90f20bc61 100644 --- a/yuthon_property_approval/models/property_capacity.py +++ b/yuthon_property_approval/models/property_capacity.py @@ -33,23 +33,7 @@ class PropertyCapacity(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_construction_approval.py b/yuthon_property_approval/models/property_construction_approval.py index 567ae4c91..2e037150d 100644 --- a/yuthon_property_approval/models/property_construction_approval.py +++ b/yuthon_property_approval/models/property_construction_approval.py @@ -38,23 +38,7 @@ class PropertyConstructionApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") class ConstructionWayLine(models.Model): diff --git a/yuthon_property_approval/models/property_current_approval.py b/yuthon_property_approval/models/property_current_approval.py index 4df4ab35b..6d37d21de 100644 --- a/yuthon_property_approval/models/property_current_approval.py +++ b/yuthon_property_approval/models/property_current_approval.py @@ -62,20 +62,4 @@ class PropertyCurrentApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") diff --git a/yuthon_property_approval/models/property_delegated_agent.py b/yuthon_property_approval/models/property_delegated_agent.py index d40139120..5320b4fa6 100644 --- a/yuthon_property_approval/models/property_delegated_agent.py +++ b/yuthon_property_approval/models/property_delegated_agent.py @@ -28,22 +28,6 @@ class PropertyDelegatedAgent(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") diff --git a/yuthon_property_approval/models/property_design_approval.py b/yuthon_property_approval/models/property_design_approval.py index 3450051a4..c683e8b61 100644 --- a/yuthon_property_approval/models/property_design_approval.py +++ b/yuthon_property_approval/models/property_design_approval.py @@ -35,23 +35,7 @@ class PropertyDesignApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") class DesignWayLine(models.Model): diff --git a/yuthon_property_approval/models/property_early_quitting.py b/yuthon_property_approval/models/property_early_quitting.py index 23f69f9ed..69245af5a 100644 --- a/yuthon_property_approval/models/property_early_quitting.py +++ b/yuthon_property_approval/models/property_early_quitting.py @@ -37,23 +37,7 @@ class PropertyEarlyQuitting(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") def button_approval(self): for rec in self: diff --git a/yuthon_property_approval/models/property_eligibility.py b/yuthon_property_approval/models/property_eligibility.py index 63d636ac1..2602e04f4 100644 --- a/yuthon_property_approval/models/property_eligibility.py +++ b/yuthon_property_approval/models/property_eligibility.py @@ -32,23 +32,7 @@ class PropertyEligibility(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") class PropertyEligibilityLine(models.Model): _name = 'property.eligibility.line' diff --git a/yuthon_property_approval/models/property_engineering_approval.py b/yuthon_property_approval/models/property_engineering_approval.py index 63dad088c..bdb88fdc4 100644 --- a/yuthon_property_approval/models/property_engineering_approval.py +++ b/yuthon_property_approval/models/property_engineering_approval.py @@ -58,20 +58,4 @@ class PropertyEngineeringApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") diff --git a/yuthon_property_approval/models/property_evaluate_application.py b/yuthon_property_approval/models/property_evaluate_application.py index 81c6a0ddc..8f88f00be 100644 --- a/yuthon_property_approval/models/property_evaluate_application.py +++ b/yuthon_property_approval/models/property_evaluate_application.py @@ -36,23 +36,7 @@ class PropertyEvaluateApplication(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") def put_property_record(self): form_id = self.env.ref('yuthon_property_approval.views_property_record_form').id diff --git a/yuthon_property_approval/models/property_fitment.py b/yuthon_property_approval/models/property_fitment.py index d53f37970..9edb5c6a9 100644 --- a/yuthon_property_approval/models/property_fitment.py +++ b/yuthon_property_approval/models/property_fitment.py @@ -37,20 +37,4 @@ class PropertyFitment(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file diff --git a/yuthon_property_approval/models/property_handover.py b/yuthon_property_approval/models/property_handover.py index 940aaabae..4aa4116d3 100644 --- a/yuthon_property_approval/models/property_handover.py +++ b/yuthon_property_approval/models/property_handover.py @@ -30,23 +30,7 @@ class PropertyHandover(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_intention_approval.py b/yuthon_property_approval/models/property_intention_approval.py index ffaed4db6..4cadbfdaf 100644 --- a/yuthon_property_approval/models/property_intention_approval.py +++ b/yuthon_property_approval/models/property_intention_approval.py @@ -28,23 +28,7 @@ class PropertyIntentionApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py index b2f459044..8baf5b977 100644 --- a/yuthon_property_approval/models/property_lease_contract.py +++ b/yuthon_property_approval/models/property_lease_contract.py @@ -212,23 +212,7 @@ class PropertyLeaseContract(models.Model): store=True) responsibility_book_name = fields.Char(string="安全生产责任书(住宅)名称", compute='_compute_attachment_names', store=True) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.depends() def _compute_not_received(self): diff --git a/yuthon_property_approval/models/property_lease_extension.py b/yuthon_property_approval/models/property_lease_extension.py index 1980aca42..bc81cccc8 100644 --- a/yuthon_property_approval/models/property_lease_extension.py +++ b/yuthon_property_approval/models/property_lease_extension.py @@ -37,23 +37,7 @@ class PropertyLeaseExtension(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") def button_approval(self): for rec in self: diff --git a/yuthon_property_approval/models/property_management.py b/yuthon_property_approval/models/property_management.py index 09034086d..21eaf4227 100644 --- a/yuthon_property_approval/models/property_management.py +++ b/yuthon_property_approval/models/property_management.py @@ -41,23 +41,7 @@ class PropertyManagement(models.Model): name_title = fields.Char(default=_get_default_name_title) document_ids = fields.Many2many('ir.attachment', string="附件") - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('precinct_id') def _onchange_precinct_id(self): diff --git a/yuthon_property_approval/models/property_management_fee.py b/yuthon_property_approval/models/property_management_fee.py index ac13d37ff..b69b88dbc 100644 --- a/yuthon_property_approval/models/property_management_fee.py +++ b/yuthon_property_approval/models/property_management_fee.py @@ -26,23 +26,7 @@ class PropertyManagementFee(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") #类型 diff --git a/yuthon_property_approval/models/property_meeting_approval.py b/yuthon_property_approval/models/property_meeting_approval.py index 4698a2533..dec29bf3b 100644 --- a/yuthon_property_approval/models/property_meeting_approval.py +++ b/yuthon_property_approval/models/property_meeting_approval.py @@ -29,23 +29,7 @@ class PropertyMeetingApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_merge_approval.py b/yuthon_property_approval/models/property_merge_approval.py index 4ee856623..7c2c0f617 100644 --- a/yuthon_property_approval/models/property_merge_approval.py +++ b/yuthon_property_approval/models/property_merge_approval.py @@ -33,23 +33,7 @@ class PropertyMergeApproval(models.Model): def _get_default_name_title(self): return self._description if self._description else self._name - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") name_title = fields.Char(default=_get_default_name_title) related_issues_id = fields.Many2one('issue.library', string="关联议题") diff --git a/yuthon_property_approval/models/property_offline_registration.py b/yuthon_property_approval/models/property_offline_registration.py index 0d03fd6bf..b251e3f78 100644 --- a/yuthon_property_approval/models/property_offline_registration.py +++ b/yuthon_property_approval/models/property_offline_registration.py @@ -34,23 +34,7 @@ class PropertyOfflineRegistration(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_open_rent.py b/yuthon_property_approval/models/property_open_rent.py index f9e37c603..b0b3f1ae1 100644 --- a/yuthon_property_approval/models/property_open_rent.py +++ b/yuthon_property_approval/models/property_open_rent.py @@ -24,23 +24,7 @@ class PropertyOpenRent(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") # # # class PropertyOpenRentLine(models.Model): diff --git a/yuthon_property_approval/models/property_penalty_relief.py b/yuthon_property_approval/models/property_penalty_relief.py index aef268fb1..37c75afd0 100644 --- a/yuthon_property_approval/models/property_penalty_relief.py +++ b/yuthon_property_approval/models/property_penalty_relief.py @@ -35,23 +35,7 @@ class PropertyPenaltyRelief(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_project_approval.py b/yuthon_property_approval/models/property_project_approval.py index a2fa2c2cf..075e58abf 100644 --- a/yuthon_property_approval/models/property_project_approval.py +++ b/yuthon_property_approval/models/property_project_approval.py @@ -27,20 +27,4 @@ class PropertyProjectApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file diff --git a/yuthon_property_approval/models/property_project_works.py b/yuthon_property_approval/models/property_project_works.py index 5e6091289..598312ccb 100644 --- a/yuthon_property_approval/models/property_project_works.py +++ b/yuthon_property_approval/models/property_project_works.py @@ -28,20 +28,4 @@ class PropertyProjectWorks(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file diff --git a/yuthon_property_approval/models/property_record.py b/yuthon_property_approval/models/property_record.py index 68c64de40..145b97c0a 100644 --- a/yuthon_property_approval/models/property_record.py +++ b/yuthon_property_approval/models/property_record.py @@ -35,23 +35,7 @@ class PropertyRecord(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_renamed.py b/yuthon_property_approval/models/property_renamed.py index 8edd0b551..20d591c6b 100644 --- a/yuthon_property_approval/models/property_renamed.py +++ b/yuthon_property_approval/models/property_renamed.py @@ -30,20 +30,4 @@ class PropertyRenamed(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file diff --git a/yuthon_property_approval/models/property_rent_relief.py b/yuthon_property_approval/models/property_rent_relief.py index bb98ad525..a3843bc78 100644 --- a/yuthon_property_approval/models/property_rent_relief.py +++ b/yuthon_property_approval/models/property_rent_relief.py @@ -34,23 +34,7 @@ class PropertyRentRelief(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_rental_conditions.py b/yuthon_property_approval/models/property_rental_conditions.py index 0db059499..f9b223431 100644 --- a/yuthon_property_approval/models/property_rental_conditions.py +++ b/yuthon_property_approval/models/property_rental_conditions.py @@ -30,23 +30,7 @@ class PropertyRentalConditions(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") class NowRentalConditionsLine(models.Model): _name = 'now.rental.conditions.line' diff --git a/yuthon_property_approval/models/property_rental_form.py b/yuthon_property_approval/models/property_rental_form.py index 96f7f2a49..0679a8980 100644 --- a/yuthon_property_approval/models/property_rental_form.py +++ b/yuthon_property_approval/models/property_rental_form.py @@ -28,24 +28,7 @@ class PropertyRentalForm(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False - + self_users_ids = fields.Many2many('res.users', string="当前经办人") class PropertyRentalFormLine(models.Model): _name = 'property.rental.form.line' diff --git a/yuthon_property_approval/models/property_service_approval.py b/yuthon_property_approval/models/property_service_approval.py index c10ea44e4..3e5e996c8 100644 --- a/yuthon_property_approval/models/property_service_approval.py +++ b/yuthon_property_approval/models/property_service_approval.py @@ -66,20 +66,4 @@ class PropertyServiceApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") diff --git a/yuthon_property_approval/models/property_split_approval.py b/yuthon_property_approval/models/property_split_approval.py index bfca986cd..265037b35 100644 --- a/yuthon_property_approval/models/property_split_approval.py +++ b/yuthon_property_approval/models/property_split_approval.py @@ -35,23 +35,7 @@ class PropertySplitApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('split_quantity', 'property_id') def _onchange_split_quantity(self): diff --git a/yuthon_property_approval/models/property_sporadic_works.py b/yuthon_property_approval/models/property_sporadic_works.py index 1b0c88416..27cc16bd0 100644 --- a/yuthon_property_approval/models/property_sporadic_works.py +++ b/yuthon_property_approval/models/property_sporadic_works.py @@ -27,23 +27,8 @@ class PropertySporadicWorks(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') + self_users_ids = fields.Many2many('res.users', string="当前经办人") - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False class PaymentMethodsLine(models.Model): _name = 'payment.methods.line' diff --git a/yuthon_property_approval/models/property_supervising_approval.py b/yuthon_property_approval/models/property_supervising_approval.py index 10c5160d0..feecb920d 100644 --- a/yuthon_property_approval/models/property_supervising_approval.py +++ b/yuthon_property_approval/models/property_supervising_approval.py @@ -35,23 +35,7 @@ class PropertySupervisingApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") class SupervisingWayLine(models.Model): _name = 'supervising.way.line' diff --git a/yuthon_property_approval/models/property_transaction_confirmed.py b/yuthon_property_approval/models/property_transaction_confirmed.py index 56b075ad1..382b793b0 100644 --- a/yuthon_property_approval/models/property_transaction_confirmed.py +++ b/yuthon_property_approval/models/property_transaction_confirmed.py @@ -31,23 +31,7 @@ class PropertyTransactionConfirmed(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_transfer_approval.py b/yuthon_property_approval/models/property_transfer_approval.py index 78b9147e6..5f2a21f2a 100644 --- a/yuthon_property_approval/models/property_transfer_approval.py +++ b/yuthon_property_approval/models/property_transfer_approval.py @@ -41,24 +41,7 @@ class PropertyTransferApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False - + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): if self.is_issues: diff --git a/yuthon_trade/models/yuthon_business_approval.py b/yuthon_trade/models/yuthon_business_approval.py index 1cdd4bbca..1b75d58e6 100644 --- a/yuthon_trade/models/yuthon_business_approval.py +++ b/yuthon_trade/models/yuthon_business_approval.py @@ -27,23 +27,7 @@ class YuthonBusinessApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_trade/models/yuthon_care_condolences.py b/yuthon_trade/models/yuthon_care_condolences.py index 3255974d0..3de0e61c8 100644 --- a/yuthon_trade/models/yuthon_care_condolences.py +++ b/yuthon_trade/models/yuthon_care_condolences.py @@ -31,23 +31,7 @@ class YuthonCareCondolences(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") diff --git a/yuthon_trade/models/yuthon_message_approval.py b/yuthon_trade/models/yuthon_message_approval.py index 40334e708..2b459f365 100644 --- a/yuthon_trade/models/yuthon_message_approval.py +++ b/yuthon_trade/models/yuthon_message_approval.py @@ -28,23 +28,7 @@ class YuthonMessageApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") class YuthonPublishType(models.Model): _name = 'yuthon.publish.type' diff --git a/yuthon_trade/models/yuthon_mutual_approval.py b/yuthon_trade/models/yuthon_mutual_approval.py index e6fff7b52..2b3c7770b 100644 --- a/yuthon_trade/models/yuthon_mutual_approval.py +++ b/yuthon_trade/models/yuthon_mutual_approval.py @@ -18,23 +18,7 @@ class YuthonMutualApproval(models.Model): insurance_ids = fields.One2many('yuthon.mutual.line', 'mutual_id', string="保单名称") work_end = fields.Boolean(string="结束") active = fields.Boolean('Active', default=True, tracking=True) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('users_id', 'insurance_ids') def _onchange_set_employee_id(self): diff --git a/yuthon_trade/models/yuthon_personal_condolences.py b/yuthon_trade/models/yuthon_personal_condolences.py index 6b54f105c..87d05bac0 100644 --- a/yuthon_trade/models/yuthon_personal_condolences.py +++ b/yuthon_trade/models/yuthon_personal_condolences.py @@ -11,20 +11,4 @@ class YuthonPersonalCondolences(models.Model): default=lambda self: self.env['ir.sequence'].next_by_code('property_personal_condolences_code_sequence')) work_end = fields.Boolean(string="结束") active = fields.Boolean('Active', default=True, tracking=True) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file diff --git a/yuthon_trade/models/yuthon_seals_approval.py b/yuthon_trade/models/yuthon_seals_approval.py index 1bac2510e..b4c8084fe 100644 --- a/yuthon_trade/models/yuthon_seals_approval.py +++ b/yuthon_trade/models/yuthon_seals_approval.py @@ -27,20 +27,4 @@ class YuthonSealsApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") diff --git a/yuthon_trade/models/yuthon_task_approval.py b/yuthon_trade/models/yuthon_task_approval.py index 20dd8b7a1..3ef6df2ce 100644 --- a/yuthon_trade/models/yuthon_task_approval.py +++ b/yuthon_trade/models/yuthon_task_approval.py @@ -36,23 +36,7 @@ class YuthonTaskApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.onchange('employee_ids', 'task_id') def _onchange_employee_task(self): diff --git a/yuthon_trade/models/yuthon_trade_activities.py b/yuthon_trade/models/yuthon_trade_activities.py index 92ca435b1..91905fc46 100644 --- a/yuthon_trade/models/yuthon_trade_activities.py +++ b/yuthon_trade/models/yuthon_trade_activities.py @@ -24,20 +24,4 @@ class YuthonTradeActivities(models.Model): joint_office_ids = fields.Many2many("hr.department", string="联办") work_end = fields.Boolean(string="结束") active = fields.Boolean('Active', default=True, tracking=True) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file diff --git a/yuthon_trade/models/yuthon_trade_premium.py b/yuthon_trade/models/yuthon_trade_premium.py index 638dabc30..b29f329ef 100644 --- a/yuthon_trade/models/yuthon_trade_premium.py +++ b/yuthon_trade/models/yuthon_trade_premium.py @@ -30,23 +30,7 @@ class YuthonTradePremium(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False + self_users_ids = fields.Many2many('res.users', string="当前经办人") @api.depends('employee_ids') def _compute_employee_ids(self): diff --git a/yuthon_trade/models/yuthon_work_condolences.py b/yuthon_trade/models/yuthon_work_condolences.py index c9eb6fc19..3825d47a3 100644 --- a/yuthon_trade/models/yuthon_work_condolences.py +++ b/yuthon_trade/models/yuthon_work_condolences.py @@ -26,20 +26,4 @@ class YuthonWorkCondolences(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - users_ids = fields.Many2many('res.users', string="当前经办人", store=True, compute='_compute_users_ids') - - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids = [(6, 0, user_ids)] - else: - record.users_ids = False \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py index 98dbb34fa..525b71adc 100644 --- a/yuthon_will_task/models/yuthon_will_task.py +++ b/yuthon_will_task/models/yuthon_will_task.py @@ -96,30 +96,15 @@ class YuthonWillTask(models.Model): default=lambda self: self.env.user ) - users_ids1 = fields.Many2many( + self_users_ids = fields.Many2many( 'res.users', relation='yuthon_will_task_current_users_rel', column1='task_id', column2='user_id', string="当前经办人", store=True, - compute='_compute_users_ids' ) - @api.depends('code') - def _compute_users_ids(self): - for record in self: - if not record.code: - record.users_ids1 = False - continue - workflow_records = self.env['soong.workflow.record'].search([ - ('code', '=', record.code), - ], limit=1) - if workflow_records: - employee_ids = workflow_records.employee_ids - user_ids = employee_ids.mapped('user_id').ids - record.users_ids1 = [(6, 0, user_ids)] - else: - record.users_ids1 = False + @api.onchange('employee_ids', 'user_id') def _onchange_employee_ids(self):