jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #1318: (feature/消息模版添加时间节点 -> develop)

Browse Source 
Merge Request: 消息模版添加时间节点

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1318?initial=true
This commit is contained in:
杨金灵
2024-09-19 09:34:41 +08:00
committed by Coding
parent 7576200fc4 ff06d5c3be
commit 73f161ffa4
2 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sf_message/models/sf_message_template.py
View File

@@ -8,30 +8,6 @@ class SfMessageTemplate(models.Model):
_description = u'消息模板'
name = fields.Char(string=u"名称", required=True)
# type = fields.Selection([
# ('待接单', '待接单'),
# ('待排程', '待排程'),
# ('坯料采购', '坯料采购'),
# ('坯料发料', '坯料发料'),
# ('待编程', '待编程'),
# ('调拨入库', '调拨入库'),
# ('功能刀具组装', '功能刀具组装'),
# ('功能刀具寿命到期', '功能刀具寿命到期'),
# ('程序用刀计划异常', '程序用刀计划异常'),
# ('工单无CNC程序', '工单无CNC程序'),
# ('生产线无功能刀具', '生产线无功能刀具'),
# ('工单无定位数据', '工单无定位数据'),
# ('工单FTP无文件', '工单FTP无文件'),
# ('工单加工失败', '工单加工失败'),
# ('设备故障及异常', '设备故障及异常'),
# ('工单逾期预警', '工单逾期预警'),
# ('工单已逾期', '工单已逾期'),
# ('销售订单逾期', '销售订单逾期'),
# ('销售订单已逾期', '销售订单已逾期'),
# ('待质量判定', '待质量判定'),
# ('生产完工待入库', '生产完工待入库'),
# ('订单发货', '订单发货')
# ], string='类型', required=True)
description = fields.Char(string=u"描述")
content = fields.Html(string=u"内容", render_engine='qweb', translate=True, prefetch=True, sanitize=False)
msgtype = fields.Selection(
@@ -41,6 +17,9 @@ class SfMessageTemplate(models.Model):
notification_employee_ids = fields.Many2many('hr.employee', string=u'员工',
domain="[('department_id', '=',notification_department_id)]",
required=True)
is_send_time = fields.Boolean(string=u"定时发送", default=False)
send_time_1 = fields.Integer('发送时间点1')
send_time_2 = fields.Integer('发送时间点2')
active = fields.Boolean(string=u"是否有效", default=True)
@api.onchange('notification_department_id')

10
sf_message/views/sf_message_template_view.xml
View File

@@ -18,11 +18,14 @@
</h1>
</div>
<group>
<!-- <field name="type"/>-->
<!-- <field name="type"/>-->
<field name="content" widget="html" class="oe-bordered-editor"
options="{'style-inline': true, 'codeview': true, 'dynamic_placeholder': true}"/>
<field name="description"/>
<field name="msgtype"/>
<field name="is_send_time"/>
<field name="send_time_1" attrs="{'invisible': [('is_send_time', '=', False)]}"/>
<field name="send_time_2" attrs="{'invisible': [('is_send_time', '=', False)]}"/>
<field name="notification_department_id"/>
<field name="notification_employee_ids" widget="many2many_tags"/>
</group>
@@ -37,9 +40,12 @@
<field name="arch" type="xml">
<tree string="消息模板">
<field name="name"/>
<!-- <field name="type"/>-->
<!-- <field name="type"/>-->
<field name="content"/>
<field name="msgtype"/>
<field name="is_send_time"/>
<field name="send_time_1" attrs="{'invisible': [('is_send_time', '=', False)]}"/>
<field name="send_time_2" attrs="{'invisible': [('is_send_time', '=', False)]}"/>
<field name="notification_department_id"/>
<field name="notification_employee_ids" widget="many2many_tags"/>
<field name="description"/>