diff --git a/yuthon_hr_attendance/views/go_approval.xml b/yuthon_hr_attendance/views/go_approval.xml index 0362a2727..40673ff83 100644 --- a/yuthon_hr_attendance/views/go_approval.xml +++ b/yuthon_hr_attendance/views/go_approval.xml @@ -88,11 +88,11 @@ - + - + diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index c9801f83d..e0beeff8a 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -16,7 +16,7 @@ class IssueLibrary(models.Model): topic_content = fields.Text(string='事项背景') will_based = fields.Text(string='上会依据') deliberation_content = fields.Text(string='请示事项', default='建议同意') - handling_situation = fields.Text(string='办理情况') + handling_situation = fields.Text(string='办理情况', help="(存在问题)") is_invisible_workflow = fields.Boolean(string="流程隐藏的判断") code = fields.Char(string='编号', required=True, copy=False, default=lambda self: self.env['ir.sequence'].next_by_code('issue_library_code')) diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml index ca0532338..20d6836a3 100644 --- a/yuthon_issue/views/issue_library_views.xml +++ b/yuthon_issue/views/issue_library_views.xml @@ -108,7 +108,7 @@ - + diff --git a/yuthon_issue/views/issue_meeting_minutes_views.xml b/yuthon_issue/views/issue_meeting_minutes_views.xml index 0a8db2ec5..1efc9744a 100644 --- a/yuthon_issue/views/issue_meeting_minutes_views.xml +++ b/yuthon_issue/views/issue_meeting_minutes_views.xml @@ -46,7 +46,7 @@ - + diff --git a/yuthon_salary/controllers/salary_phone.py b/yuthon_salary/controllers/salary_phone.py index 1d9e9d81a..9e9d7efbb 100644 --- a/yuthon_salary/controllers/salary_phone.py +++ b/yuthon_salary/controllers/salary_phone.py @@ -8,9 +8,26 @@ 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): - # yuthon.salary.party - pass + def party_list(self, **kwargs): + party_ids = request.env['yuthon.salary.party'].sudo().search([('employee_id.id', '=', kwargs.get('employee_id'))]) + data_list = [] + for party in party_ids: + result = { + 'id': party.id, + 'select_year': party.select_year, + 'select_time': party.select_time, + 'fee': party.fee, + 'payment': party.payment, + 'total_payment': party.total_payment, + 'toll_state': party.toll_state, + } + data_list.append(result) + return json.dumps({'data': data_list, 'code': 200, 'message': 'success'}) + + @http.route('/party/list/confirm', methods=['POST'], type='http', auth='public', csrf=False) + def meal_list_confirm(self, **kwargs): + meal_id = request.env['yuthon.salary.party'].sudo().search([('id', '=', kwargs.get('id'))]) + meal_id.write({'toll_state': 'done'}) @http.route('/meal/list', methods=['POST'], type='http', auth='public', csrf=False) def meal_list(self, **kwargs): @@ -18,13 +35,13 @@ class YuthonWillTask(http.Controller): data_list = [] for meal in meal_ids: result = { - 'year': meal.year, 'id': meal.id, - 'field': '', - 'field2': '', - 'field3': '', - 'field4': '', - 'field5': '', + 'select_year': meal.select_year, + 'select_time': meal.select_time, + 'number_breakfasts': meal.number_breakfasts, + 'number_lunches': meal.number_lunches, + 'total_payments': meal.total_payments, + 'toll_state': meal.toll_state, } data_list.append(result) return json.dumps({'data': data_list, 'code': 200, 'message': 'success'}) diff --git a/yuthon_salary/models/yuthon_salary_party.py b/yuthon_salary/models/yuthon_salary_party.py index 05590c55b..5f7a33419 100644 --- a/yuthon_salary/models/yuthon_salary_party.py +++ b/yuthon_salary/models/yuthon_salary_party.py @@ -4,7 +4,7 @@ from datetime import datetime class YuthonSalaryParty(models.Model): _name = 'yuthon.salary.party' - _description = '党建' + _description = '党费' employee_id = fields.Many2one('hr.employee', string='姓名') card = fields.Char(string='身份证') diff --git a/yuthon_salary/views/yuthon_salary_party_views.xml b/yuthon_salary/views/yuthon_salary_party_views.xml index 5bb99742d..4f9482dbe 100644 --- a/yuthon_salary/views/yuthon_salary_party_views.xml +++ b/yuthon_salary/views/yuthon_salary_party_views.xml @@ -4,7 +4,7 @@ yuthon.salary.party.tree yuthon.salary.party - + @@ -22,10 +22,10 @@ yuthon.my.salary.party.tree yuthon.salary.party - + - + @@ -36,14 +36,14 @@ - 党建 + 党费 yuthon.salary.party tree - 党建 + 党费 yuthon.salary.party tree [('employee_id.user_id', '=', uid)]