1
This commit is contained in:
@@ -99,7 +99,9 @@ export class PreviewMany2OneField extends Many2OneField {
|
||||
}
|
||||
|
||||
getExtension(file) {
|
||||
return file.name.replace(/^.*\./, "");
|
||||
if (file.name){
|
||||
return file.name.replace(/^.*\./, "");
|
||||
}
|
||||
}
|
||||
|
||||
async onExternalBtnClick() {
|
||||
|
||||
@@ -115,7 +115,9 @@ export class Many2ManyBinaryField extends Many2ManyTagsField {
|
||||
}
|
||||
|
||||
getExtension(file) {
|
||||
return file.name.replace(/^.*\./, "");
|
||||
if (file.name){
|
||||
return file.name.replace(/^.*\./, "");
|
||||
}
|
||||
}
|
||||
|
||||
async onFileUploaded(files) {
|
||||
|
||||
@@ -65,9 +65,10 @@ patch(FormController.prototype, {
|
||||
// if (this.isAdmin) {
|
||||
await this.model.root.switchMode("readonly");
|
||||
// }
|
||||
} else {
|
||||
this.model.actionService.doAction({ type: 'ir.actions.act_window_close' });
|
||||
}
|
||||
// else {
|
||||
// this.model.actionService.doAction({ type: 'ir.actions.act_window_close' });
|
||||
// }
|
||||
},
|
||||
|
||||
// async beforeLeave() {
|
||||
|
||||
@@ -19,7 +19,7 @@ class InheritRoomBooking(models.Model):
|
||||
'users_ids': [(6, 0, new_record.room_users_ids.ids)],
|
||||
'employee_ids': [(6, 0, employee_list)],
|
||||
'task_time_ids': [(6, 0, task_time_ids.ids)],
|
||||
'start_time': new_record.start_datetime,
|
||||
# 'start_time': new_record.start_datetime,
|
||||
'task_state':'will',
|
||||
'end_time': new_record.stop_datetime
|
||||
})
|
||||
|
||||
@@ -155,11 +155,12 @@ class YuthonWillTask(models.Model):
|
||||
menu_id = self.env['ir.ui.menu'].search([('name', '=', '我的日程')])
|
||||
url = f'https://oa.thtzjt.com/web?oauth_uid={employee_id.wecom_userid}#id={self.id}&cids=2&action={menu_id.action.id}&model=yuthon.will.task&view_type=form&menu_id={menu_id.id}'
|
||||
data_name = "事项名称: " + self.task_content + '\n'
|
||||
data_start_time = '开始时间:' + str(self.start_time + timedelta(hours=8)) + '\n'
|
||||
# data_start_time = '开始时间:' + str(self.start_time + timedelta(hours=8)) + '\n'
|
||||
data_user_ids = '参与人: ' + ', '.join(self.employee_ids.mapped('name')) + '\n'
|
||||
data_employee_id = ('司机:' + ', '.join(self.employee_ids2.mapped('name')) + '\n') if self.employee_ids2 else ''
|
||||
data_nota = ('备注:' + self.remarks) if self.remarks else ('') + '\n'
|
||||
data = data_name + data_start_time + data_user_ids + data_nota + data_employee_id
|
||||
# data = data_name + data_start_time + data_user_ids + data_nota + data_employee_id
|
||||
data = data_name + data_user_ids + data_nota + data_employee_id
|
||||
self.sudo().env["wecom.apps"].sync_send_message_textcard(category='task', user_id=employee_id.wecom_userid,
|
||||
title="日程事项提醒", description=data,
|
||||
url=url, btntxt="详细信息")
|
||||
|
||||
Reference in New Issue
Block a user