diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index a8654e32c..db3dc1da6 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -127,13 +127,16 @@ class SoongWorkflowMixin(models.AbstractModel): record.is_back = False def _compute_is_active(self): + _logger.info("_compute_is_active----" + str(fields.datetime.now())) current_user_id = self.env.user.id self.is_active = False if self.log_ids: if self.log_ids[-1].name == '归档' and self.log_ids[-1].done_by.id == current_user_id and self.log_ids[-1].approval_state in ['0', '1']: self.is_active = True + _logger.info("_compute_is_active----" + str(fields.datetime.now())) def _compute_is_done(self): + _logger.info("_compute_is_done循环开始----" + str(fields.datetime.now())) for record in self: record.is_done = False log_ids_domain = [ @@ -151,6 +154,7 @@ class SoongWorkflowMixin(models.AbstractModel): if workflow_record_id: if workflow_record_id.approve_state == 'end': record.is_done = True + _logger.info("_compute_is_done循环结束----" + str(fields.datetime.now())) def _compute_is_confirm(self): for record in self: @@ -800,19 +804,26 @@ class SoongWorkflowMixin(models.AbstractModel): if view_type in ["tree", "form"]: params = {} if "field" in res["arch"]: + _logger.info("1---" + str(fields.datetime.now())) res = self._remove_default_header(view_type, res) + _logger.info("2---" + str(fields.datetime.now())) # res = self._remove_default_modifiers(view_type, res) res = self._load_buttons_view(view_type, res) + _logger.info("3---" + str(fields.datetime.now())) res = self._load_button_box_view(view_type, res) + _logger.info("4---" + str(fields.datetime.now())) res = self._load_state_view(view_type, res) + _logger.info("5---" + str(fields.datetime.now())) # res = self._load_one2many_views(view_type, res) res = self._update_fields_view(view_type, res) + _logger.info("6---" + str(fields.datetime.now())) # res = self._add_state_tree_view(view_type, res) if self.env.user.has_group("soong_workflow.group_soong_workflow_manager"): res = self._add_soong_workflow_log_manager(view_type, res, params) else: res = self._add_soong_workflow_log(view_type, res, params) res = self._load_sign_view(view_type, res) + _logger.info("7---" + str(fields.datetime.now())) # res = self._load_workflow_approver_view(view_type, res) return res diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index a08ebb7c7..ece08039b 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -846,7 +846,6 @@ class SoongWorkflowCommentWizard(models.TransientModel): title=record_id._description, description=f"标题为{record_id.name}的{record_id._description}已结束，请归档", url=url, btntxt="查看详情") - self.node_btn_id.with_context(cx).run() if self.node_btn_name == "分发": record_id.is_send = True diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py index e97095f57..48ae7fd2e 100644 --- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py @@ -231,8 +231,8 @@ class YuthonOnboardApproval(models.Model): 'structure_type_id': self.structure_type_id.id, 'is_annual_salary': self.is_annual_salary, 'date_end': self.duration_employment_end, - 'start_date': self.probation_start_date, - 'end_date': self.probation_end_date, + 'start_date': self.probation_start_date or self.duration_employment, + 'end_date': self.probation_end_date or self.duration_employment_end, 'is_probation': True, }) @@ -249,4 +249,4 @@ class YuthonOnboardApproval(models.Model): self.ensure_one() report = self.env.ref('yuthon_hr_employee_approval.action_onboard_approval_report') return report.report_action(self) - +0 diff --git a/yuthon_trade/views/yuthon_business_approval_viwes.xml b/yuthon_trade/views/yuthon_business_approval_viwes.xml index bf907acb5..9047e883f 100644 --- a/yuthon_trade/views/yuthon_business_approval_viwes.xml +++ b/yuthon_trade/views/yuthon_business_approval_viwes.xml @@ -34,15 +34,12 @@ - - - - - - - - - + + + + + +

@@ -53,6 +50,9 @@ + + + diff --git a/yuthon_will_task/views/yuthon_will_task_views.xml b/yuthon_will_task/views/yuthon_will_task_views.xml index caabacf95..d0651f681 100644 --- a/yuthon_will_task/views/yuthon_will_task_views.xml +++ b/yuthon_will_task/views/yuthon_will_task_views.xml @@ -89,6 +89,8 @@ style="max-width: 5rem !important;"/>

+ +