From 54fc56971daef0d9097e3107eef5e01b4e25063e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Fri, 16 Jan 2026 15:08:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_notice/controllers/main.py | 15 ++ .../business_approval_print_templates.xml | 135 +++--------------- 2 files changed, 36 insertions(+), 114 deletions(-) diff --git a/yuthon_notice/controllers/main.py b/yuthon_notice/controllers/main.py index 9595d0206..15731c1e2 100644 --- a/yuthon_notice/controllers/main.py +++ b/yuthon_notice/controllers/main.py @@ -40,3 +40,18 @@ class YuthonNotice(http.Controller): 'code':200, 'message':'success' }) + + @http.route('/yuthon/notice/list', methods=['POST'], type='http', auth='none', csrf=False) + def yuthon_notice_list(self, **kwargs): + notice_ids = request.env['yuthon.notice'].sudo().search([('employee_id.id', "=", kwargs.get('employee_id'))]) + data_list = [] + for notice in notice_ids: + result = { + 'id': notice.id, + 'create_data1': notice.create_data1, + 'users_id': notice.users_id.name, + 'name': notice.name, + } + data_list.append(result) + return json.dumps({'data': data_list, 'code': 200, 'message': 'success'}) + diff --git a/yuthon_trade/report/business_approval_print_templates.xml b/yuthon_trade/report/business_approval_print_templates.xml index 21967d3f0..c97027029 100644 --- a/yuthon_trade/report/business_approval_print_templates.xml +++ b/yuthon_trade/report/business_approval_print_templates.xml @@ -7,139 +7,46 @@ - - -
- 业务审批单 -
- - -
- 部门： -
- - +
业务审批单
+
部门:
- - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - +
事项标题 - -
业务类型 - - 、 - -
事项说明 - -
用章类型 - - 、 - -
用章范围 - - 、 - -
附件清单 - -
- -
事项标题
业务类型、
事项说明
用章类型、
用章范围、
附件清单
审批详情
- - - -
- From d95adb2f721264e18446c22af723381b89f36bd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Fri, 16 Jan 2026 15:30:36 +0800 Subject: [PATCH 2/3] =?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 --- soong_workflow/models/soong_workflow_mixin.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index a526a0c93..d64865259 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -134,13 +134,9 @@ class SoongWorkflowMixin(models.AbstractModel): lg1 = record.log_ids.search(domain) if lg2 or lg1: record.is_confirm = False - if not lg1 and not lg2 and record.is_active == True: + if not lg1 and not lg2: record.is_end = False - if record.log_ids: - if record.log_ids[-1].name == '归档' and record.log_ids[-1].approval_state == '2': - record.is_end = True - @api.depends("node_id", "log_ids") def _compute_approval_sign_ids(self): for record in self: @@ -878,7 +874,7 @@ class SoongWorkflowMixin(models.AbstractModel): id_el = etree.Element("field") id_el.set("name", "log_ids") id_el.set("invisible", "1") - invisible += "or is_end" + invisible += "or not is_end" if button.name == "退回": id_el = etree.Element("field") id_el.set("name", "log_ids") From 6893684ae8d5236035ba4ebdabfccc7e3e62cab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Fri, 16 Jan 2026 15:31:21 +0800 Subject: [PATCH 3/3] =?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 --- soong_workflow/models/soong_workflow_mixin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index d64865259..a39492661 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -129,7 +129,7 @@ class SoongWorkflowMixin(models.AbstractModel): record.is_confirm = True record.is_end = True domain = [('done_by', '=', self.env.user.id), ('workflow_id', '=', record.workflow_id.id), - ('res_id', '=', record.id), ('approval_state', 'in', ['0', '1']), ('name', '!=', '归档')] + ('res_id', '=', record.id), ('approval_state', 'not in', ['0', '1']), ('name', '!=', '归档')] lg2 = record.log_ids2.search(domain) lg1 = record.log_ids.search(domain) if lg2 or lg1: