!8377 Merge remote-tracking branch 'origin/dev' into dev
Merge pull request !8377 from 李鹏宇/dev
This commit is contained in:
@@ -52,4 +52,7 @@
|
||||
.o_form_view {
|
||||
padding-bottom: 80px; // 为底部悬浮栏预留空间
|
||||
}
|
||||
.o_content .o_form_statusbar {
|
||||
position: relative; !important;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,8 +8,11 @@ from urllib.parse import quote
|
||||
class YuthonWillTask(http.Controller):
|
||||
|
||||
@http.route('/party/list', methods=['POST'], type='http', auth='public', csrf=False)
|
||||
def party_list(self, **kwargs):
|
||||
party_ids = request.env['yuthon.salary.party'].sudo().search([('employee_id.id', '=', kwargs.get('employee_id'))])
|
||||
def party_list(self, **kw):
|
||||
users_id = int(kw.get('users_id'))
|
||||
user = request.env['res.users'].sudo().browse(int(users_id))
|
||||
employee_id = user.with_company(user.company_id.id).employee_id.id
|
||||
party_ids = request.env['yuthon.salary.party'].sudo().search([('employee_id.id', '=', employee_id)])
|
||||
data_list = []
|
||||
for party in party_ids:
|
||||
result = {
|
||||
@@ -35,8 +38,11 @@ class YuthonWillTask(http.Controller):
|
||||
return json.dumps({'code': 200, 'message': 'OK'})
|
||||
|
||||
@http.route('/meal/list', methods=['POST'], type='http', auth='public', csrf=False)
|
||||
def meal_list(self, **kwargs):
|
||||
meal_ids = request.env['yuthon.meal.expenses'].sudo().search([('employee_id.id', '=', kwargs.get('employee_id'))])
|
||||
def meal_list(self, **kw):
|
||||
users_id = int(kw.get('users_id'))
|
||||
user = request.env['res.users'].sudo().browse(int(users_id))
|
||||
employee_id = user.with_company(user.company_id.id).employee_id.id
|
||||
meal_ids = request.env['yuthon.meal.expenses'].sudo().search([('employee_id.id', '=', employee_id)])
|
||||
data_list = []
|
||||
for meal in meal_ids:
|
||||
result = {
|
||||
|
||||
Reference in New Issue
Block a user