diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 8ef2c10fa..06712ab76 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -453,7 +453,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
# url = self.sudo().env["wecom.apps"].generate_oauth_login_url(target_url, category='oa')
# _logger.info(f"===================当前的url为{url}=============================")
result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa',
- user_id=employee.wecom_userid,
+ user_id='78',
title= record_id._description if 'Purchase Order' != record_id._description else '采购订单',
description="标题: {}\n".format(
record_id.name) + self.env.user.name + ' ' + str(
@@ -688,13 +688,13 @@ class SoongWorkflowCommentWizard(models.TransientModel):
url = f'https://oa.thtzjt.com/web#id={record_id.id}&cids=2&active_id={action_id.id}&model={record_id._name}&view_type=form'
if self.res_model == 'purchase.order':
self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa',
- user_id=employee.wecom_userid,
+ user_id='78',
title='采购审批单',
description=f"{record_id.name}审批结束，可采购入库",
url=url, btntxt="查看详情")
else:
self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa',
- user_id=employee.wecom_userid,
+ user_id='78',
title=record_id._description,
description=f"标题为{record_id.name}的{record_id._description}已结束，请归档",
url=url, btntxt="查看详情")
@@ -719,7 +719,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
"done_by": self.employee_ids.user_id.id,
"node_btn_name": "0",
})
- result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id=self.employee_ids.wecom_userid, title=record_id._description, description=description, url=url, btntxt="查看详情")
+ result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id='78', title=record_id._description, description=description, url=url, btntxt="查看详情")
msg_id = result_data[-1]['msgid']
log_id.msg_id = msg_id
for emp in self.dep_manager_employee_ids:
@@ -734,7 +734,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
"done_by": emp.user_id.id,
"node_btn_name": "4",
})
- result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id=emp.wecom_userid, title=record_id._description + "承办", description=description, url=url, btntxt="查看详情")
+ result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id='78', title=record_id._description + "承办", description=description, url=url, btntxt="查看详情")
msg_id = result_data[-1]['msgid']
log_id.msg_id = msg_id
for employee in self.circulated_employee_ids:
@@ -759,7 +759,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
"node_btn_id": self.node_btn_id.id,
"approval_state": "0",
})
- result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id=emp.wecom_userid, title=record_id._description + "传阅/抄送",description=description, url=url, btntxt="查看详情")
+ result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id='78', title=record_id._description + "传阅/抄送",description=description, url=url, btntxt="查看详情")
msg_id = result_data[-1]['msgid']
log2_id.msg_id = msg_id
workflow_record_id.employee_ids = self.dep_manager_employee_ids + self.employee_ids + self.circulated_employee_ids
diff --git a/yuthon_report/views/att_report_view.xml b/yuthon_report/views/att_report_view.xml
index 1815ef437..03e459840 100644
--- a/yuthon_report/views/att_report_view.xml
+++ b/yuthon_report/views/att_report_view.xml
@@ -11,12 +11,20 @@
"model": "hr.attendance",
"method": "get_attendance_report",
"columns": [
- {"headerName": "员工", "field": "员工", "flex": 1},
- {"headerName": "天数", "field": "天数", "flex": 1},
- {"headerName": "类型", "field": "类型", "flex": 1},
- {"headerName": "流程", "field": "流程", "flex": 1},
- {"headerName": "公司", "field": "公司", "flex": 1}
- ]
+ {"headerName": "审批类型", "field": "审批类型", "flex": 1},
+ {"headerName": "性别", "field": "性别", "flex": 1},
+ {"headerName": "标题", "field": "标题", "flex": 1},
+ {"headerName": "摘要", "field": "摘要", "flex": 1},
+ {"headerName": "发起人", "field": "发起人", "flex": 1},
+ {"headerName": "开始时间", "field": "开始时间", "flex": 1},
+ {"headerName": "结束时间", "field": "结束时间", "flex": 1},
+ {"headerName": "请假时长", "field": "请假时长", "flex": 1},
+ {"headerName": "请假统计", "field": "请假统计", "flex": 1},
+ {"headerName": "申请原因", "field": "申请原因", "flex": 1},
+ {"headerName": "发起时间", "field": "发起时间", "flex": 1},
+ {"headerName": "最后操作时间", "field": "最后操作时间", "flex": 1},
+ {"headerName": "审批状态", "field": "审批状态", "flex": 1}
+ ]
}
}
@@ -32,10 +40,7 @@
"method": "get_meal_fee_report",
"columns": [
{"headerName": "员工", "field": "员工", "flex": 1},
- {"headerName": "类型", "field": "类型", "flex": 1},
{"headerName": "次数", "field": "次数", "flex": 1},
- {"headerName": "流程", "field": "流程", "flex": 1},
- {"headerName": "公司", "field": "公司", "flex": 1}
]
}
}
@@ -52,12 +57,14 @@
"method": "get_overtime_report",
"columns": [
{"headerName": "员工", "field": "员工", "flex": 1},
- {"headerName": "类型", "field": "类型", "flex": 1},
- {"headerName": "补偿方式", "field": "补偿方式", "flex": 1},
- {"headerName": "加班类型", "field": "加班类型", "flex": 1},
- {"headerName": "时长（小时）", "field": "时长（小时）", "flex": 1},
- {"headerName": "流程", "field": "流程", "flex": 1},
- {"headerName": "公司", "field": "公司", "flex": 1}
+ {"headerName": "部门", "field": "员工", "flex": 1},
+ {"headerName": "加班时间", "field": "加班时间", "flex": 1},
+ {"headerName": "结转日期", "field": "结转日期", "flex": 1},
+ {"headerName": "结转时长", "field": "结转时长", "flex": 1},
+ {"headerName": "结转结果", "field": "结转结果", "flex": 1},
+ {"headerName": "有效期", "field": "有效期", "flex": 1},
+ {"headerName": "结转状态", "field": "结转状态", "flex": 1},
+ {"headerName": "剩余数", "field": "剩余数", "flex": 1}
]
}
}
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index 11395975f..1149031dc 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -165,21 +165,21 @@
action="yuthon_hr_attendance.view_yuthon_vacation_reports_action"
sequence="14"/>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+