From 0fb09241b7a8c38db8079632871ffcae6a590112 Mon Sep 17 00:00:00 2001 From: pengyuthon Date: Mon, 29 Dec 2025 09:45:48 +0800 Subject: [PATCH] 1 --- .../views/login_layout.xml | 10 +++--- yuthon_base/controllers/phone.py | 34 ++++++++++++++----- yuthon_tianhe/views/left_login_template.xml | 6 ++-- yuthon_tianhe/views/right_login_template.xml | 6 ++-- yuthon_will_task/controllers/main.py | 20 +++++++++++ 5 files changed, 56 insertions(+), 20 deletions(-) diff --git a/sh_backmate_theme_adv_enterprise/views/login_layout.xml b/sh_backmate_theme_adv_enterprise/views/login_layout.xml index 76d065c94..4f2a41fc7 100644 --- a/sh_backmate_theme_adv_enterprise/views/login_layout.xml +++ b/sh_backmate_theme_adv_enterprise/views/login_layout.xml @@ -196,7 +196,7 @@ -
+ @@ -242,7 +242,7 @@ -
+ @@ -299,7 +299,7 @@ -
+ @@ -361,7 +361,7 @@ -
+ @@ -403,7 +403,7 @@ -
+
diff --git a/yuthon_base/controllers/phone.py b/yuthon_base/controllers/phone.py index f7d911fbf..a43385493 100644 --- a/yuthon_base/controllers/phone.py +++ b/yuthon_base/controllers/phone.py @@ -34,17 +34,28 @@ class YuThonPhone(http.Controller): # return json.dumps(return_data) user_id = request.env['res.users'].sudo().browse(uid) employee_id = user_id.with_company(user_id.company_id.id).employee_id - applet_security_setting_ids = request.env['applet.security'].search([('employee_id', '=', employee_id.id)]).applet_security_setting_ids - access_list = [access.name for access in applet_security_setting_ids] - # data = {'name': employee_id.name, 'id': user_id.id, 'access': access_list, 'phone': employee_id.mobile_phone} - data = {'name': employee_id.name, 'id': user_id.id, - 'access': ['OA', '抄表', '日程', '通知公告', '工作流', '薪资条', '考勤确认单', '物业账单', '报事报修', '用餐收集', '信息表收集', '财务表收集', '关于', '我的'], - 'phone': employee_id.mobile_phone} - _logger.info(f"接口人{employee_id.name}权限{access_list}__用户id: {user_id}________") + applet_security_setting_ids = request.env['applet.security'].search( + [('employee_id', '=', employee_id.id)]).applet_security_setting_ids + # access_list = [access.name for access in applet_security_setting_ids] + access_list = ['OA', '抄表', '日程', '通知公告', '工作流', '薪资条', '考勤确认单', '物业账单', '报事报修', + '用餐收集', '信息表收集', '财务表收集', '关于', '我的'] + company_list = [] + for company in user_id.company_ids: + company_dict = { + 'state': 1, + 'company_id': company.id, + 'company_name': company.name, + } + company_list.append(company_dict) + data = { + 'name': employee_id.name, + 'id': user_id.id, + 'access': access_list, + 'phone': employee_id.mobile_phone, + 'company_data': company_list, + } return json.dumps({'data': data, 'code': 200, 'message': ''}) - - # 我的 @http.route('/phone/myself', type='http', auth="none", csrf=False, cors='*') def phone_myself(self, **kw): @@ -65,3 +76,8 @@ class YuThonPhone(http.Controller): } return json.dumps({'data': data, 'code': 200, 'message': ''}) + @http.route('/phone/base', type='http', auth="none", csrf=False, cors='*') + def phone_base(self, **kw): + company_id = kw.get('company_id') + employee_id = request.env['hr.employee'].sudo().search([('user_id.id', '=', kw.get('user_id'))]) + diff --git a/yuthon_tianhe/views/left_login_template.xml b/yuthon_tianhe/views/left_login_template.xml index c350982cb..c99a94eaa 100644 --- a/yuthon_tianhe/views/left_login_template.xml +++ b/yuthon_tianhe/views/left_login_template.xml @@ -67,9 +67,9 @@ 还没有账户? 重置密码 -
- -
+ + + diff --git a/yuthon_tianhe/views/right_login_template.xml b/yuthon_tianhe/views/right_login_template.xml index d08ce57ca..b25d59f4e 100644 --- a/yuthon_tianhe/views/right_login_template.xml +++ b/yuthon_tianhe/views/right_login_template.xml @@ -68,9 +68,9 @@ 还没有账户? 重置密码 -
- -
+ + + diff --git a/yuthon_will_task/controllers/main.py b/yuthon_will_task/controllers/main.py index 6a846781b..57e74f74b 100644 --- a/yuthon_will_task/controllers/main.py +++ b/yuthon_will_task/controllers/main.py @@ -134,3 +134,23 @@ class YuthonWillTask(http.Controller): 'code': 200, 'message': 'success' }) + + @http.route('/will/task/create', methods=['POST'], type='http', auth='public', csrf=False) + def will_task_create(self, **kwargs): + """ + 手机端创建日程接口 + """ + request.env['yuthon.will.task'].sudo().create({ + 'name': kwargs.get('name'), + 'employee_id': kwargs.get('id'), + 'employee_ids': kwargs.get('id'), + 'start_date': kwargs.get('id'), + 'request_hour_from': '', + 'request_hour_to': '', + 'remarks': kwargs.get('remarks'), + 'address': kwargs.get('address'), + }) + return json.dumps({ + 'code': 200, + 'message': '数据创建成功' + })