From f53dce985b65b90caf61335798bd8afbd4fa3fbb 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, 20 Jan 2026 14:54:47 +0800 Subject: [PATCH 01/13] =?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_issue/models/issue_library.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index 4c50530ee..a435288a0 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -267,7 +267,7 @@ class IssueLibrary(models.Model): if push_update_vals: rec.write(push_update_vals) rec.write({ - 'issue_state': 'will' + 'issue_state': 'to_approval' }) @api.onchange('is_legal_trial') From bc46d56ea4a10caba2c6cd54a04175e086111873 Mon Sep 17 00:00:00 2001 From: pengyuthon Date: Tue, 20 Jan 2026 15:03:53 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_notice/controllers/main.py | 1 - yuthon_will_task/controllers/main.py | 10 +- yuthon_will_task/models/yuthon_will_task.py | 3 +- .../views/yuthon_will_task_views.xml | 221 ++++++++++-------- 4 files changed, 126 insertions(+), 109 deletions(-) diff --git a/yuthon_notice/controllers/main.py b/yuthon_notice/controllers/main.py index e44836b81..e96b2f977 100644 --- a/yuthon_notice/controllers/main.py +++ b/yuthon_notice/controllers/main.py @@ -55,7 +55,6 @@ class YuthonNotice(http.Controller): @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([]) - data_list = [] for notice in notice_ids: result = { diff --git a/yuthon_will_task/controllers/main.py b/yuthon_will_task/controllers/main.py index 70a002f65..7a3983343 100644 --- a/yuthon_will_task/controllers/main.py +++ b/yuthon_will_task/controllers/main.py @@ -73,12 +73,12 @@ class YuthonWillTask(http.Controller): @http.route('/will/task/list', methods=['POST'], type='http', auth='public', csrf=False) def will_task_list(self, **kwargs): - employee_id = kwargs.get('employee_id') + employee_id = request.env['hr.employee'].search([('user_id', '=', int(kwargs.get('users_id')))]) start = kwargs.get('start') request_hour_selection = request.env['yuthon.will.task'].sudo().fields_get(allfields=['request_hour_from'])['request_hour_from']['selection'] result_list = [] - # for task in request.env['yuthon.will.task'].sudo().search(['|', ('employee_ids', 'in', [employee_id]), ('employee_id.id', '=', employee_id)]): - task_ids = request.env['yuthon.will.task'].sudo().search([], offset=start, limit=7) + # task_ids = request.env['yuthon.will.task'].sudo().search([], offset=start, limit=20) + task_ids = request.env['yuthon.will.task'].sudo().search(['|', ('employee_ids', 'in', employee_id.id), ('employee_id.id', '=', employee_id.id)], offset=start, limit=20) for task in task_ids: weekday_str = ["周一", "周二", "周三", "周四", "周五", "周六", "周日"][task.start_date.weekday()] result = { @@ -106,9 +106,7 @@ class YuthonWillTask(http.Controller): def will_task_record(self, **kwargs): task_id = kwargs.get('id') task = request.env['yuthon.will.task'].sudo().search([('id', '=', task_id)]) - request_hour_selection = request.env['yuthon.will.task'].sudo().fields_get(allfields=['request_hour_from'])['request_hour_from'][ - 'selection'] - + request_hour_selection = request.env['yuthon.will.task'].sudo().fields_get(allfields=['request_hour_from'])['request_hour_from']['selection'] file_list = [] pdf = ['application/pdf'] for file in task.document_ids: diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py index dfd4db07f..cabbbc7c0 100644 --- a/yuthon_will_task/models/yuthon_will_task.py +++ b/yuthon_will_task/models/yuthon_will_task.py @@ -11,6 +11,7 @@ class YuthonWillTask(models.Model): _name = 'yuthon.will.task' _description = '日程' _rec_name = 'name' + _order = 'start_date' time_list = [ ('0', '0:00'), ('0.25', '0:15'), ('0.5', '0:30'), ('0.75', '0:45'), @@ -39,7 +40,7 @@ class YuthonWillTask(models.Model): ('23', '23:00'), ('23.25', '23:15'), ('23.5', '23:30'), ('23.75', '23:45')] request_hour_from = fields.Selection(time_list, string='开始时间', default='9') request_hour_to = fields.Selection(time_list, string='结束时间', default='18') - priority = fields.Selection([('important', '重要不紧急'),('urgent', '紧急不重要'), ('very_urgent', '重要且紧急')], string='优先级') + priority = fields.Selection([('important', '重要不紧急'), ('urgent', '紧急不重要'), ('very_urgent', '重要且紧急')], string='优先级') code = fields.Char(string="任务编号", default=lambda self: self.env['ir.sequence'].next_by_code('task_code')) user_id = fields.Many2one('res.users', string="创建人", default=lambda self: self.env.user) company_id = fields.Many2one('res.company', string="公司", default=lambda self: self.env.company) diff --git a/yuthon_will_task/views/yuthon_will_task_views.xml b/yuthon_will_task/views/yuthon_will_task_views.xml index ba66cb633..19376888b 100644 --- a/yuthon_will_task/views/yuthon_will_task_views.xml +++ b/yuthon_will_task/views/yuthon_will_task_views.xml @@ -5,29 +5,32 @@ yuthon.will.task - + - - - + + + - - - - -