!2653 !2652 添加功能

Merge pull request !2653 from 李鹏宇/dev

soong_workflow/models/soong_workflow_log.py

@@ -23,7 +23,7 @@ class SoongWorkflowLog(models.Model):
     node_btn_name = fields.Selection([('0', ' '), ('1', '退回'), ('2', '加签')], string='节点功能', default='0')
     done_by = fields.Many2one(comodel_name="res.users", string="审批人")
     lase_click_date = fields.Datetime(string="操作时间")
-    approval_state = fields.Selection([('0', '待办'), ('1', '办理中'), ('2', '已办结'), ('3', '结束')], string='审批状态', default='0')
+    approval_state = fields.Selection([('0', '待办'), ('1', '办理中'), ('2', '已办结'), ('3', '结束')], string='状态', default='0')
     comment = fields.Char(string="意见")
     date_create = fields.Datetime(string="时间", default=lambda self: fields.Datetime.now())
     active = fields.Boolean(string="归档", default=True)
@@ -61,7 +61,7 @@ class SoongWorkflowLog2(models.Model):
     sequence = fields.Integer(string="序号", compute="_compute_sequence")
     done_by = fields.Many2one(comodel_name="res.users", string="审批人")
     name = fields.Char(string="节点名称", compute="_compute_name", store=True)
-    approval_state = fields.Selection([('0', '未读'), ('1', '已读')], string='审批状态', default='0')
+    approval_state = fields.Selection([('0', '未读'), ('1', '已读')], string='状态', default='0')
     lase_click_date = fields.Datetime(string="操作时间")
 
     @api.depends("workflow_id", "node_id", "node_btn_id")

soong_workflow/models/soong_workflow_mixin.py

@@ -28,7 +28,8 @@ class SoongWorkflowMixin(models.AbstractModel):
         workflow_records = self.env['soong.workflow.record'].search([('name', '=', self.name)])
         for record in workflow_records:
             for field, value in vals.items():
-                setattr(record, field, value)
+                if hasattr(record, field):
+                    setattr(record, field, value)
         return res
 
     @api.model

soong_workflow/models/soong_workflow_record.py

@@ -30,9 +30,9 @@ class SoongWorkflowRecord(models.Model):
     res_id = fields.Integer(string="Res ID", required=True)
     users_ids = fields.Many2many('res.users', string="用户")
     employee_ids = fields.Many2many('hr.employee', string="当前经办人")
-    workflow_id = fields.Many2one(comodel_name="soong.workflow", string="审批类型", ondelete="restrict")
+    workflow_id = fields.Many2one(comodel_name="soong.workflow", string="类型", ondelete="restrict")
     node_id = fields.Many2one(comodel_name="soong.workflow.node", string="当前节点")
-    approve_state = fields.Selection([("start", "草稿"), ("pending", "审批中"), ("end", "结束")], default="start", string="审批状态")
+    approve_state = fields.Selection([("start", "草稿"), ("pending", "审批中"), ("end", "结束")], default="start", string="状态")
     reclaim_state = fields.Boolean(string="回收")
     approvals_group_id = fields.Many2one(related='workflow_id.approvals_group_id', string="审批分组", store=True)
     department_id = fields.Many2one("hr.department", string="部门", required=True)

soong_workflow/models/soong_workflow_record_copy.py

@@ -14,7 +14,7 @@ class SoongWorkflowRecordCopy(models.Model):
 
     code = fields.Char(string="流水号")
     name = fields.Char(string="流程名称", store=True)
-    workflow_id = fields.Many2one(comodel_name="soong.workflow", string="审批类型", ondelete="restrict")
+    workflow_id = fields.Many2one(comodel_name="soong.workflow", string="类型", ondelete="restrict")
     res_model = fields.Char(string="Res Model", required=True)
     res_id = fields.Integer(string="Res ID", required=True)
     done_by = fields.Many2one(comodel_name="res.users", string="抄送/传阅人")

soong_workflow/views/menuitem.xml

@@ -16,6 +16,11 @@
                   parent="menu_soong_workflow_root"
                   action="soong_workflow_record_action"
                   sequence="3"/>
+       <menuitem id="menu_soong_workflow_other_record"
+                  name="流程查询"
+                  parent="menu_soong_workflow_root"
+                  action="soong_workflow_other_record_action"
+                  sequence="4"/>
         <menuitem id="menu_workflow_approval_request_copy"
                   name="抄送/传阅流程"
                   parent="menu_soong_workflow_root"
@@ -27,15 +32,10 @@
                   action="soong_workflow_record_action_admin"
                   sequence="11"/>
         <menuitem id="menu_soong_workflow_hr_employee"
-                  name="人事相关流程"
+                  name="人力相关流程"
                   parent="menu_soong_workflow_root"
                   action="soong_workflow_hr_employee_action"
                   sequence="11"/>
-        <menuitem id="menu_soong_workflow_other_record"
-                  name="流程查询"
-                  parent="menu_soong_workflow_root"
-                  action="soong_workflow_other_record_action"
-                  sequence="11"/>
         <menuitem id="menu_soong_workflow_entrust"
                   sequence="13"
                   name="流程委托"