diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index 74d7e599b..a5c4de307 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -229,19 +229,18 @@ class SoongWorkflowRecord(models.Model):
@api.model
def get_view(self, view_id=None, view_type='form', **options):
"""在视图加载时检查当前用户是否在经办人列表中，并更新状态"""
- if options.get('action_id') == 3236 or options.get('action_id') == 3996:
- current_employee = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
- if current_employee:
- all_records = self.search([])
- # 更新当前用户经办的记录为"待办"
- user_records = all_records.search([
- ('employee_ids', 'in', current_employee.id),
- ])
- user_records.write({'soong_state': 'to_do'})
+ current_employee = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
+ if current_employee:
+ all_records = self.search([])
+ # 更新当前用户经办的记录为"待办"
+ user_records = all_records.search([
+ ('employee_ids', 'in', current_employee.id),
+ ])
+ user_records.write({'soong_state': 'to_do'})
- # 更新其他记录为"已办"
- other_records = all_records - user_records
- other_records.write({'soong_state': 'done'})
+ # 更新其他记录为"已办"
+ other_records = all_records - user_records
+ other_records.write({'soong_state': 'done'})
return super(SoongWorkflowRecord, self).get_view(view_id, view_type, **options)
diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index 9a1b53dff..c03a8c85c 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -188,17 +188,17 @@
-
- 我的流程
- ir.actions.act_window
- soong.workflow.record
- tree,kanban,search
-
- {'header_search_default_approve_state': 1, 'header_search_default_to_do':1, 'check_employee': 1}
- [('users_ids', 'in', uid), ('reclaim_state', '=', False)]
-
-
-
+
+
+
+
+
+
+
+
+
+
+
待办
ir.actions.act_window
diff --git a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py
index 8d146cc39..f38fb3f21 100644
--- a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py
@@ -43,7 +43,7 @@ class YuthonReassignmentApproval(models.Model):
#异动信息
change_kind = fields.Selection([('promoted', '晋升'), ('demoted', '降职'), ('leveling', '平级调整'), ('seconded', '借调')], default="promoted", string="异动类型")
change_reason = fields.Text(string="异动原因")
- change_company_id = fields.Many2one('res.company', string="异动公司", default=lambda self: self.env.user.company_id)
+ change_company_id = fields.Many2one('res.company', string="异动公司")
change_date = fields.Date(string="调动日期", default=lambda self: fields.Date.today())
handover_date = fields.Date(string="移交日期", default=lambda self: fields.Date.today())
handover_person_id = fields.Many2one("hr.employee", string="工作交接人")
diff --git a/yuthon_purchase/data/process_code_data.xml b/yuthon_purchase/data/process_code_data.xml
new file mode 100644
index 000000000..19cda0b0e
--- /dev/null
+++ b/yuthon_purchase/data/process_code_data.xml
@@ -0,0 +1,10 @@
+
+
+
+ 采购订单-编号
+ purchase_workflow_approval_code
+ CGOU%(y)s%(month)s%(day)s
+ 3
+
+
+
diff --git a/yuthon_purchase/models/purchase_workflow.py b/yuthon_purchase/models/purchase_workflow.py
index a75507a7a..5ea9e7a37 100644
--- a/yuthon_purchase/models/purchase_workflow.py
+++ b/yuthon_purchase/models/purchase_workflow.py
@@ -7,7 +7,7 @@ class PurchaseWorkflow(models.Model):
_description = '采购审批单'
_inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
- code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('purchase_order_sequence_code'))
+ code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('purchase_workflow_approval_code'))
name = fields.Char(string="标题")
name_title = fields.Char(string="默认标题", default=lambda self: self._description, readonly=True)
user_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user, required=True)
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index e8d2d1562..839106392 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -671,21 +671,21 @@
parent="holiday_manage_menu_root_board"
action="soong_workflow.action_kklw_workflow_approval_request"
sequence="1"/>
-
+
+
+
+
+
+ sequence="4"/>
+ sequence="4"/>