!1520 !1519 添加功能

Merge pull request !1520 from 李鹏宇/dev

soong_workflow/views/soong_user_role_views.xml

@@ -22,8 +22,8 @@
             <tree>
                 <field name="number" required="1"/>
                 <field name="name" required="1"/>
-                <field name="user_type"/>
                 <field name="department_id"/>
+                <field name="user_type"/>
                 <field name="personnel_ids" widget="many2many_tags"/>
                 <field name="number_people"/>
                 <field name="pinyin_name" column_invisible="1"/>

soong_workflow/wizard/soong_workflow_comment_wizard.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from email.policy import default
 
 from odoo import fields, models, api
 from odoo.exceptions import UserError, ValidationError
@@ -19,7 +20,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
     node_btn_name = fields.Char(string="动作名称", related='node_btn_id.name')
     node_link_len = fields.Char(string="转交2")
     is_supervising = fields.Boolean(string="是否督办")
-    comment_note_id = fields.Many2one('soong.note', string="意见")
+    comment_note_id = fields.Many2one('soong.note', string="意见", default='妥否，呈领导审批')
     state_list = fields.Char(string="状态列表")
 
     record_id = fields.Integer()