1

yuthon_hr_attendance/models/card_approval.py

@@ -119,17 +119,15 @@ class CardApprovals(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })
-        # elif self.related_issues_id:
-        #     raise UserError("已经创建了相关的上会记录，不能取消勾选")
 

yuthon_hr_attendance/models/duty_approval.py

@@ -43,14 +43,14 @@ class DutyApprovals(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_attendance/models/go_approval.py

@@ -70,14 +70,14 @@ class GoApprovals(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_attendance/models/overtime_approval.py

@@ -160,14 +160,14 @@ class OvertimeApprovals(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_attendance/models/remove_holiday_approval.py

@@ -36,14 +36,14 @@ class RemoveHolidayApprovals(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_attendance/models/yuthon_abnormal_approval.py

@@ -32,14 +32,14 @@ class YuthonAbnormalApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_attendance/models/yuthon_adjustments_approval.py

@@ -34,14 +34,14 @@ class YuthonAdjustmentsApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_attendance/models/yuthon_customer_approval.py

@@ -33,14 +33,14 @@ class YuthonCustomerApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_attendance/models/yuthon_shift_approval.py

@@ -41,14 +41,14 @@ class YuthonShiftApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_employee_approval/models/yuthon_appointment_approval.py

@@ -35,14 +35,14 @@ class YuthonAppointmentApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_employee_approval/models/yuthon_department_change.py

@@ -36,14 +36,14 @@ class YuthonDepartmentChange(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_employee_approval/models/yuthon_interview_approval.py

@@ -72,18 +72,17 @@ class YuthonInterviewApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search([("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })
-        elif self.related_issues_id:
-            raise UserError("已经创建了相关的上会记录，不能取消勾选")
 
 class InterviewApprovalLine(models.Model):
     _name = 'interview.approval.line'

yuthon_hr_employee_approval/models/yuthon_message_login.py

@@ -138,14 +138,14 @@ class YuthonMessageLogin(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_employee_approval/models/yuthon_onboard_approval.py

@@ -135,14 +135,14 @@ class YuthonOnboardApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_employee_approval/models/yuthon_prepare_approval.py

@@ -67,14 +67,14 @@ class YuthonPrepareApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })
@@ -120,15 +120,15 @@ class PrepareApprovalLine(models.Model):
 
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
-        self.write({'is_issues': 'Ture'})
+        if self.is_issues:
-        issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-        workflow_record_id = self.env["soong.workflow.record"].search(
-            [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-            'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-            'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py

@@ -55,14 +55,14 @@ class YuthonReassignmentApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py

@@ -33,14 +33,14 @@ class YuthonRecruitmentApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_employee_approval/models/yuthon_regularization_approval.py

@@ -58,14 +58,14 @@ class YuthonRegularizationPrepareApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_employee_approval/models/yuthon_reward_approval.py

@@ -34,14 +34,14 @@ class YuthonRewardApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_employee_approval/models/yuthon_service_approval.py

@@ -38,14 +38,14 @@ class YuthonServiceApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_hr_employee_approval/models/yuthon_transfer_approval.py

@@ -46,14 +46,14 @@ class YutransferApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_issue/__init__.py

@@ -1,3 +1,4 @@
 # -*- coding: utf-8 -*-
 
 from . import models
+from . import wizard

yuthon_issue/__manifest__.py

@@ -23,6 +23,7 @@
         'views/issue_approval_decision_type_views.xml',
         'views/issue_meeting_minutes_views.xml',
         'views/issue_library_type_views.xml',
+        'wizard/issue_line_add_wizard.xml',
         'report/meeting_minutes_report.xml',
         'views/menus.xml',
     ],

yuthon_issue/models/issue_library.py

@@ -14,6 +14,7 @@ class IssueLibrary(models.Model):
     depart_opinions = fields.Text(string='部门意见')
     topic_content = fields.Text(string='议题详细描述')
     will_based = fields.Text(string='上会依据')
+    is_invisible_workflow = fields.Boolean(string="流程隐藏的判断")
     code = fields.Char(string='编号', required=True, copy=False,
                        default=lambda self: self.env['ir.sequence'].next_by_code('issue_library_code'))
     issue_state = fields.Selection([('draft', '待提交'), ('approval', '审批中'), ('on_approval', '已审批'),
@@ -56,6 +57,18 @@ class IssueLibrary(models.Model):
     member_of_department = fields.Boolean("是否是本部门数据", compute='_compute_part_of_department',
                                           search='_search_part_of_department')
 
+    def add_workflow(self):
+        return {
+            'name': '流程添加弹窗',
+            'type': 'ir.actions.act_window',
+            'view_mode': 'form',
+            'res_model': 'issue.line.add.wizard',
+            "target": "new",
+            'context': {
+                'default_issue_id': self.id,
+            },
+        }
+
     @api.depends_context('uid', 'company')
     @api.depends('department_id')
     def _compute_part_of_department(self):
@@ -125,14 +138,14 @@ class IssueLibrary(models.Model):
                 'is_note': issue_record.is_note,
                 'employee_id': issue_record.employee_id.id
             }))
-        if len(specifics_list)>1:
+        if len(specifics_list) > 1:
             name = ','.join(specifics_list)
         else:
             name = self.name
+
         issue_approval_id = self.env['issue.approval'].create({
             'issue_approval_ids': issue_decision_lines,
             'name': name,
-            'employee_id': self.employee_id.id,
         })
         self.issue_approval_id = issue_approval_id
         return {
@@ -322,17 +335,19 @@ class IssueLibraryApprovalLine(models.Model):
     _description = '关联流程明细'
 
     issue_library_id = fields.Many2one('issue.library', string="关联议题")
-    workflow_record_id = fields.Many2one('soong.workflow.record', string="标题")
+    workflow_name = fields.Char(string="标题")
     code = fields.Char(string="流程编号")
-    approval_type = fields.Many2one(related="workflow_record_id.workflow_id", string="类型")
+    approval_type = fields.Char(string="类型")
     approval_date = fields.Datetime(string="创建日期")
+    res_model = fields.Char(string="模型")
+    res_id = fields.Char(string="id")
 
     def open_record(self):
         return {
             "type": "ir.actions.act_window",
-            "res_model": self.workflow_record_id.res_model,
+            "res_model": self.res_model,
-            "res_id": self.workflow_record_id.res_id,
+            "res_id": int(self.res_id),
-            "name": self.workflow_record_id.name,
+            "name": self.workflow_name,
             "view_mode": "form",
         }
 

yuthon_issue/security/ir.model.access.csv

@@ -11,3 +11,4 @@ access_issue_meeting_minutes,issue_meeting_minutes,model_issue_meeting_minutes,b
 access_issue_meeting_line,issue_meeting_line,model_issue_meeting_line,base.group_user,1,1,1,1
 access_issue_library_room_line,issue_library_room_line,model_issue_library_room_line,base.group_user,1,1,1,1
 access_issue_library_type,issue_library_type,model_issue_library_type,base.group_user,1,1,1,1
+access_issue_line_add_wizard,issue_line_add_wizard,model_issue_line_add_wizard,base.group_user,1,1,1,1

yuthon_issue/views/issue_library_views.xml

@@ -63,14 +63,16 @@
                     </div>
                     <group>
                         <group>
-                            <field name="name" required="1" force_save="1"/>
+                            <field name="name" required="1" force_save="1" invisible="is_invisible_workflow"/>
+                            <field name="topic_content" invisible="is_invisible_workflow"/>
+                            <field name="documents_ids" widget="preview_many2many" invisible="is_invisible_workflow"/>
+                            <field name="is_invisible_workflow" invisible="1"/>
+
                             <field name="name_text" invisible="1"/>
                             <field name="work_end" invisible="1"/>
                             <field name="company_id" invisible="1"/>
                             <field name="approval_decision_sequence" invisible="1"/>
                             <field name="creart_datetime" invisible="1"/>
-                            <field name="topic_content"/>
-                            <field name="documents_ids" widget="preview_many2many"/>
                         </group>
                         <group>
                             <field name="employee_id" invisible="1"/>
@@ -112,11 +114,14 @@
                             </field>
                         </page>
                         <page string="关联流程">
+                            <button name="add_workflow" string="添加流程" type="object" class="btn-primary"/>
                             <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
+                                <tree editable="bottom">
                                     <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="workflow_record_id" string="标题"/>
+                                    <field name="res_model" column_invisible="1"/>
+                                    <field name="res_id" column_invisible="1"/>
                                     <field name="code"/>
+                                    <field name="workflow_name"/>
                                     <field name="approval_type"/>
                                     <field name="approval_date"/>
                                     <button name="open_record" type="object" string="详情" class="btn-primary"/>
@@ -275,11 +280,14 @@
                             </field>
                         </page>
                         <page string="关联流程">
+                            <button name="add_workflow" string="添加流程" type="object" class="btn-primary"/>
                             <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
+                                <tree editable="bottom">
                                     <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="workflow_record_id" string="标题"/>
+                                    <field name="res_model" column_invisible="1"/>
+                                    <field name="res_id" column_invisible="1"/>
                                     <field name="code"/>
+                                    <field name="workflow_name"/>
                                     <field name="approval_type"/>
                                     <field name="approval_date"/>
                                     <button name="open_record" type="object" string="详情" class="btn-primary"/>
@@ -424,11 +432,14 @@
                             </field>
                         </page>
                         <page string="关联流程">
+                            <button name="add_workflow" string="添加流程" type="object" class="btn-primary"/>
                             <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
+                                <tree editable="bottom">
                                     <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="workflow_record_id" string="标题"/>
+                                    <field name="res_model" column_invisible="1"/>
+                                    <field name="res_id" column_invisible="1"/>
                                     <field name="code"/>
+                                    <field name="workflow_name"/>
                                     <field name="approval_type"/>
                                     <field name="approval_date"/>
                                     <button name="open_record" type="object" string="详情" class="btn-primary"/>
@@ -563,11 +574,14 @@
                             </field>
                         </page>
                         <page string="关联流程">
+                            <button name="add_workflow" string="添加流程" type="object" class="btn-primary"/>
                             <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
+                                <tree editable="bottom">
                                     <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="workflow_record_id" string="标题"/>
+                                    <field name="res_model" column_invisible="1"/>
+                                    <field name="res_id" column_invisible="1"/>
                                     <field name="code"/>
+                                    <field name="workflow_name"/>
                                     <field name="approval_type"/>
                                     <field name="approval_date"/>
                                     <button name="open_record" type="object" string="详情" class="btn-primary"/>

yuthon_issue/wizard/__init__.py

@@ -0,0 +1 @@
+from . import issue_line_add_wizard

yuthon_issue/wizard/issue_line_add_wizard.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, tools
+
+
+class IssueLineAddWizard(models.Model):
+    _name = "issue.line.add.wizard"
+
+    issue_id = fields.Many2one('issue.library')
+    approval_group_id = fields.Many2one('soong.approval.group', string="类别")
+    workflow_record_ids = fields.Many2many('soong.workflow.record', string="流程")
+
+    def confirm(self):
+        for record_id in self.workflow_record_ids:
+            self.env['issue.library.approval.line'].create({
+                'issue_library_id': self.issue_id.id,
+                'workflow_name': record_id.name,
+                'approval_type': record_id.approvals_group_id.name,
+                'res_model': record_id.res_model,
+                'res_id': record_id.res_id,
+                'code': record_id.code,
+                'approval_date': fields.Datetime.now(),
+            })
+

yuthon_issue/wizard/issue_line_add_wizard.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="issue_line_add_wizard_form" model="ir.ui.view">
+        <field name="name">issue.line.add.wizard.form</field>
+        <field name="model">issue.line.add.wizard</field>
+        <field name="arch" type="xml">
+            <form sting="添加流程弹窗">
+                <group>
+                    <field name="issue_id" invisible="1"/>
+                    <field name="approval_group_id"/>
+                    <field name="workflow_record_ids" widget="many2many_tags" domain="[('approvals_group_id', '=', approval_group_id)]"/>
+                </group>
+                <footer>
+                    <button name="confirm" string="确定" type="object" class="oe_highlight"/>
+                    <button string="取消" class="oe_link" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+</odoo>
+
+

yuthon_official/models/yuthon_offficial_incoming_party.py

@@ -50,14 +50,14 @@ class YuthonOfficialIncomingParty(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_official/models/yuthon_official_incoming_labor.py

@@ -50,14 +50,14 @@ class YuthonOfficialIncomingLabor(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_official/models/yuthon_official_incoming_normal.py

@@ -52,14 +52,14 @@ class YuthonOfficialIncomingNormal(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_property/wizard/electric_water_wizard.py

@@ -18,7 +18,7 @@ class ElectricWaterWizard(models.TransientModel):
                 # 查找上个月的记录，上次用量，上次读数，上次抄表日期
                 last_month_line = meter.line_ids.search([('meter_date', '<', self.push_date)]).sorted('meter_date')[-1]
                 # 如果当前数据不存在，则新建任务，按照天的纬度
-                self_month_line = meter.line_ids.search([('meter_date', '=', self.push_date)])
+                self_month_line = meter.line_ids.search([('meter_date', '=', self.push_date), ('archives_id', '=', meter.id)])
                 if not self_month_line:
                     meter.line_ids.create({
                         'archives_id': meter.id,

yuthon_property_approval/models/property_approval.py

@@ -51,14 +51,14 @@ class PropertyApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_property_approval/models/property_capacity.py

@@ -38,14 +38,14 @@ class PropertyCapacity(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_property_approval/models/property_evaluate_application.py

@@ -65,14 +65,14 @@ class PropertyEvaluateApplication(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_property_approval/models/property_handover.py

@@ -35,14 +35,14 @@ class PropertyHandover(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_property_approval/models/property_intention_approval.py

@@ -33,14 +33,14 @@ class PropertyIntentionApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_property_approval/models/property_lease_extension.py

@@ -47,14 +47,14 @@ class PropertyLeaseExtension(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_property_approval/models/property_management.py

@@ -51,14 +51,14 @@ class PropertyManagement(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_property_approval/models/property_meeting_approval.py

@@ -34,14 +34,14 @@ class PropertyMeetingApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_property_approval/models/property_merge_approval.py

@@ -76,14 +76,14 @@ class PropertyMergeApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_property_approval/models/property_offline_registration.py

@@ -39,14 +39,14 @@ class PropertyOfflineRegistration(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_property_approval/models/property_penalty_relief.py

@@ -40,14 +40,14 @@ class PropertyPenaltyRelief(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_property_approval/models/property_record.py

@@ -40,14 +40,14 @@ class PropertyRecord(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_property_approval/models/property_rent_relief.py

@@ -39,14 +39,14 @@ class PropertyRentRelief(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_property_approval/models/property_transaction_confirmed.py

@@ -36,14 +36,14 @@ class PropertyTransactionConfirmed(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_property_approval/models/property_transfer_approval.py

@@ -43,22 +43,21 @@ class PropertyTransferApproval(models.Model):
 
   name_title = fields.Char(default=_get_default_name_title)
   self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])])
+
   @api.onchange('is_issues')
   def _onchange_is_issues(self):
     if self.is_issues:
-      issue_id = self.env['issue.library'].create({'name': self.name})
+      issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
       self.related_issues_id = issue_id.id
-      workflow_record_id = self.env["soong.workflow.record"].search(
-        [("res_model", "=", self._name), ("res_id", "=", self.id)])
       self.env['issue.library.approval.line'].create({
         'issue_library_id': issue_id.id,
-        'workflow_record_id': workflow_record_id.id,
+        'workflow_name': self.name,
-        'approval_type': workflow_record_id.workflow_id.id,
+        'approval_type': self.workflow_id.name,
+        'res_model': self._name,
+        'res_id': self.id,
         'code': self.code,
         'approval_date': fields.Datetime.now(),
       })
-    elif self.related_issues_id:
-      raise UserError("已经创建了相关的上会记录，不能取消勾选")
 
 class PropertyTransferLine(models.Model):
   _name = 'property.transfer.line'

yuthon_sps_approval/models/yuthon_office_supplies.py

@@ -53,14 +53,14 @@ class YuthonOfficeSupplies(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_trade/models/trade_reward_approval.py

@@ -30,14 +30,14 @@ class TradeRewardApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })

yuthon_trade/models/yuthon_business_approval.py

@@ -32,14 +32,14 @@ class YuthonBusinessApproval(models.Model):
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:
-            issue_id = self.env['issue.library'].create({'name': self.name})
+            issue_id = self.env['issue.library'].create({'name': self.name, 'is_invisible_workflow': True})
             self.related_issues_id = issue_id.id
-            workflow_record_id = self.env["soong.workflow.record"].search(
-                [("res_model", "=", self._name), ("res_id", "=", self.id)])
             self.env['issue.library.approval.line'].create({
                 'issue_library_id': issue_id.id,
-                'workflow_record_id': workflow_record_id.id,
+                'workflow_name': self.name,
-                'approval_type': workflow_record_id.workflow_id.id,
+                'approval_type': self.workflow_id.name,
+                'res_model': self._name,
+                'res_id': self.id,
                 'code': self.code,
                 'approval_date': fields.Datetime.now(),
             })