添加功能

soong_workflow/models/soong_workflow_mixin.py

@@ -982,14 +982,14 @@ class SoongWorkflowMixin(models.AbstractModel):
             else:
                 notebook_el = etree.Element("notebook")
                 sheet_el.append(notebook_el)
-            page_el = etree.Element("page")
-            page_el.set("string", "加签人员")  # 设置页面标签
-            page_el.set("invisible", "1")  # todo domain
-            field_m2m_el = etree.Element("field")
-            field_m2m_el.set("name", "approval_sign_ids")
-            field_m2m_el.set("widget", "many2many_tags")
-            page_el.append(field_m2m_el)
-            notebook_el.append(page_el)
+            # page_el = etree.Element("page")
+            # page_el.set("string", "加签人员")  # 设置页面标签
+            # page_el.set("invisible", "1")  # todo domain
+            # field_m2m_el = etree.Element("field")
+            # field_m2m_el.set("name", "approval_sign_ids")
+            # field_m2m_el.set("widget", "many2many_tags")
+            # page_el.append(field_m2m_el)
+            # notebook_el.append(page_el)
         res["arch"] = etree.tostring(arch, encoding="unicode").replace("\t", "")
         return res
 

yuthon_issue/models/issue_library.py

@@ -294,9 +294,9 @@ class IssueLibrary(models.Model):
 
     def all_meeting_issue(self):
         issue_active_ids = self.env["issue.library"].browse(self._context.get('active_ids', self._context.get('active_id')))
-        # for record in issue_active_ids:
-        #     if record.state != 'will':
-        #         raise UserError("当前状态不允许上会")
+        for record in issue_active_ids:
+            if record.state != 'will':
+                raise UserError("当前状态不允许上会")
         issue_details = []
         for issue in issue_active_ids:
             issue_details.append((0, 0, {

yuthon_will_task/models/yuthon_will_task.py

@@ -201,7 +201,7 @@ class YuthonWillTask(models.Model):
                 will_id = task.yuthon_will_task_id
                 for employee_id in will_id.employee_ids:
                     url = f'https://oa.thtzjt.com/webh5#/journey?id={will_id.id}'
-                    data_date = '时间:' + task.task_time + '\n'
+                    data_date = '时间:' + task.reminder_time + '\n'
                     data_name = "事项名称: " + task.yuthon_will_task_id.name + '\n'
                     data_user_ids = '参与人: ' + ', '.join(will_id.employee_ids.mapped('name')) + '\n'
                     data_employee_id = ('司机:' + ', '.join(will_id.employee_ids2.mapped('name')) + '\n') if will_id.employee_ids2 else ''