diff --git a/akl_multi_tab_plugin/static/src/components/multi_tab/akl_multi_tab.scss b/akl_multi_tab_plugin/static/src/components/multi_tab/akl_multi_tab.scss index 88fa81136..e455e1206 100644 --- a/akl_multi_tab_plugin/static/src/components/multi_tab/akl_multi_tab.scss +++ b/akl_multi_tab_plugin/static/src/components/multi_tab/akl_multi_tab.scss @@ -111,7 +111,7 @@ } &.active { - background-color: #f6f6f6; + background-color: #b8d7f3; } } } diff --git a/soong_workflow/__manifest__.py b/soong_workflow/__manifest__.py index 8459d9f6c..5665153ac 100644 --- a/soong_workflow/__manifest__.py +++ b/soong_workflow/__manifest__.py @@ -5,7 +5,7 @@ "author": "soong bo", "license": "AGPL-3", "version": "17.0.0.1.0", - "depends": ["base", "crnd_web_diagram_plus", "hr"], + "depends": ["base", "crnd_web_diagram_plus", "hr", 'mail'], "data": [ "data/soong_workflow_note_data.xml", "data/soong_workflow_inspector_code.xml", diff --git a/soong_workflow/data/notice_template_data.xml b/soong_workflow/data/notice_template_data.xml index 32b83688d..9d3da9201 100644 --- a/soong_workflow/data/notice_template_data.xml +++ b/soong_workflow/data/notice_template_data.xml @@ -17,4 +17,22 @@

+ + \ No newline at end of file diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index 09ddd0758..e1db1c84c 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -208,10 +208,9 @@ class SoongWorkflowMixin(models.AbstractModel): for employee in employee_ids: self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id=employee.wecom_userid, - title=self.name, - description="您有新的审批单{}请及时处理".format( - self.name), - url=url, btntxt="详情") + title=self._description, + description="您有新的审批单 {} 请及时处理\n".format(self.name) + self.env.user.name + ' ' + str(fields.Datetime.now() + timedelta(hours=8)), + url=url, btntxt="查看详情") partner_ids = employee_ids.user_id.partner_id.ids self.with_context(lang=self.env.lang)._message_auto_subscribe_notify(partner_ids, 'soong_workflow.message_soong_workflow_users_data') return btn_rec.with_context(cx).run() diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py index cf0d248a1..2f52fa101 100644 --- a/soong_workflow/models/soong_workflow_record.py +++ b/soong_workflow/models/soong_workflow_record.py @@ -25,7 +25,16 @@ class SoongWorkflowRecord(models.Model): users_ids = fields.Many2many('res.users', string="用户") 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="审批状态", compute="_compute_node_id",) + approve_state = fields.Selection([("start", "开始"), ("pending", "审批中"), ("end", "结束")], default="start", string="审批状态", compute="_compute_node_id") + reclaim_state = fields.Boolean(string="回收") + + def reclaim_record(self): + for rec in self: + rec.reclaim_state = True + + def restore_record(self): + for rec in self: + rec.reclaim_state = False @api.depends("node_id") def _compute_node_id(self): diff --git a/soong_workflow/views/menuitem.xml b/soong_workflow/views/menuitem.xml index 799c91747..b8d408646 100644 --- a/soong_workflow/views/menuitem.xml +++ b/soong_workflow/views/menuitem.xml @@ -2,24 +2,32 @@ - + + + + + + - - soong.workflow.record.tree soong.workflow.record - + + +