Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev

soong_workflow/models/soong_workflow_mixin.py

@@ -488,7 +488,7 @@ class SoongWorkflowMixin(models.AbstractModel):
                 trans_domain = []
 
         is_supervising = False
-        if self._module in ['yuthon_official']:
+        if self.name_title in ['行政发文']:
             is_supervising = self.is_supervising
 
         if btn_rec.node_id.comment_id:

soong_workflow/wizard/soong_workflow_comment_wizard.py

@@ -25,7 +25,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
     node_link_len = fields.Char(string="转交2")
     is_supervising = fields.Boolean(string="是否督办")
     comment_note_id = fields.Many2one('soong.note', string="常用意见")
-    comment_note = fields.Char(string="意见")
+    comment_note = fields.Text(string="意见")
     comment = fields.Char(compute='_compute_comment', store=True)
     state_list = fields.Char(string="状态列表")
     record_id = fields.Integer()

yuthon_hr_employee/views/inherit_hr_job_views.xml

@@ -82,7 +82,7 @@
                 <attribute name="invisible">1</attribute>
             </xpath>
             <xpath expr="//field[@name='department_id']" position="after">
-                <field name="allowed_user_ids" invisible="1"/>
+<!--                <field name="allowed_user_ids" invisible="1"/>-->
                 <field name="number"/>
                 <field name="establishment_quotas"/>
                 <field name="no_of_employee" string="在编人数"/>