From b091e5cd6f883a7487ff03829773bb48e9b1ec8d Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Tue, 15 Apr 2025 11:44:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docx_report_pro/views/views.xml | 11 +++++++---- soong_workflow/models/soong_workflow_record.py | 3 ++- .../wizard/soong_workflow_comment_wizard.py | 6 +++--- yuthon_hr_attendance/models/hr_attendance.py | 9 ++++----- .../models/property_lease_contract.py | 2 +- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/docx_report_pro/views/views.xml b/docx_report_pro/views/views.xml index cbcd4bb78..f4ef16ed6 100644 --- a/docx_report_pro/views/views.xml +++ b/docx_report_pro/views/views.xml @@ -15,13 +15,13 @@ + invisible="report_type not in ['docx']" string="报表模板"/> + invisible="report_type not in ['docx']" string="输出报告类型"/> - - + + Change rights and give all users access + writing to the directory you want the documents to be saved in: /tmp/backups

 + + 报表类型 + diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py index f64d065ac..b47eb5ab8 100644 --- a/soong_workflow/models/soong_workflow_record.py +++ b/soong_workflow/models/soong_workflow_record.py @@ -86,9 +86,9 @@ class SoongWorkflowRecord(models.Model): # 催办 def reminders_record(self): record_id = self.env[self.res_model].search([('id', '=', self.res_id)]) - url = "https://oa.thtzjt.com/mail/view?model={}&res_id={}".format(self.res_model, record_id.id) for rec in record_id.log_ids: if rec.approval_state in ['0', '1']: + url = f'https://oa.thtzjt.com/web?oauth_access_token={rec.done_by.employee_id.user_id.oauth_access_token}&oauth_uid={rec.done_by.employee_id.user_id.oauth_uid}#id={self.id}&cids=2&action={record_id.action.id}&model={self.res_model}&view_type=from&menu_id={record_id.id}' description = "标题: {}\n".format(record_id.name) + self.env.user.name + ' ' + str(fields.Datetime.now() + timedelta(hours=8)) self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id=rec.done_by.employee_id.wecom_userid, title=record_id._description + '催办传阅/抄送，请尽快处理', @@ -96,6 +96,7 @@ class SoongWorkflowRecord(models.Model): btntxt="查看详情") for rec in record_id.log_ids2: if rec.approval_state == '0': + url = f'https://oa.thtzjt.com/web?oauth_access_token={rec.done_by.employee_id.user_id.oauth_access_token}&oauth_uid={rec.done_by.employee_id.user_id.oauth_uid}#id={self.id}&cids=2&action={record_id.action.id}&model={self.res_model}&view_type=from&menu_id={record_id.id}' description = "标题: {}\n".format(record_id.name) + self.env.user.name + ' ' + str(fields.Datetime.now() + timedelta(hours=8)) self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id=rec.done_by.employee_id.wecom_userid, title=record_id._description + '催办传阅/抄送，请尽快查看', diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 68eb4bea7..bc667fc21 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -171,7 +171,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): "node_btn_id": self.node_btn_id.id, "approval_state": "0", }) - url = "https://oa.thtzjt.com/mail/view?model={}&res_id={}".format(self.res_model, record_id.id) + url = f'https://oa.thtzjt.com/web?oauth_access_token={employee.user_id.oauth_access_token}&oauth_uid={employee.user_id.oauth_uid}#id={self.id}&cids=2&action={record_id.action.id}&model={self.res_model}&view_type=from&menu_id={record_id.id}' description = "标题: {}\n".format(record_id.name) + self.env.user.name + ' ' + str( fields.Datetime.now() + timedelta(hours=8)) self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', @@ -248,7 +248,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): "node_btn_id": self.node_btn_id.id, "approval_state": "0", }) - url = "https://oa.thtzjt.com/mail/view?model={}&res_id={}".format(self.res_model, record_id.id) + url = f'https://oa.thtzjt.com/web?oauth_access_token={employee.user_id.oauth_access_token}&oauth_uid={employee.user_id.oauth_uid}#id={self.id}&cids=2&action={record_id.action.id}&model={self.res_model}&view_type=from&menu_id={record_id.id}' description = "标题: {}\n".format(record_id.name) + self.env.user.name + ' ' + str( fields.Datetime.now() + timedelta(hours=8)) self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', @@ -264,8 +264,8 @@ class SoongWorkflowCommentWizard(models.TransientModel): log_ids[-1].unlink() log_ids[-2].write({'approval_state': '1'}) record_id.write({'state': log_ids[-2].name}) - url = 'https://oa.thtzjt.com/mail/view?model={}&res_id={}'.format(self._name, record_id.id) for employee in self.employee_ids: + url = f'https://oa.thtzjt.com/web?oauth_access_token={employee.user_id.oauth_access_token}&oauth_uid={employee.user_id.oauth_uid}#id={self.id}&cids=2&action={record_id.action.id}&model={self._name}&view_type=from&menu_id={record_id.id}' self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id=employee.wecom_userid, title=self._description, diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py index 298398848..38af77a91 100644 --- a/yuthon_hr_attendance/models/hr_attendance.py +++ b/yuthon_hr_attendance/models/hr_attendance.py @@ -96,10 +96,10 @@ class HrAttendance(models.Model): is_early_card += 1 if i.is_no_card: is_late_card += 1 - str = 'https://oa.thtzjt.com/web#action={}&model=hr.attendance&view_type=list&cids=1&menu_id={}'.format(action_id.id, menu_id.id) + url = f'https://oa.thtzjt.com/web?oauth_access_token={rec.employee_id.user_id.oauth_access_token}&oauth_uid={rec.employee_id.user_id.oauth_uid}#id={self.id}&cids=2&action={menu_id.action.id}&model=hr.attendance&view_type=from&menu_id={menu_id.id}' self.sudo().env["wecom.apps"].sync_send_message_textcard(category='att', user_id=rec.employee_id.wecom_userid, title="打卡异常提醒", description="本月迟到: {}\n本月缺卡: {}\n本月早退: {}\n".format(is_late_card, is_no_card, is_early_card), - url=str, btntxt="详细信息") + url=url, btntxt="详细信息") def button_leave(self): form_id = self.env.ref('yuthon_holiday.view_hr_leave_batch_form').id @@ -275,12 +275,11 @@ class HrAttendance(models.Model): employee_ids = self.env['hr.employee'].search([('department_id.name', '=', '办公室')]) menu_id = self.env['ir.ui.menu'].search([('name', '=', '我的异常')]) for employee_id in employee_ids: - str = 'https://oa.thtzjt.com/web#action={}&model=hr.attendance&view_type=list&cids=1&menu_id={}'.format( - menu_id.action_id.id, menu_id.id) + url = f'https://oa.thtzjt.com/web?oauth_access_token={employee_id.user_id.oauth_access_token}&oauth_uid={employee_id.user_id.oauth_uid}#id={self.id}&cids=2&action={menu_id.action.id}&model=hr.attendance&view_type=from&menu_id={menu_id.id}' self.sudo().env["wecom.apps"].sync_send_message_textcard(category='att', user_id=employee_id.wecom_userid, title="打卡异常提醒", description="异常提醒", - url=str, btntxt="详细信息") + url=url, btntxt="详细信息") # 保安部 - 白班 def ba_card_white_up(self): diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py index d0983af42..8acf6c6c0 100644 --- a/yuthon_property_approval/models/property_lease_contract.py +++ b/yuthon_property_approval/models/property_lease_contract.py @@ -36,7 +36,7 @@ class PropertyTenantLine(models.Model): class PropertyLeaseContract(models.Model): _name = 'property.lease.contract' _description = '租赁合同审批' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + # _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] _rec_name = 'contract_code' name = fields.Char(string='物业信息')