diff --git a/oo_list_manager/static/src/views/list/list_renderer.js b/oo_list_manager/static/src/views/list/list_renderer.js index a67760924..bbdb1e22a 100644 --- a/oo_list_manager/static/src/views/list/list_renderer.js +++ b/oo_list_manager/static/src/views/list/list_renderer.js @@ -64,6 +64,7 @@ patch(ListRenderer.prototype, { const groupHeaders = [...table.querySelectorAll('tbody tr.o_group_header')]; const setStyle = (element, left, z = 10) => { + if (!element) return; element.classList.add('position-sticky', 'o_column_freeze'); Object.assign(element.style, { left: `${left}px`, @@ -72,6 +73,7 @@ patch(ListRenderer.prototype, { }; const removeStyle = (element) => { + if (!element) return; element.classList.remove('position-sticky', 'o_column_freeze'); element.style.left = ''; element.style.zIndex = ''; diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 900cb3e7b..793aecd0c 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -450,8 +450,8 @@ class SoongWorkflowCommentWizard(models.TransientModel): target_url = f'https://oa.thtzjt.com/web#id={record_id.id}&cids=2&active_id={action_id.id}&model={record_id._name}&view_type=form' url = self.sudo().env["wecom.apps"].generate_oauth_login_url(target_url, category='oa') result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', - user_id='18562027762', - title=record_id._description, + user_id=employee.wecom_userid, + title= record_id._description if 'Purchase Order' != record_id._description else '采购订单', description="标题: {}\n".format( record_id.name) + self.env.user.name + ' ' + str( fields.Datetime.now() + timedelta( diff --git a/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/scss/list_view_sticky_header_and_column.scss b/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/scss/list_view_sticky_header_and_column.scss index fe1f837af..c839079e6 100644 --- a/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/scss/list_view_sticky_header_and_column.scss +++ b/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/scss/list_view_sticky_header_and_column.scss @@ -21,9 +21,9 @@ overflow-x: auto; overflow-y: visible; } -.table-responsive { - overflow: visible; -} +// .table-responsive { +// overflow: visible; +// } .o_list_view .table-responsive .table thead { z-index: 20; } diff --git a/yuthon_hr_employee/views/inherit_hr_job_views.xml b/yuthon_hr_employee/views/inherit_hr_job_views.xml index 845d9b0d1..312856978 100644 --- a/yuthon_hr_employee/views/inherit_hr_job_views.xml +++ b/yuthon_hr_employee/views/inherit_hr_job_views.xml @@ -82,7 +82,7 @@ 1 - + diff --git a/yuthon_hr_employee_approval/report/contract_review_report_templates.xml b/yuthon_hr_employee_approval/report/contract_review_report_templates.xml index 52176d45a..a19813d76 100644 --- a/yuthon_hr_employee_approval/report/contract_review_report_templates.xml +++ b/yuthon_hr_employee_approval/report/contract_review_report_templates.xml @@ -6,7 +6,7 @@
- 合同审查单 + 会审意见表
- +
- 承办部门: + 承办部门:
@@ -47,6 +47,22 @@ + + + + + + + + @@ -54,11 +70,19 @@ - + + + + + - + - + - +
审批类型 + 合同 + 章程 +
业务类型 + + + , + +
合同类型 合同金额
情况说明
律师意见 + +
+
+
附件清单
@@ -71,9 +95,9 @@
diff --git a/yuthon_official/models/officical_type.py b/yuthon_official/models/officical_type.py index dd6994d8d..bc9161ac0 100644 --- a/yuthon_official/models/officical_type.py +++ b/yuthon_official/models/officical_type.py @@ -14,8 +14,10 @@ class OfficialType(models.Model): class MainFlats(models.Model): _name = 'main.flats' _description = '主送/抄送单位' + _order = 'sequence' name = fields.Char(string="主送/抄送单位") + sequence = fields.Integer(string='排序序号') class CopyFlats(models.Model): diff --git a/yuthon_official/views/official_type_views.xml b/yuthon_official/views/official_type_views.xml index 8e3c5e531..701b874f5 100644 --- a/yuthon_official/views/official_type_views.xml +++ b/yuthon_official/views/official_type_views.xml @@ -20,6 +20,7 @@ main.flats + diff --git a/yuthon_official/views/yuthon_official_views.xml b/yuthon_official/views/yuthon_official_views.xml index 89245e416..86e91871e 100644 --- a/yuthon_official/views/yuthon_official_views.xml +++ b/yuthon_official/views/yuthon_official_views.xml @@ -94,7 +94,7 @@ - > +