From d08502185b729ebde44ec22ee437f8ef25bab186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Tue, 14 Jan 2025 20:23:12 +0800 Subject: [PATCH 1/2] pengyu --- soong_workflow/models/soong_workflow_mixin.py | 8 ++++---- .../wizard/soong_workflow_comment_wizard_view.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index d88b4bf14..c0908e002 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -257,15 +257,14 @@ class SoongWorkflowMixin(models.AbstractModel): "default_res_model": self._name, "default_log_ids": logs.ids, "default_node_btn_id": btn_rec.id, - "default_node_link_len": '转交2' if len( - btn_rec.node_id.out_link_ids) > 1 and btn_rec.name == '转交' else '', + "default_node_link_len": '转交2' if len(btn_rec.node_id.out_link_ids) > 1 and btn_rec.name == '转交' else '', }, } # 下一个节点 next_state = btn_rec.workflow_id.node_ids[self_state + 1].button_ids[0] - if btn_rec.name == '转交' and len(btn_rec.node_id.out_link_ids) > 1: + if btn_rec.name == '转交' and len(btn_rec.node_id.out_link_ids) >= 1: for state in btn_rec.node_id.out_link_ids: - self.env['trans.link'].create({ + trans_link_id = self.env['trans.link'].create({ 'node_button_id': btn_rec.id, 'name': state.name.split('-> ')[1], 'link_type': 'trans', @@ -301,6 +300,7 @@ class SoongWorkflowMixin(models.AbstractModel): "default_is_automatic": next_state.is_automatic, "default_employee_ids": employee_ids, "default_node_btn_id": btn_rec.id, + "default_trans_link_id": trans_link_id.id, "default_node_link_len": '转交2' if len(btn_rec.node_id.out_link_ids) > 1 and btn_rec.name == '转交' else '', }, } diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml index 9d94d3ec4..f71a64ca4 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml +++ b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml @@ -18,7 +18,7 @@ - + From 75df1186e6c8c1b40723ed4be0c079e050ac9fba Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Tue, 14 Jan 2025 20:24:14 +0800 Subject: [PATCH 2/2] =?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 --- yuthon_property/views/property_rent_list_views.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuthon_property/views/property_rent_list_views.xml b/yuthon_property/views/property_rent_list_views.xml index c96384276..d9f82ee10 100644 --- a/yuthon_property/views/property_rent_list_views.xml +++ b/yuthon_property/views/property_rent_list_views.xml @@ -22,7 +22,7 @@