1
This commit is contained in:
@@ -136,8 +136,8 @@ class SoongWorkflowMixin(models.AbstractModel):
|
||||
domain=lambda self: [("model", "=", self._name)], auto_join=True)
|
||||
log_ids2 = fields.One2many(comodel_name="soong.workflow.log2", inverse_name="res_id", string=" ",
|
||||
domain=lambda self: [("model", "=", self._name)], auto_join=True)
|
||||
log_ids3 = fields.One2many(comodel_name="soong.workflow.log3", inverse_name="res_id", string=" ",
|
||||
domain=lambda self: [("model", "=", self._name)], auto_join=True)
|
||||
# log_ids3 = fields.One2many(comodel_name="soong.workflow.log3", inverse_name="res_id", string=" ",
|
||||
# domain=lambda self: [("model", "=", self._name)], auto_join=True)
|
||||
soong_record_ids = fields.One2many(comodel_name="soong.workflow.line", inverse_name="res_id", string=" ",)
|
||||
project_ids = fields.One2many(comodel_name="project.project.line", inverse_name="res_id", string=" ",)
|
||||
|
||||
@@ -822,11 +822,11 @@ class SoongWorkflowMixin(models.AbstractModel):
|
||||
btn_invisible = self.sudo().env[button.workflow_id.model_id.model].search(domain).ids
|
||||
invisible += " or id not in {0} ".format(str(btn_invisible))
|
||||
# 如果是加签确认
|
||||
# if is_apostille:
|
||||
# id_el = etree.Element("field")
|
||||
# id_el.set("name", "approval_sign_ids")
|
||||
# id_el.set("invisible", "1")
|
||||
# invisible += " or uid not in approval_sign_ids"
|
||||
if is_apostille:
|
||||
id_el = etree.Element("field")
|
||||
id_el.set("name", "approval_sign_ids")
|
||||
id_el.set("invisible", "1")
|
||||
invisible += " or uid not in approval_sign_ids"
|
||||
if button.name in ["退回", "结束"]:
|
||||
id_el = etree.Element("field")
|
||||
id_el.set("name", "log_ids")
|
||||
@@ -988,7 +988,7 @@ class SoongWorkflowMixin(models.AbstractModel):
|
||||
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("name", "approval_sign_ids")
|
||||
field_m2m_el.set("widget", "many2many_tags")
|
||||
page_el.append(field_m2m_el)
|
||||
notebook_el.append(page_el)
|
||||
|
||||
@@ -42,16 +42,16 @@
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
<page string="加签记录" invisible="not log_ids3">
|
||||
<field name="log_ids3" style="width:100%; margin-top: 10px;">
|
||||
<tree editable="bottom">
|
||||
<field name="done_by" string=""/>
|
||||
<field name="name" string=""/>
|
||||
<field name="approval_state" string=""/>
|
||||
<field name="lase_click_date" string=""/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
<!-- <page string="加签记录" invisible="not log_ids3">-->
|
||||
<!-- <field name="log_ids3" style="width:100%; margin-top: 10px;">-->
|
||||
<!-- <tree editable="bottom">-->
|
||||
<!-- <field name="done_by" string=""/>-->
|
||||
<!-- <field name="name" string=""/>-->
|
||||
<!-- <field name="approval_state" string=""/>-->
|
||||
<!-- <field name="lase_click_date" string=""/>-->
|
||||
<!-- </tree>-->
|
||||
<!-- </field>-->
|
||||
<!-- </page>-->
|
||||
<page string="关联流程" invisible="not soong_record_ids">
|
||||
<field name="soong_record_ids" style="width:100%; margin-top: 10px;">
|
||||
<tree edit="true" delete="False" editable="bottom" type="object">
|
||||
@@ -105,16 +105,16 @@
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
<page string="抄送/传阅记录" invisible="not log_ids3">
|
||||
<field name="log_ids3" style="width:100%%; margin-top: 10px;">
|
||||
<tree create="false" edit="false" delete="false" editable="bottom">
|
||||
<field name="done_by" string=""/>
|
||||
<field name="name" string=""/>
|
||||
<field name="approval_state" string=""/>
|
||||
<field name="lase_click_date" string=""/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
<!-- <page string="加签记录" invisible="not log_ids3">-->
|
||||
<!-- <field name="log_ids3" style="width:100%%; margin-top: 10px;">-->
|
||||
<!-- <tree create="false" edit="false" delete="false" editable="bottom">-->
|
||||
<!-- <field name="done_by" string=""/>-->
|
||||
<!-- <field name="name" string=""/>-->
|
||||
<!-- <field name="approval_state" string=""/>-->
|
||||
<!-- <field name="lase_click_date" string=""/>-->
|
||||
<!-- </tree>-->
|
||||
<!-- </field>-->
|
||||
<!-- </page>-->
|
||||
<page string="关联流程" invisible="not soong_record_ids">
|
||||
<field name="soong_record_ids" style="width:100%%; margin-top: 10px;">
|
||||
<tree editable="bottom" delete="False">
|
||||
|
||||
Reference in New Issue
Block a user