!8748 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !8748 from 李鹏宇/dev_wang
This commit is contained in:
@@ -12,6 +12,7 @@ class YuthonOfficial(models.Model):
|
||||
_rec_name = 'name'
|
||||
|
||||
name = fields.Char(string="标题")
|
||||
text = fields.Text(string="标题", compute='_compute_text', store=True)
|
||||
code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('official_code'))
|
||||
official_type_id = fields.Many2one('official.type', string="文件类型")
|
||||
is_cold = fields.Boolean(string="发文编号")
|
||||
@@ -77,6 +78,14 @@ class YuthonOfficial(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.depends('name')
|
||||
def _compute_text(self):
|
||||
"""
|
||||
计算text字段,值等于name字段
|
||||
"""
|
||||
for record in self:
|
||||
record.text = record.name or ''
|
||||
|
||||
|
||||
def end_approval(self):
|
||||
self.write({'work_end': True})
|
||||
|
||||
@@ -5,8 +5,12 @@
|
||||
<field name="model">yuthon.official</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree>
|
||||
<field name="name"/>
|
||||
<field name="reference_cold"/>
|
||||
<field name="code"/>
|
||||
<field name="urgency_level" column_invisible="1"/>
|
||||
<field name="urgency_level" widget="urgency_level_badge" nolabel="1" optional="show"/>
|
||||
<field name="text" string="标题"/>
|
||||
<field name="create_uid" string="创建人"/>
|
||||
<field name="reference_cold"/>
|
||||
<field name="department_id"/>
|
||||
<field name="date"/>
|
||||
<field name="official_state" readonly="1"/>
|
||||
|
||||
Reference in New Issue
Block a user