From fd2d02e973c47bdee9a8f5f5e793ef0080ef7f6e 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: Tue, 6 Jan 2026 19:00:42 +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 --- soong_workflow/models/soong_workflow_mixin.py | 16 ++++++++-------- yuthon_issue/models/issue_library.py | 6 +++--- yuthon_will_task/models/yuthon_will_task.py | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index 912998801..73d214e8b 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -982,14 +982,14 @@ class SoongWorkflowMixin(models.AbstractModel): else: notebook_el = etree.Element("notebook") sheet_el.append(notebook_el) - page_el = etree.Element("page") - page_el.set("string", "加签人员") # 设置页面标签 - page_el.set("invisible", "1") # todo domain - field_m2m_el = etree.Element("field") - field_m2m_el.set("name", "approval_sign_ids") - field_m2m_el.set("widget", "many2many_tags") - page_el.append(field_m2m_el) - notebook_el.append(page_el) + # page_el = etree.Element("page") + # page_el.set("string", "加签人员") # 设置页面标签 + # page_el.set("invisible", "1") # todo domain + # field_m2m_el = etree.Element("field") + # field_m2m_el.set("name", "approval_sign_ids") + # field_m2m_el.set("widget", "many2many_tags") + # page_el.append(field_m2m_el) + # notebook_el.append(page_el) res["arch"] = etree.tostring(arch, encoding="unicode").replace("\t", "") return res diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index 1707e215c..f7779c856 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -294,9 +294,9 @@ class IssueLibrary(models.Model): def all_meeting_issue(self): issue_active_ids = self.env["issue.library"].browse(self._context.get('active_ids', self._context.get('active_id'))) - # for record in issue_active_ids: - # if record.state != 'will': - # raise UserError("当前状态不允许上会") + for record in issue_active_ids: + if record.state != 'will': + raise UserError("当前状态不允许上会") issue_details = [] for issue in issue_active_ids: issue_details.append((0, 0, { diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py index 3241a3d9e..7543efc95 100644 --- a/yuthon_will_task/models/yuthon_will_task.py +++ b/yuthon_will_task/models/yuthon_will_task.py @@ -201,7 +201,7 @@ class YuthonWillTask(models.Model): will_id = task.yuthon_will_task_id for employee_id in will_id.employee_ids: url = f'https://oa.thtzjt.com/webh5#/journey?id={will_id.id}' - data_date = '时间:' + task.task_time + '\n' + data_date = '时间:' + task.reminder_time + '\n' data_name = "事项名称: " + task.yuthon_will_task_id.name + '\n' data_user_ids = '参与人: ' + ', '.join(will_id.employee_ids.mapped('name')) + '\n' data_employee_id = ('司机:' + ', '.join(will_id.employee_ids2.mapped('name')) + '\n') if will_id.employee_ids2 else ''