Merge pull request !7757 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-01-08 12:45:57 +00:00
committed by Gitee
2 changed files with 12 additions and 12 deletions
+7 -7
View File
@@ -433,15 +433,15 @@ class SoongWorkflowNodeButton(models.Model):
ondelete="cascade",
)
invisible_expression_model = fields.Char(related="workflow_id.model_id.model", store=True)
is_automatic = fields.Boolean('按当前申请人自动匹配-本部门')
is_automatic_company = fields.Boolean('本公司', default=True)
is_automatic_group = fields.Boolean('本集团')
is_automatic = fields.Boolean('发起人部门')
is_automatic_company = fields.Boolean('发起人公司', default=True)
is_automatic_group = fields.Boolean('发起人集团')
is_logged_by = fields.Boolean('按当前登录人自动匹配-本部门')
is_logged_company = fields.Boolean('本公司')
is_logged_group = fields.Boolean('本集团')
is_logged_by = fields.Boolean('登录人部门')
is_logged_company = fields.Boolean('登录人公司')
is_logged_group = fields.Boolean('登录人集团')
is_dep = fields.Boolean('部门')
is_dep = fields.Boolean('按指定部门')
role_id = fields.Many2one(comodel_name="soong.user.role.group", string="角色")
specify_field_id = fields.Many2one(comodel_name="ir.model.fields", string="指定字段")
@@ -185,17 +185,17 @@
</group>
</group>
<group col="3">
<group string="按当前申请人自动匹配">
<field name="is_automatic" string="本部门"/>
<group>
<field name="is_automatic"/>
<field name="is_automatic_company"/>
<field name="is_automatic_group"/>
</group>
<group string="按当前登录人自动匹配">
<field name="is_logged_by" string="本部门"/>
<group>
<field name="is_logged_by"/>
<field name="is_logged_company"/>
<field name="is_logged_group"/>
</group>
<group string="按指定部门匹配">
<group>
<field name="is_dep"/>
<field name="role_id" invisible="not is_dep"/>
<separator string="按指定字段匹配"/>