diff --git a/yuthon_salary/models/yuthon_salary_active.py b/yuthon_salary/models/yuthon_salary_active.py index 801eb414c..a3f3e057f 100644 --- a/yuthon_salary/models/yuthon_salary_active.py +++ b/yuthon_salary/models/yuthon_salary_active.py @@ -89,7 +89,7 @@ class YuthonSalaryActive(models.Model): self.write({'confirm_status': 'confirm'}) def payslip_transmit(self): - url="https://phone.thtzjt.com/phone/Salary/153/23" + url=f"https://phone.thtzjt.com/phone/Salary/{self.id}" self.sudo().env["wecom.apps"].sync_send_message_textcard( category='salary', user_id=self.employee_id.wecom_userid, url=url, title='工资条', description=f"{self.select_year}年{self.select_time}月的薪资条已经发放", btntxt="查看详情" diff --git a/yuthon_salary/static/others/salary_party.xlsx b/yuthon_salary/static/others/salary_party.xlsx index f401ca43e..51d919bf2 100644 Binary files a/yuthon_salary/static/others/salary_party.xlsx and b/yuthon_salary/static/others/salary_party.xlsx differ diff --git a/yuthon_salary/wizard/salary_party_wizard.py b/yuthon_salary/wizard/salary_party_wizard.py index 6486669cc..3777e1880 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 = str(row[0].value).replace("年", "").strip() - select_time = str(row[1].value).replace("月", "").strip() + select_year = int(row[0].value) + select_time = 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