diff --git a/yuthon_salary/static/others/salary_party.xlsx b/yuthon_salary/static/others/党费-模板v1.0.xlsx similarity index 100% rename from yuthon_salary/static/others/salary_party.xlsx rename to yuthon_salary/static/others/党费-模板v1.0.xlsx diff --git a/yuthon_salary/wizard/salary_party_wizard.py b/yuthon_salary/wizard/salary_party_wizard.py index 3777e1880..e2476153d 100644 --- a/yuthon_salary/wizard/salary_party_wizard.py +++ b/yuthon_salary/wizard/salary_party_wizard.py @@ -24,8 +24,8 @@ class SalaryPartyWizard(models.TransientModel): self.salary_party_data(row) def salary_party_data(self, row): - select_year = int(row[0].value) - select_time = int(row[1].value) + select_year = str(int(row[0].value)) + select_time = str(int(row[1].value)) employee_id = self.env['hr.employee'].search([('identification_id', '=', row[3].value)], limit=1) card = row[3].value fee = row[4].value diff --git a/yuthon_salary/wizard/salary_party_wizard_views.xml b/yuthon_salary/wizard/salary_party_wizard_views.xml index b743419b9..670f29632 100644 --- a/yuthon_salary/wizard/salary_party_wizard_views.xml +++ b/yuthon_salary/wizard/salary_party_wizard_views.xml @@ -3,7 +3,7 @@ 模板下载 self - /yuthon_salary/static/others/salary_party.xlsx + /yuthon_salary/static/others/党费-模板v1.0.xlsx 弹窗