diff --git a/attendance_iot/models/attendance_iot.py b/attendance_iot/models/attendance_iot.py
index 2c5e00c35..1c6dba785 100644
--- a/attendance_iot/models/attendance_iot.py
+++ b/attendance_iot/models/attendance_iot.py
@@ -82,26 +82,30 @@ class AttendanceIot(models.Model):
     # 发送开门信号
     def action_send_open_door_sigle(self):
         for record in self:
+            msg = {
+                'cmd': 'setDoor',
+                'value': 'on'
+            }
+            msg.pop('face_template', None)
             self.env['iot.message'].create([{
                 'name': '开门',
                 'topic': f'iot/device/{record.name}',
                 'device_sn': record.name,
-                'message_data': json.dumps({
-                    'cmd': 'setDoor',
-                    'value': 'on'
-                }, ensure_ascii=False)
+                'message_data': json.dumps(msg, ensure_ascii=False)
             }])
 
     def action_send_close_door_sigle(self):
         for record in self:
+            msg = {
+                'cmd': 'setDoor',
+                'value': 'off'
+            }
+            msg.pop('face_template', None)
             self.env['iot.message'].create([{
                 'name': '开门',
                 'topic': f'iot/device/{record.name}',
                 'device_sn': record.name,
-                'message_data': json.dumps({
-                    'cmd': 'setDoor',
-                    'value': 'off'
-                }, ensure_ascii=False)
+                'message_data': json.dumps(msg, ensure_ascii=False)
             }])
 
     def action_view_logs(self):
@@ -110,10 +114,9 @@ class AttendanceIot(models.Model):
         return {
             'name': '考勤机日志',
             'type': 'ir.actions.act_window',
-            'res_model': 'attendance.iot.log',
+            'res_model': 'iot.message',
             'view_mode': 'tree,form',
-            'domain': [('attendance_iot_id', '=', self.id)],
-            'context': {'default_attendance_iot_id': self.id},
+            'domain': [('device_sn', '=', self.name)],
         }
 
 
diff --git a/attendance_iot/views/attendance_iot_views.xml b/attendance_iot/views/attendance_iot_views.xml
index e844132a6..544f690aa 100644
--- a/attendance_iot/views/attendance_iot_views.xml
+++ b/attendance_iot/views/attendance_iot_views.xml
@@ -13,9 +13,9 @@
                 <!--                <field name="broker" optional="hide"/>-->
                 <!--                <field name="port" optional="hide"/>-->
                 <!--                <field name="id_valid" optional="hide"/>-->
-                <field name="company_id"/>
+                <field name="company_id" column_invisible="1"/>
                 <field name="number"/>
-                <field name="remake"/>
+                <field name="remake" column_invisible="1"/>
                 <field name="is_connected"/>
                 <button name="open_record" type="object" string="详情" class="btn btn-blue"/>
                 <button name="action_view_logs" type="object" string="日志" class="btn btn-blue"/>
diff --git a/room/views/room_booking_views.xml b/room/views/room_booking_views.xml
index 9b46497c1..ed4fc51aa 100644
--- a/room/views/room_booking_views.xml
+++ b/room/views/room_booking_views.xml
@@ -138,12 +138,6 @@
                         <button name="sync_wechat_room" string="同步企业微信" type="object" class="oe_highlight" invisible="not work_end"/>
                         <button name="action_print_room_booking_agenda" string="打印" type="object" class="btn-primary"/>
                     </header>
-                     <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/soong_workflow/models/soong_workflow.py b/soong_workflow/models/soong_workflow.py
index be889b2fa..802a248c9 100644
--- a/soong_workflow/models/soong_workflow.py
+++ b/soong_workflow/models/soong_workflow.py
@@ -91,15 +91,11 @@ class SoongWorkflow(models.Model):
         soong_ids = self.env["soong.workflow"].browse(
             self._context.get('active_ids', self._context.get('active_id'))
         )
-        for node in soong_ids.node_ids:
-            confirm_buttons = node.button_ids.filtered(lambda btn: btn.name == '确认')
-            if not confirm_buttons:
-                self.env['soong.workflow.node.button'].create({
-                    'node_id': node.id,
-                    'name': '确认',
-                    'action_type': 'code',
-                    "has_comment": True
-                })
+        for workflow in soong_ids:
+            nodes = workflow.node_ids.sorted('sequence')
+            for node in nodes[1:]:
+                node.is_apostille = True
+                node.onchange_is_apostille()
 
     def change_opinions_wizard(self):
         soong_ids = self.env["soong.workflow"].browse(
diff --git a/soong_workflow/models/soong_workflow_log.py b/soong_workflow/models/soong_workflow_log.py
index 4969ee4d2..7c08e2397 100644
--- a/soong_workflow/models/soong_workflow_log.py
+++ b/soong_workflow/models/soong_workflow_log.py
@@ -47,6 +47,8 @@ class SoongWorkflowLog(models.Model):
         for rec in self:
             if rec.name == '归档':
                 rec.name = '归档'
+            elif rec.name == '加签':
+                rec.name = '加签'
             elif rec.node_id:
                 rec.name = "%(node_id_name)s" % {"node_id_name": rec.node_id.name}
             else:
diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py
index b9c53d07e..5a360109c 100644
--- a/soong_workflow/models/soong_workflow_mixin.py
+++ b/soong_workflow/models/soong_workflow_mixin.py
@@ -90,6 +90,60 @@ class SoongWorkflowMixin(models.AbstractModel):
     is_end = fields.Boolean(string="未结束", compute='_compute_is_confirm', store=False,)
     is_done = fields.Boolean(string="已办", compute='_compute_is_done', store=False,)
     is_send = fields.Boolean(string="是否分发", compute='_compute_is_send', store=False,)
+    is_show_add_sign = fields.Boolean(string="显示加签按钮", compute='_compute_is_show_add_sign')
+    is_show_transfer = fields.Boolean(string="显示加签确认按钮", compute='_compute_is_show_transfer')
+    approval_result = fields.Selection([('pass', '通过'), ('fail', '不通过')], string="审批结果")
+
+    def _compute_is_show_add_sign(self):
+        for record in self:
+            record.is_show_add_sign = True
+
+            domain_hide_01 = [
+                ('workflow_id', '=', record.workflow_id.id),
+                ('res_id', '=', record.id),
+                ('name', '=', '加签'),
+                ('approval_state', 'in', ['0', '1']),
+            ]
+            has_01 = record.log_ids.search(domain_hide_01)
+
+            domain_hide_done = [
+                ('workflow_id', '=', record.workflow_id.id),
+                ('res_id', '=', record.id),
+                ('name', '=', '加签'),
+                ('approval_state', '=', '2'),
+                ('done_by', '=', self.env.user.id),
+            ]
+            has_done = record.log_ids.search(domain_hide_done)
+
+            # 如果有日志，取【第一个节点】的经办人 == 当前登录人 → 隐藏
+            has_first_user = False
+            if record.log_ids:
+                first_log = record.log_ids.sorted('sequence')[:1]
+                if first_log and first_log.done_by == self.env.user:
+                    has_first_user = True
+
+            # ：判断当前登录人是否在 log_ids2 中
+            has_log_ids2_user = False
+            if record.log_ids2:
+                has_log_ids2_user = self.env.user.id in record.log_ids2.mapped('done_by.id')
+
+            # 任意一个条件满足 → 隐藏
+            if has_01 or has_done or has_first_user or has_log_ids2_user:
+                record.is_show_add_sign = False
+
+    def _compute_is_show_transfer(self):
+        for record in self:
+            record.is_show_transfer = False
+            domain_has_sign = [
+                ('workflow_id', '=', record.workflow_id.id),
+                ('res_id', '=', record.id),
+                ('name', '=', '加签'),
+                ('approval_state', 'in', ['0', '1']),
+                ('done_by', '=', self.env.user.id),
+            ]
+            has_sign_ok = record.log_ids.search(domain_has_sign)
+            if has_sign_ok:
+                record.is_show_transfer = True
 
     def _compute_is_send(self):
         for record in self:
@@ -263,21 +317,11 @@ class SoongWorkflowMixin(models.AbstractModel):
         """
         返回用于打印的审批日志列表：
         - 按与界面相同的顺序（sequence 升序）
-        - 同名节点只保留最新一条
+        - 保留所有审批记录（包括重复节点，如申请人多次申请）
         - 可选：申请人置顶
         """
         self.ensure_one()
-        logs = self.log_ids.sorted('sequence')
-        seen = set()
-        ordered = []
-        # 逆序去重，保留最新
-        for log in reversed(logs):
-            key = log.name or ''
-            if key in seen:
-                continue
-            seen.add(key)
-            ordered.append(log)
-        ordered.reverse()  # 恢复原有顺序（去重后）
+        ordered = self.log_ids.sorted('sequence')
         if applicant_first:
             applicants = [l for l in ordered if (l.name or '') == '申请人']
             others = [l for l in ordered if (l.name or '') != '申请人']
@@ -365,60 +409,60 @@ class SoongWorkflowMixin(models.AbstractModel):
         cx.update({"active_id": self.id, "active_ids": self.ids})
         wkf_btn_obj = self.env["soong.workflow.node.button"]
         btn_rec = wkf_btn_obj.search([("btn_key", "=", cx.get("btn_key", False))])
-        # 优化弹窗
+        # # 优化弹窗
         if btn_rec:
             log_obj = self._create_update_logs(btn_rec)
-            # 判断加签
-            if btn_rec.name in ["加签"]:
-                # 弹窗 进行填写 人员
-                wizard = self.env.ref("soong_workflow.view_soong_workflow_apostille_wizard")
-                return {
-                    "name": _("添加加签人员"),
-                    "type": "ir.actions.act_window",
-                    "view_mode": "form",
-                    "res_model": "soong.workflow.apostille.wizard",
-                    "views": [(wizard.id, "form")],
-                    "view_id": wizard.id,
-                    "target": "new",
-                    "context": {
-                        "default_res_id": self.id,
-                        "default_res_model": self._name,
-                        "default_log_ids": log_obj.ids,
-                        "default_node_btn_id": btn_rec.id,
-                    },
-                }
-            if btn_rec.name in ["加签确认"]:
-                # 弹窗 进行填写 人员
-                wizard = self.env.ref("soong_workflow.view_soong_workflow_apostille_ok_wizard")
-                return {
-                    "name": _("添加加签人员"),
-                    "type": "ir.actions.act_window",
-                    "view_mode": "form",
-                    "res_model": "soong.workflow.apostille.ok.wizard",
-                    "views": [(wizard.id, "form")],
-                    "view_id": wizard.id,
-                    "target": "new",
-                    "context": {
-                        "default_res_id": self.id,
-                        "default_res_model": self._name,
-                        "default_log_ids": log_obj.ids,
-                        "default_node_btn_id": btn_rec.id,
-                    },
-                }
-            if btn_rec.name not in ["加签", "加签确认"]:
-                # 判断当前是否所有加签都已经结束
-                apostille_log_obj = self.sudo().env["soong.workflow.log"].search(
-                    [
-                        ("model", "=", self._name),
-                        ("res_id", "=", self.id),
-                        ("node_id", "=", btn_rec.node_id.id),
-                        ("workflow_id", "=", btn_rec.workflow_id.id),
-                        ("node_btn_name", "=", "2"),
-                        ("approval_state", "!=", "2")
-                    ]
-                )
-                if apostille_log_obj:
-                    raise UserError("当前加签人员还有没有审批完成的！")
+        #     # 判断加签
+        #     if btn_rec.name in ["加签"]:
+        #         # 弹窗 进行填写 人员
+        #         wizard = self.env.ref("soong_workflow.view_soong_workflow_apostille_wizard")
+        #         return {
+        #             "name": _("添加加签人员"),
+        #             "type": "ir.actions.act_window",
+        #             "view_mode": "form",
+        #             "res_model": "soong.workflow.apostille.wizard",
+        #             "views": [(wizard.id, "form")],
+        #             "view_id": wizard.id,
+        #             "target": "new",
+        #             "context": {
+        #                 "default_res_id": self.id,
+        #                 "default_res_model": self._name,
+        #                 "default_log_ids": log_obj.ids,
+        #                 "default_node_btn_id": btn_rec.id,
+        #             },
+        #         }
+        #     if btn_rec.name in ["加签确认"]:
+        #         # 弹窗 进行填写 人员
+        #         wizard = self.env.ref("soong_workflow.view_soong_workflow_apostille_ok_wizard")
+        #         return {
+        #             "name": _("添加加签人员"),
+        #             "type": "ir.actions.act_window",
+        #             "view_mode": "form",
+        #             "res_model": "soong.workflow.apostille.ok.wizard",
+        #             "views": [(wizard.id, "form")],
+        #             "view_id": wizard.id,
+        #             "target": "new",
+        #             "context": {
+        #                 "default_res_id": self.id,
+        #                 "default_res_model": self._name,
+        #                 "default_log_ids": log_obj.ids,
+        #                 "default_node_btn_id": btn_rec.id,
+        #             },
+        #         }
+        #     if btn_rec.name not in ["加签", "加签确认"]:
+        #         # 判断当前是否所有加签都已经结束
+        #         apostille_log_obj = self.sudo().env["soong.workflow.log"].search(
+        #             [
+        #                 ("model", "=", self._name),
+        #                 ("res_id", "=", self.id),
+        #                 ("node_id", "=", btn_rec.node_id.id),
+        #                 ("workflow_id", "=", btn_rec.workflow_id.id),
+        #                 ("node_btn_name", "=", "2"),
+        #                 ("approval_state", "!=", "2")
+        #             ]
+        #         )
+        #         if apostille_log_obj:
+        #             raise UserError("当前加签人员还有没有审批完成的！")
             # 继续正常流程
             # if btn_rec.has_comment:
             return self.with_context(cx)._add_comment(log_obj, btn_rec)
@@ -1199,19 +1243,24 @@ class SoongWorkflowMixin(models.AbstractModel):
                             id_el = etree.Element("field")
                             id_el.set("name", "log_ids")
                             id_el.set("invisible", "1")
-                            invisible += " or not log_ids or is_done"
+                            invisible += " or not log_ids or is_done or is_show_transfer"
                         if button.name == "分发":
                             btn_exec_action_el.set("class", "btn btn-distribute")
                             invisible += " or not is_send"
                         if button.name == "转交":
                             btn_exec_action_el.set("class", "btn btn-transfer")
-                            invisible += " or is_done"
+                            invisible += " or is_done or is_show_transfer"
+                        if button.name == "加签确认":
+                            invisible += "or not is_show_transfer"
                         if button.name == "收回":
                             btn_exec_action_el.set("class", "btn btn-recall")
                             id_el = etree.Element("field")
                             id_el.set("name", "log_ids")
                             id_el.set("invisible", "1")
                             invisible += " or not log_ids or not is_back"
+                        if button.name == "加签":
+                            btn_exec_action_el.set("class", "btn btn-recall")
+                            invisible += "or not is_show_add_sign"
                         if button.name == '归档':
                             btn_exec_action_el.set("class", "btn btn-archive")
                             invisible += "or not is_active"
@@ -1308,6 +1357,37 @@ class SoongWorkflowMixin(models.AbstractModel):
             send_el.set("invisible", "1")
             header_el.append(send_el)
 
+            sign_el = etree.Element("field")
+            sign_el.set("name", "is_show_add_sign")
+            sign_el.set("invisible", "1")
+            header_el.append(sign_el)
+
+            approval_el = etree.Element("field")
+            approval_el.set("name", "approval_result")
+            approval_el.set("invisible", "1")
+            header_el.append(approval_el)
+
+            if header_el:
+                # 彩带
+                ribbon_pass = etree.Element("widget")
+                ribbon_pass.set("name", "web_ribbon")
+                ribbon_pass.set("title", "通过")
+                ribbon_pass.set("bg_color", "text-bg-success")
+                ribbon_pass.set("invisible", "approval_result != 'pass'")
+                header_el.insert(0, ribbon_pass)
+
+                ribbon_fail = etree.Element("widget")
+                ribbon_fail.set("name", "web_ribbon")
+                ribbon_fail.set("title", "不通过")
+                ribbon_fail.set("bg_color", "text-bg-danger")
+                ribbon_fail.set("invisible", "approval_result != 'fail'")
+                header_el.insert(0, ribbon_fail)
+
+            is_transfer_el = etree.Element("field")
+            is_transfer_el.set("name", "is_show_transfer")
+            is_transfer_el.set("invisible", "1")
+            header_el.append(is_transfer_el)
+
             done_el = etree.Element("field")
             done_el.set("name", "is_done")
             done_el.set("invisible", "1")
@@ -1461,7 +1541,9 @@ class SoongWorkflowMixin(models.AbstractModel):
         def _get_external_id(group):
             arr = []
             ext_ids = group._get_external_ids()
+            _logger.info(f"--------{ext_ids}")
             for ext_id in ext_ids:
+                _logger.info(f"--------{ext_id}")
                 arr.append(ext_ids[ext_id][0])
             return arr
 
@@ -1503,14 +1585,17 @@ class SoongWorkflowMixin(models.AbstractModel):
                                     user_rec = user_obj.browse(uid)
                                     if user_rec not in field_attrs.user_ids:
                                         flag_show = False
-                                if field_attrs.group_ids:
-                                    has_group = False
-                                    user_rec = user_obj.browse(uid)
-                                    ext_ids = _get_external_id(field_attrs.group_ids)
-                                    for ext_id in ext_ids:
-                                        has_group = user_rec.has_group(ext_id)
-                                    if not has_group:
-                                        flag_show = False
+                                # if field_attrs.group_ids:
+                                #     has_group = False
+                                #     user_rec = user_obj.browse(uid)
+                                #     _logger.info(f"-----{field_attrs.name}")
+                                #     _logger.info(f"-----{field_attrs.name.name}")
+                                #     _logger.info(f"-----{field_attrs.group_ids}")
+                                #     ext_ids = _get_external_id(field_attrs.group_ids)
+                                #     for ext_id in ext_ids:
+                                #         has_group = user_rec.has_group(ext_id)
+                                #     if not has_group:
+                                #         flag_show = False
                                 if not flag_show and (field_attrs.group_ids or field_attrs.user_ids):
                                     invisible_arr.append(node.node_name)
                         if readonly_arr:
diff --git a/soong_workflow/views/soong_workflow_inspector_views.xml b/soong_workflow/views/soong_workflow_inspector_views.xml
index 6f4ef83da..ca4639289 100644
--- a/soong_workflow/views/soong_workflow_inspector_views.xml
+++ b/soong_workflow/views/soong_workflow_inspector_views.xml
@@ -19,12 +19,6 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                                invisible="urgency_level != 'normal'"/>
-                        <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                                invisible="urgency_level != 'urgent'"/>
-                        <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                                invisible="urgency_level != 'emergency'"/>
                         <group col="3">
                             <group>
                                 <field name="code" readonly="1"/>
diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index dc6559e5f..0354dec4c 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -259,7 +259,7 @@
                     <field name="approve_state" string="审批状态" widget="badge"
                            decoration-danger="approve_state == 'end'" decoration-success="approve_state == 'pending'"/>
                     <field name="create_uid"/>
-                    <field name="employee_ids" widget="many2many_tags" string="当前经办人" class="list_ids_width" column_invisible="1"/>
+                    <field name="employee_ids" widget="many2many_tags" string="当前经办人" column_invisible="1"/>
                     <field name="soong_state" column_invisible="True"/><field name="display_end_time" string="到达时间" optional="show"/>
                     <field name="is_manager" column_invisible="1"/>
                     <field name="is_unlink" column_invisible="1"/>
@@ -329,7 +329,7 @@
                     <field name="approve_state" string="审批状态" widget="badge"
                            decoration-danger="approve_state == 'end'" decoration-success="approve_state == 'pending'"/>
                     <field name="create_uid"/>
-                    <field name="employee_ids" widget="many2many_tags" string="当前经办人" class="list_ids_width" column_invisible="True"/>
+                    <field name="employee_ids" widget="many2many_tags" string="当前经办人" column_invisible="True"/>
                     <field name="soong_state" column_invisible="True"/>
                     <field name="is_manager" column_invisible="1"/>
                     <field name="is_log2" column_invisible="1"/>
@@ -362,7 +362,7 @@
                     <field name="approve_state" string="审批状态" widget="badge"
                            decoration-danger="approve_state == 'end'" decoration-success="approve_state == 'pending'"/>
                     <field name="create_uid"/>
-                    <field name="employee_ids" widget="many2many_tags" string="当前经办人" class="list_ids_width" column_invisible="1"/>
+                    <field name="employee_ids" widget="many2many_tags" string="当前经办人" column_invisible="1"/>
                     <field name="soong_state" column_invisible="True"/><field name="display_end_time" string="办结时间" optional="show"/>
                     <field name="is_manager" column_invisible="1"/>
                 </tree>
diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 6bf481c93..b16fe257a 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -45,7 +45,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
 
     employee_trans_domain_ids = fields.Many2many('hr.employee', 'employee_trans_domain_ids_rel', string="传阅人员", store=True)
     employee_ids = fields.Many2many('hr.employee', 'employee_ids_rel', 'custom_id', 'employee_id', string="转交人员", store=True)
-    circulated_employee_ids = fields.Many2many('hr.employee', 'circulated_employee_rel',  'custom_id', 'employee_id', help='只可以看不可以评论，看过以后状态自动变为已阅', string="加签人员", store=True)
+    circulated_employee_ids = fields.Many2many('hr.employee', 'circulated_employee_rel',  'custom_id', 'employee_id', help='只可以看不可以评论，看过以后状态自动变为已阅', string="传阅人员", store=True)
     dep_manager_employee_ids = fields.Many2many('hr.employee', 'dep_manager_employee_rel', 'custom_id', 'employee_id', string="承办", store=True)
     add_employee_ids = fields.Many2many('hr.employee', 'add_employee_rel', 'custom_id', 'employee_id', string="加签人员", help='点击确认以后评论的人员', store=True)
     supervising_employee_ids = fields.Many2many('hr.employee', 'supervising_employee_rel', 'custom_id', 'employee_id', string="督办人员", store=True)
@@ -54,38 +54,81 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                                                    '串：都会收到消息，但任意一个人转交后，即到下一节点，其他人将不再显示，相当于收回.')
     is_automatic = fields.Boolean('是否自动匹配')
     company_id = fields.Many2one('res.company', '公司', default=lambda self: self.env.user.company_id)
-    is_this_company = fields.Boolean('本公司', default=True)
+    scope_type = fields.Selection(
+        [
+            ('company', '本公司'),
+            ('group', '本集团'),
+            ('department', '本部门'),
+        ],
+        string='范围类型',
+        default='company',
+        required=True,
+    )
     employee_ids1 = fields.Many2many('hr.employee', 'employee_ids1_rel', 'custom_id1', 'employee_id1', string="人员范围", store=True)
+    employee_ids2 = fields.Many2many('hr.employee', 'employee_ids2_rel', 'custom_id2', 'employee_id2', string="加签传阅人员过滤")
 
     @api.onchange('is_selection')
     def _onchange_is_selection(self):
-        domain = [('id', 'in', self.employee_ids1.ids)]
-        if self.is_selection:
-            if self.is_this_company:
-                domain.append(('company_id', '=', self.company_id.id))
-            all_employees = self.env['hr.employee'].search(domain)
-            self.employee_ids = all_employees
-        else:
+        if not self.employee_ids1:
             self.employee_ids = False
+            return
+        domain = [('id', 'in', self.employee_ids1.ids)]
+        if self.scope_type == 'company':
+            domain.append(('company_id', '=', self.company_id.id))
+        elif self.scope_type == 'group':
+            pass
+        elif self.scope_type == 'department':
+            department = self.env.user.department_id
+            if department:
+                all_depts = department.child_ids | department
+                domain.extend([
+                    ('company_id', '=', self.company_id.id),
+                    '|',
+                    ('department_id', 'in', all_depts.ids),
+                    ('department_ids', 'in', all_depts.ids),
+                ])
+        all_employees = self.env['hr.employee'].search(domain)
+        self.employee_ids = all_employees if self.is_selection else False
 
-    @api.onchange('employee_ids1')
+    @api.onchange('scope_type', 'employee_ids1', 'department_id', 'company_id')
     def _onchange_employee_ids1(self):
+        if not self.employee_ids1:
+            self.employee_ids = False
+            return
         filtered_employees = self.employee_ids1
-        if self.is_this_company:
+        # 范围过滤
+        if self.scope_type == 'company':
             filtered_employees = self.employee_ids1.filtered(
-                lambda emp: emp.company_id.id == self.company_id.id
+                lambda e: e.company_id == self.company_id
             )
+        elif self.scope_type == 'department':
+            department = self.env.user.department_id
+            if department:
+                all_depts = department.child_ids | department
+                filtered_employees = self.employee_ids1.filtered(
+                    lambda e: e.department_id in all_depts or any(d in all_depts for d in e.department_ids)
+                )
+
         if len(filtered_employees) == 1:
             self.employee_ids = filtered_employees
-        else:
-            domain = [('id', 'in', self.employee_ids1.ids)]
-            if self.is_selection:
-                if self.is_this_company:
-                    domain.append(('company_id', '=', self.company_id.id))
-                all_employees = self.env['hr.employee'].search(domain)
-                self.employee_ids = all_employees
-            else:
-                self.employee_ids = False
+            return
+
+    @api.onchange('scope_type', 'department_id', 'company_id')
+    def _onchange_employee_ids2(self):
+        domain = []
+        if self.scope_type == 'company':
+            domain.append(('company_id', '=', self.company_id.id))
+        elif self.scope_type == 'department':
+            department = self.env.user.department_id
+            if department:
+                all_depts = department.child_ids | department
+                domain.extend([
+                    ('company_id', '=', self.company_id.id),
+                    '|',
+                    ('department_id', 'in', all_depts.ids),
+                    ('department_ids', 'in', all_depts.ids),
+                ])
+        self.employee_ids2 = self.env['hr.employee'].search(domain)
 
     @api.depends('comment_note_id', 'comment_note')
     def _compute_comment(self):
@@ -170,9 +213,9 @@ class SoongWorkflowCommentWizard(models.TransientModel):
 
             record.is_selection = False
             if self.node_btn_name == '退回':
-                record.is_this_company = False
+                record.scope_type = 'group'
             else:
-                record.is_this_company = True
+                record.scope_type = 'company'
             if record.node_btn_id.employee_ids and record.node_btn_id.is_carbon_copy:
                 record.circulated_employee_ids = record.node_btn_id.employee_ids
 
@@ -259,8 +302,6 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                                     button = target_btn
                                     break
                 if button:
-                    if button.is_automatic_group:
-                        record.is_this_company = False
                     if button.is_node_automatic:
                         record.is_selection = True
                         record._onchange_is_selection()
@@ -577,8 +618,149 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                                                                          user_id=employee.wecom_userid,
                                                                          title=record_id._description + "退回",
                                                                          description=description, url=url, btntxt="查看详情")
+
+
+        if self.node_btn_name == '加签':
+            current_node_log = self.sudo().env["soong.workflow.log"].search(
+                [
+                    ("model", "=", self.res_model),
+                    ("res_id", "=", self.res_id),
+                    ("done_by", "=", self.env.user.id),
+                    ("node_id", "=", self.node_btn_id.node_id.id),
+                ],
+                order="create_date DESC",
+                limit=1
+            )
+            current_node_log.write({
+                "comment": self.comment,
+                "approval_state": "2",  # 已完成
+                'document_ids': [(6, 0, self.document_ids.ids)],
+                "lase_click_date": fields.Datetime.now()
+            })
+            if hasattr(record_id, 'user_id') and record_id.user_id:
+                query_user_id = record_id.user_id
+            elif hasattr(record_id, 'users_id') and record_id.users_id:
+                query_user_id = record_id.users_id
+            description = f"标题：{record_id.name}\n申请人：{query_user_id.name}"
+            action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])[0]
+            for employee_id  in self.add_employee_ids:
+                next_node_log_records = self.sudo().env["soong.workflow.log"].create({
+                    'name': '加签',
+                    "code": self.code,
+                    "model": self.res_model,
+                    "res_id": self.res_id,
+                    "node_id": self.node_btn_id.node_id.id,
+                    "workflow_id": self.node_btn_id.workflow_id.id,
+                    "done_by": employee_id.user_id.id,
+                    "node_btn_id": self.node_btn_id.id,
+                    "approval_state": "0",
+                })
+                url = f'https://oa.thtzjt.com/web#id={record_id.id}&cids=2&menu_id={record_id.id}&action={action_id.id}&model={self.res_model}&view_type=form'
+                result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa',
+                                                                         user_id=employee_id.wecom_userid,
+                                                                         title=record_id._description + "加签",
+                                                                         description=description, url=url,
+                                                                         btntxt="查看详情")
+                if result_data and 'msgid' in result_data[-1]:
+                    msg_id = result_data[-1]['msgid']
+                    target_logs = next_node_log_records.filtered(lambda l: l.done_by.id == employee_id.user_id.id)
+                    if target_logs:
+                        target_logs.msg_id = msg_id
+
+            workflow_record_id = self.env['soong.workflow.record'].sudo().search([('res_id', '=', record_id.id),
+                                                                                  ('res_model', '=', record_id._name)
+                                                                                  ])
+            workflow_record_id.employee_ids = self.add_employee_ids
+            workflow_record_id.users_ids = [(4, employee.user_id.id) for employee in self.add_employee_ids if
+                                            employee.user_id]
+
+        if self.node_btn_name == '加签确认':
+            if hasattr(record_id, 'user_id') and record_id.user_id:
+                query_user_id = record_id.user_id
+            elif hasattr(record_id, 'users_id') and record_id.users_id:
+                query_user_id = record_id.users_id
+            description = f"标题：{record_id.name}\n申请人：{query_user_id.name}"
+            action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])[0]
+            user_log = record_id.log_ids.filtered(
+                lambda log: log.done_by == self.env.user.id and log.node_btn_name != '1' and log.approval_state in ['0',
+                                                                                                                '1']
+            )
+            current_node_log = self.sudo().env["soong.workflow.log"].search(
+                [
+                    ("model", "=", self.res_model),
+                    ("res_id", "=", self.res_id),
+                    ("done_by", "=", self.env.user.id),
+                    ("node_id", "=", self.node_btn_id.node_id.id),
+                ],
+                order="create_date DESC",
+                limit=1
+            )
+            current_node_log.write({
+                "comment": self.comment,
+                "approval_state": "2",  # 已完成
+                'document_ids': [(6, 0, self.document_ids.ids)],
+                "lase_click_date": fields.Datetime.now()
+            })
+            log_obj = self.sudo().env["soong.workflow.log"]
+            node_id = self.node_btn_id.node_id.id
+            last_sign_log = log_obj.search([
+                ("model", "=", self.res_model),
+                ("res_id", "=", self.res_id),
+                ("node_id", "=", node_id),
+                ("name", "!=", "加签"),
+            ], order="create_date DESC", limit=1)
+
+            # 如果没有加签日志，直接跳过
+            if not last_sign_log:
+                return
+
+            # 最新加签的经办人
+            last_sign_user = last_sign_log.done_by
+
+            # 2. 找到当前节点所有日志（排除最新加签那条）
+            all_logs = log_obj.search([
+                ("model", "=", self.res_model),
+                ("res_id", "=", self.res_id),
+                ("node_id", "=", node_id),
+                ("name", "=", "加签"),
+                ("id", "!=", user_log.id),
+            ])
+            # 其他人是否都完成了
+            all_other_done = all(log.approval_state == "2" for log in all_logs)
+            # 4. 如果满足 → 创建一条新日志给【最新加签的经办人】
+            if all_other_done:
+                log_obj.create({
+                    "model": self.res_model,
+                    "res_id": self.res_id,
+                    "workflow_id": self.node_btn_id.workflow_id.id,
+                    "node_id": node_id,
+                    "done_by": last_sign_user.id,  # 最新加签的经办人
+                    "approval_state": "0",
+                    "create_date": fields.Datetime.now(),
+                })
+                workflow_record_id = self.env['soong.workflow.record'].sudo().search([('res_id', '=', record_id.id),
+                                                                                      (
+                                                                                      'res_model', '=', record_id._name)
+                                                                                      ])
+                workflow_record_id.employee_ids = [(6, 0, [last_sign_user.employee_ids.id])]
+                url = f'https://oa.thtzjt.com/web#id={record_id.id}&cids=2&menu_id={record_id.id}&action={action_id.id}&model={self.res_model}&view_type=form'
+                self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa',
+                                                                         user_id=last_sign_user.employee_ids.wecom_userid,
+                                                                         title=record_id._description + '加签返回',
+                                                                         description=description, url=url,
+                                                                         btntxt="查看详情")
+
         if self.node_btn_name in ['结束', '确认']:
             title = record_id._description
+            current_comment = self.comment or ''
+            # 自动设置审批结果为 不通过
+            if any(keyword in current_comment for keyword in ['不同意', '不批准', '不通过']):
+                if hasattr(record_id, 'approval_result'):
+                    record_id.approval_result = 'fail'
+            else:
+                if hasattr(record_id, 'approval_result'):
+                    record_id.approval_result = 'pass'
+                    self.node_btn_id.with_context(cx).run()
             if 'Room Booking' == record_id._description:
                 title = '会议通知'
             is_work_remind = False
@@ -776,7 +958,6 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                                                                                  title=title,
                                                                                  description=f"标题为{record_id.name}的{title}已结束，请归档",
                                                                                  url=url, btntxt="查看详情")
-            self.node_btn_id.with_context(cx).run()
         if self.node_btn_name == "分发":
             record_id.is_send = True
             menu_id = self.env['ir.ui.menu'].search([('name', '=', '行政收文')], limit=1)
@@ -863,47 +1044,75 @@ class SoongWorkflowCommentWizard(models.TransientModel):
             record = self.env[self.res_model].search([('id', '=', self.res_id)])
             is_admin = current_user.has_group('base.group_system') or current_user.has_group('base.group_admin')
             log_ids = record.log_ids.sorted('sequence')
-            log_to_delete = log_ids.filtered(lambda log: log.name == record.state)
-            if self.res_model == 'yuthon.official.incoming.normal':
-                director_logs = log_ids.filtered(lambda log: '董事长' in (log.name or ''))
-                if len(director_logs) == 2:
-                    log_to_delete = log_ids[-1:]
-            if not is_admin:
-                invalid_logs = log_to_delete.filtered(
-                    lambda log: log.approval_state in ['1', '2'] and log.node_btn_name != '1'
-                )
-                if invalid_logs:
-                    raise UserError('当前状态不可以收回')
-            total_log_count = len(log_ids)
-            deleted_log_count = len(log_to_delete)
-            prev_log_index = (total_log_count - deleted_log_count) - 1
-            other_log_index = total_log_count - deleted_log_count
-            if prev_log_index < 0 or prev_log_index >= len(log_ids):
-                raise UserError('无有效的上一级审批明细行，无法执行收回操作')
-            prev_log = log_ids[prev_log_index]
+            has_sign_log = log_ids.filtered(lambda log: log.name == '加签' and log.node_id.name == record.state)
+            if has_sign_log:
+                # 加签日志
+                for log in has_sign_log:
+                    if log.approval_state != '0':
+                        raise UserError('加签流程已处理，不可收回！')
+                log_to_delete = has_sign_log
+                # 3. 删除后剩下的最后一条日志（取最后一个）
+                remaining_logs = log_ids - log_to_delete
+                if not remaining_logs:
+                    raise UserError('无上级审批节点，无法收回')
+                prev_log = remaining_logs[-1]  # 删除后的最后一条
+                # 4. 要删除的经办人 ID 列表
+                done_by_list = [log.done_by.id for log in log_to_delete]
+            else:
+                # 无加签日志
+                log_to_delete = log_ids.filtered(lambda log: log.name == record.state)
+                if self.res_model == 'yuthon.official.incoming.normal':
+                    director_logs = log_ids.filtered(lambda log: '董事长' in (log.name or ''))
+                    if len(director_logs) == 2:
+                        log_to_delete = log_ids[-1:]
+                if not is_admin:
+                    invalid_logs = log_to_delete.filtered(
+                        lambda log: log.approval_state in ['1', '2'] and log.node_btn_name != '1'
+                    )
+                    if invalid_logs:
+                        pass
+                total_log_count = len(log_ids)
+                deleted_log_count = len(log_to_delete)
+                prev_log_index = (total_log_count - deleted_log_count) - 1
+                other_log_index = total_log_count - deleted_log_count
+                if prev_log_index < 0 or prev_log_index >= len(log_ids):
+                    raise UserError('无有效的上一级审批明细行，无法执行收回操作')
+                prev_log = log_ids[prev_log_index]
+                done_by_list = []
+                for index in range(other_log_index):
+                    done_by_list.append(log_ids[index].done_by.id)
+
             related_record = self.env[self.res_model].browse(self.res_id)
-            done_by_list = []
-            for index in range(other_log_index):
-                done_by_list.append(log_ids[index].done_by.id)
 
             if hasattr(related_record, 'self_users_ids'):
                 related_record.self_users_ids = [(6, 0, [prev_log.done_by.id])]
-            self.env['soong.workflow.record'].search([('code', '=', record.code)]).write(
-                {"employee_ids": [(6, 0, [prev_log.done_by.employee_ids.id])],
-                 "users_ids": [(6, 0, done_by_list)],
-                 'soong_state': 'to_do'
-                 })
+
+            # 核心写入：使用删除后的最后一条经办人
+            self.env['soong.workflow.record'].search([('code', '=', record.code)]).write({
+                "employee_ids": [(6, 0, [prev_log.done_by.employee_id.id])],
+                "users_ids": [(6, 0, done_by_list)] if not has_sign_log else [(3, user_id) for user_id in done_by_list],
+                'soong_state': 'to_do'
+            })
+
+            # 消息回退 + 删除日志
             for log_delete in log_to_delete:
                 self.sudo().env["wecom.apps"].back_message(log_delete.msg_id, category='approval')
             log_to_delete.unlink()
+
             if record.log_ids2:
                 for log_id2 in record.log_ids2:
                     self.sudo().env["wecom.apps"].back_message(log_id2.msg_id, category='approval')
                 record.log_ids2.unlink()
+
+            # 把最后一条日志置为处理中
             prev_log.write({'approval_state': '1'})
-            record.write({'state': prev_log.name,
-                          'work_end': False,
-                          })
+
+            # 回退状态
+            record.write({
+                'state': prev_log.name,
+                'work_end': False,
+            })
+
         if self.node_btn_name == '归档':
             menu_id = self.env['ir.ui.menu'].search([('name', '=', '行政收文')], limit=1)
             action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])[0]
diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
index 6c42250f5..ba475968e 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
@@ -14,7 +14,7 @@
                     <field name="user_role_ids"/>
                     <field name="comment"/>
                 </group>
-                <group invisible="node_btn_name in ['分发', '结束', '收回', '确认', '归档']">
+                <group invisible="node_btn_name in ['分发', '结束', '收回', '确认', '归档', '加签', '加签确认']">
                     <div class="oe_comment_block"
                          style=" width:1200%; border: 1px solid #dee2e6; border-radius: 4px; padding: 12px; margin-bottom: 16px;">
                         <label for="comment_note_id" string="常用意见"
@@ -43,9 +43,37 @@
                         <field name="document_ids" widget="preview_many2many" force_save="1"/>
                     </group>
                     <group>
-                        <field name="is_this_company"/>
+                        <field name="scope_type"/>
                         <field name="circulated_employee_ids" widget="many2many_tags" options="{'no_create': True}"
-                               domain="[('company_id', '=', company_id)] if is_this_company else []"/>
+                               domain="[('id', 'in', employee_ids2)]"/>
+                    </group>
+                </group>
+                <group invisible="node_btn_name != '加签确认'">
+                     <div class="oe_comment_block"
+                         style=" width:1200%; border: 1px solid #dee2e6; border-radius: 4px; padding: 12px; margin-bottom: 16px;">
+                        <label for="comment_note_id" string="加签意见"
+                               style="font-weight: bold; margin-bottom: 8px; display: block;"/>
+                        <field name="comment_note_id" class="mb-3" style="width: 100%;" options="{'no_create': True}"
+                               domain="[('note_setting_id.users_role_ids', 'in', user_role_ids)]"/>
+                        <field name="comment_note" placeholder="请输入意见内容..." style="width: 100%;"/>
+                    </div>
+                </group>
+                <group invisible="node_btn_name != '加签'">
+                    <div class="oe_comment_block"
+                         style=" width:1200%; border: 1px solid #dee2e6; border-radius: 4px; padding: 12px; margin-bottom: 16px;">
+                        <label for="comment_note_id" string="意见"
+                               style="font-weight: bold; margin-bottom: 8px; display: block;"/>
+                        <field name="comment_note_id" class="mb-3" style="width: 100%;" options="{'no_create': True}"
+                               domain="[('note_setting_id.users_role_ids', 'in', user_role_ids)]"/>
+                        <field name="comment_note" placeholder="请输入意见内容..." style="width: 100%;"/>
+                    </div>
+                    <group>
+                          <label for="scope_type" string="范围"/>
+                        <field name="scope_type" nolabel="1"/>
+                        <field name="company_id" invisible="1"/>
+                        <field name="add_employee_ids" invisible="node_btn_name == '退回'"
+                               widget="many2many_tags" options="{'no_create': True}"
+                               domain="[('id', 'in', employee_ids2)]"/>
                     </group>
                 </group>
                 <group invisible="node_btn_name != '结束'">
@@ -63,7 +91,7 @@
                     <group>
                         <field name="document_ids" widget="preview_many2many"/>
                         <field name="circulated_employee_ids" widget="many2many_tags" options="{'no_create': True}"
-                               domain="[('company_id', '=', company_id)] if is_this_company else []"/>
+                              domain="[('id', 'in', employee_ids2)]"/>
                     </group>
                 </group>
                 <group invisible="node_btn_name != '确认'">
@@ -76,8 +104,9 @@
                         <field name="comment_note" placeholder="请输入意见内容..." style="width: 100%;"/>
                     </div>
                     <group>
+                        <field name="scope_type"/>
                         <field name="circulated_employee_ids" widget="many2many_tags" options="{'no_create': True}"
-                               domain="[('company_id', '=', company_id)] if is_this_company else []"/>
+                               domain="[('id', 'in', employee_ids2)]"/>
                     </group>
                 </group>
                 <group invisible="node_btn_name != '分发'">
@@ -90,7 +119,7 @@
                         <field name="comment_note" placeholder="请输入意见内容..." style="width: 100%;"/>
                     </div>
                 </group>
-                <group invisible="node_btn_name in ['分发', '结束', '收回', '确认', '归档']">
+                <group invisible="node_btn_name in ['分发', '结束', '收回', '确认', '归档', '加签', '加签确认']">
                     <field name="user_id" invisible="1"/>
                     <field name="user_role_ids" widget="many2many_tags" invisible="1"/>
                     <field name="node_btn_id" invisible="1"/>
@@ -100,7 +129,7 @@
                     <field name="is_automatic" invisible="1"/>
                     <field name="is_supervising" invisible="1"/>
                 </group>
-                <group col="2" invisible="node_btn_name in ['分发', '结束', '收回', '确认', '归档']">
+                <group col="2" invisible="node_btn_name in ['分发', '结束', '收回', '确认', '归档', '加签', '加签确认']">
                     <group>
                         <!--  转交人员  -->
                         <field name="workflow_record_id" string="测试流程record" invisible="1"/>
@@ -115,19 +144,20 @@
                                options="{'no_open': True, 'fg_color': 'red'}"   widget="radio" force_save="1"/>
                     </group>
                     <group>
-                        <label for="is_this_company" string="本公司"/>
-                        <field name="is_this_company" nolabel="1"/>
+                        <label for="scope_type" string="范围"/>
+                        <field name="scope_type" nolabel="1"/>
                         <label for="is_selection" string="是否自动选择"/>
                         <field name="is_selection" nolabel="1"/>
                         <field name="company_id" invisible="1"/>
-                        <field name="employee_ids1" widget="many2many_tags" string="人员范围" invisible="1"/>
-                        <field name="employee_ids" widget="many2many_tags" string="人员范围"
-                               domain="[('company_id', '=', company_id), ('id', 'in', employee_ids1)] if is_this_company else [('id', 'in', employee_ids1)]"
+                        <field name="employee_ids1" widget="many2many_tags" string="人员" invisible="1"/>
+                        <field name="employee_ids2"  widget="many2many_tags" invisible="1"/>
+                        <field name="employee_ids" widget="many2many_tags" string="人员"
+                               domain="[('id', 'in', employee_ids1)]"
                                options="{'no_create': True}"
                                context="{'tree_view_ref':'yuthon_hr_employee.view_employee_phone_tree'}"/>
                         <field name="circulated_employee_ids" invisible="node_btn_name == '退回'"
                                widget="many2many_tags" options="{'no_create': True}"
-                               domain="[('company_id', '=', company_id)] if is_this_company else []"/>
+                               domain="[('id', 'in', employee_ids2)]"/>
                     </group>
                 </group>
                 <div invisible="node_btn_name != '收回'">
@@ -140,17 +170,17 @@
                                groups="yuthon_salary.group_jtbb_user"/>
                     </group>
                     <group>
-                        <!-- 分发弹窗：本公司开关控制人员筛选范围 -->
-                        <field name="is_this_company"/>
+                        <!-- 分发弹窗：范围开关控制人员筛选范围 -->
+                        <field name="scope_type"/>
                     </group>
                     <group>
                         <field name="dep_manager_employee_ids" widget="many2many_tags" string="承办"
                                options="{'no_create': True}"
-                               domain="[('company_id', '=', company_id)] if is_this_company else []"/>
+                               domain="[('id', 'in', employee_ids2)]"/>
                     </group>
                     <group>
                         <field name="circulated_employee_ids" widget="many2many_tags" options="{'no_create': True}"
-                               domain="[('company_id', '=', company_id)] if is_this_company else []"/>
+                               domain="[('id', 'in', employee_ids2)]"/>
                     </group>
                     <group>
                         <field name="supervising_employee_ids" widget="many2many_tags" invisible="not is_supervising"
diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py
index 8a5d868a7..3d8105f40 100644
--- a/yuthon_holiday/models/inherit_hr_leave.py
+++ b/yuthon_holiday/models/inherit_hr_leave.py
@@ -868,7 +868,7 @@ class HolidaysRequestBatch(models.Model):
         """
         封装创建加班结转明细的逻辑
         """
-        carry_forward_date = (self.log_ids[-1].lase_click_date).date()
+        carry_forward_date = (self.log_ids[-2].lase_click_date).date()
         self.env['overtime.carryover'].create({
             'leave_id': self.id,
             'over_line_id': over_line.id,
@@ -1069,8 +1069,9 @@ class HolidaysRequestBatch(models.Model):
             record.holiday_allowance2 =  record.holiday_allowance
             if total_annual_leave_days > self.remaining_annual_leave:
                 raise UserError('年假天数额度不足，无法请假')
-            if total_compensatory_leave_days > self.remaining_compensatory_leave / 8:
-                raise UserError('补休天数额度不足，无法请假')
+            if total_compensatory_leave_days:
+                if total_compensatory_leave_days > self.remaining_compensatory_leave / 8:
+                    raise UserError('补休天数额度不足，无法请假')
 
 
     @api.onchange('leave_ids', 'hour_leave_ids', 'employee_id')
diff --git a/yuthon_holiday/views/extended_vacation_approval_views.xml b/yuthon_holiday/views/extended_vacation_approval_views.xml
index 993ac8af8..26abc20c9 100644
--- a/yuthon_holiday/views/extended_vacation_approval_views.xml
+++ b/yuthon_holiday/views/extended_vacation_approval_views.xml
@@ -16,12 +16,6 @@
         <field name="arch" type="xml">
             <form string='假期延长审批' create="1">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                                invisible="urgency_level != 'normal'"/>
-                        <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                                invisible="urgency_level != 'urgent'"/>
-                        <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                                invisible="urgency_level != 'emergency'"/>
                         <group col="5">
                             <group>
                                 <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_holiday/views/hr_leave_batch.xml b/yuthon_holiday/views/hr_leave_batch.xml
index f1dbe7d51..8d585a651 100644
--- a/yuthon_holiday/views/hr_leave_batch.xml
+++ b/yuthon_holiday/views/hr_leave_batch.xml
@@ -27,12 +27,6 @@
                         />
                     </header>
                     <sheet>
-                        <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                                invisible="urgency_level != 'normal'"/>
-                        <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                                invisible="urgency_level != 'urgent'"/>
-                        <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                                invisible="urgency_level != 'emergency'"/>
                         <group col="3">
                             <group>
                                 <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_holiday/views/yuthon_breastfeed_leave_views.xml b/yuthon_holiday/views/yuthon_breastfeed_leave_views.xml
index 36946e00f..4de1b5b46 100644
--- a/yuthon_holiday/views/yuthon_breastfeed_leave_views.xml
+++ b/yuthon_holiday/views/yuthon_breastfeed_leave_views.xml
@@ -16,12 +16,6 @@
         <field name="arch" type="xml">
             <form string="计生假">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                                invisible="urgency_level != 'normal'"/>
-                        <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                                invisible="urgency_level != 'urgent'"/>
-                        <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                                invisible="urgency_level != 'emergency'"/>
                         <group col="4">
                             <group>
                                 <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_holiday/views/yuthon_fixes_approval_views.xml b/yuthon_holiday/views/yuthon_fixes_approval_views.xml
index 1223759aa..69db1e7ba 100644
--- a/yuthon_holiday/views/yuthon_fixes_approval_views.xml
+++ b/yuthon_holiday/views/yuthon_fixes_approval_views.xml
@@ -16,12 +16,6 @@
         <field name="arch" type="xml">
             <form string="假期修正审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                                invisible="urgency_level != 'normal'"/>
-                        <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                                invisible="urgency_level != 'urgent'"/>
-                        <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                                invisible="urgency_level != 'emergency'"/>
                         <group col="4">
                             <group>
                                 <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_attendance/controllers/portal.py b/yuthon_hr_attendance/controllers/portal.py
index 10ee574ce..0fcfb5f25 100644
--- a/yuthon_hr_attendance/controllers/portal.py
+++ b/yuthon_hr_attendance/controllers/portal.py
@@ -94,7 +94,7 @@ class CustomerPortal(portal.CustomerPortal):
             '旷工': format_vacation_value(record.is_work, '次'),
             '异常': format_vacation_value(record.is_abnormal, '次'),
             '年假': format_vacation_value(record.done_leave, '天'),
-            '加班时': format_vacation_value(record.done_working_overtime, '小时', 8),
+            '加班时': format_vacation_value(record.done_working_overtime, '小时'),
             '补休': format_vacation_value(record.cop_leave, '小时', 8),
             '调休': format_vacation_value(record.compensatory_leave, '天'),
             '事假': format_vacation_value(record.leave_of_absence, '天'),
diff --git a/yuthon_hr_attendance/models/go_approval.py b/yuthon_hr_attendance/models/go_approval.py
index 293df8017..d2eddb4f2 100644
--- a/yuthon_hr_attendance/models/go_approval.py
+++ b/yuthon_hr_attendance/models/go_approval.py
@@ -46,11 +46,11 @@ class GoApprovals(models.Model):
     is_this_department = fields.Boolean(string='是否是本部门', default=True)
     department_ids = fields.Many2many('hr.department', string="多部门")
 
-    @api.constrains('is_day', 'start_day_selection', 'end_day_selection')
-    def _check_selection(self):
-        for rec in self:
-            if rec.is_day and (not rec.start_day_selection or not rec.end_day_selection):
-                raise UserError("勾选按天后，必须选择开始时段和结束时段！")
+    @api.constrains('is_day', 'is_hour')
+    def _check_is_day_or_hour(self):
+        for record in self:
+            if not record.is_day and not record.is_hour:
+                raise ValidationError("请至少选择【按天】或【按小时】其中一项！")
 
     @api.constrains('start_date', 'end_date', 'employee_ids')
     def _check_date_overlap(self):
diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py
index 0c5f5085d..9c5f21d41 100644
--- a/yuthon_hr_attendance/models/hr_attendance.py
+++ b/yuthon_hr_attendance/models/hr_attendance.py
@@ -1304,6 +1304,17 @@ class HrAttendance(models.Model):
         pass  #todo 待过
 
     def update_attendance(self, employee, current_date):
+        # 判断当天入职：
+        if current_date <= employee.entry_date:
+            self.write({
+                'is_no_card': False,
+                'is_early_card': False,
+                'is_late_card': False,
+                'is_abnormal': False,
+                'absenteeism_card': False
+            })
+            return
+
         if self.workflow_id:
             if self.workflow_id.res_model == 'card.approval':
                 self.write({
diff --git a/yuthon_hr_attendance/views/card_approval.xml b/yuthon_hr_attendance/views/card_approval.xml
index 18c3b8224..6a75e8fa1 100644
--- a/yuthon_hr_attendance/views/card_approval.xml
+++ b/yuthon_hr_attendance/views/card_approval.xml
@@ -21,12 +21,6 @@
 <!--                   <header>-->
 <!--                           <button name="confirm_approval" type="object" string="批准" class="btn-primary"/>-->
 <!--                   </header>-->
-                   <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_attendance/views/duty_approval.xml b/yuthon_hr_attendance/views/duty_approval.xml
index d4cd79275..53e2e0322 100644
--- a/yuthon_hr_attendance/views/duty_approval.xml
+++ b/yuthon_hr_attendance/views/duty_approval.xml
@@ -15,12 +15,6 @@
         <field name="arch" type="xml">
             <form create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_attendance/views/expatriation_approval.xml b/yuthon_hr_attendance/views/expatriation_approval.xml
index c7ec91876..80017936e 100644
--- a/yuthon_hr_attendance/views/expatriation_approval.xml
+++ b/yuthon_hr_attendance/views/expatriation_approval.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="外派驻点审批">
                 <sheet>
-                      <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_attendance/views/go_approval.xml b/yuthon_hr_attendance/views/go_approval.xml
index 9c5e945e3..6fcd1e5d7 100644
--- a/yuthon_hr_attendance/views/go_approval.xml
+++ b/yuthon_hr_attendance/views/go_approval.xml
@@ -6,7 +6,7 @@
         <field name="model">go.approval</field>
         <field name="arch" type="xml">
             <tree>
-               <field name="name"/>
+                <field name="name"/>
                 <field name="users_id" options="{'no_create': True}"/>
             </tree>
         </field>
@@ -16,14 +16,8 @@
         <field name="name">go.approval.actions</field>
         <field name="model">go.approval</field>
         <field name="arch" type="xml">
-           <form create="0">
+            <form create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
@@ -35,7 +29,7 @@
                             <field name="is_issues"/>
                         </group>
                         <group>
-                              <field name="is_this_department"/>
+                            <field name="is_this_department"/>
                         </group>
                     </group>
                     <div class="col-12 text-center">
@@ -46,51 +40,53 @@
                     <div class="oe_title">
                         <label for="name" style="font-size: 1.05rem; font-weight: 600;"/>
                         <div>
-                            <field name="name" required="1" placeholder="请输入标题" style="font-size: 1.05rem; font-weight: 600;"/>
+                            <field name="name" required="1" placeholder="请输入标题"
+                                   style="font-size: 1.05rem; font-weight: 600;"/>
                         </div>
                     </div>
-                        <group col="3">
-                            <group>
-                                <field name="is_day"/>
-                            </group>
-                            <group>
-                                <field name="is_hour"/>
-                            </group>
-                            <group/>
+                    <group col="3">
+                        <group>
+                            <field name="is_day"/>
                         </group>
-                        <group col="3">
-                            <group>
-                                <field name="days" invisible="1"/>
-                                <field name="is_back" invisible="1"/>
-                                 <field name="users_id" invisible="1"/>
-                                <field name="work_end" invisible="1"/>
-                                <field name="start_date" invisible="not is_day"/>
-                                <field name="end_date" invisible="not is_day"/>
-                            </group>
-                            <group>
-                                <field name="start_day_selection" invisible="not is_day" required="is_day" string=" "/>
-                                <field name="end_day_selection" invisible="not is_day" required="is_day" string=" "/>
-                            </group>
-                            <group/>
+                        <group>
+                            <field name="is_hour"/>
                         </group>
-                        <group col="3">
-                            <group>
-                                 <field name="date_start" invisible="not is_hour"/>
-                            </group>
-                            <group>
-                                <field name="date_end" invisible="not is_hour"/>
-                            </group>
-                            <group>
-                                <field name="hours" invisible="not is_hour"/>
-                            </group>
+                        <group/>
+                    </group>
+                    <group col="3">
+                        <group>
+                            <field name="days" invisible="1"/>
+                            <field name="is_back" invisible="1"/>
+                            <field name="users_id" invisible="1"/>
+                            <field name="work_end" invisible="1"/>
+                            <field name="start_date" invisible="not is_day" required="is_day"/>
+                            <field name="end_date" invisible="not is_day" required="is_day"/>
                         </group>
+                        <group>
+                            <field name="start_day_selection" invisible="not is_day" required="is_day" string=" "/>
+                            <field name="end_day_selection" invisible="not is_day" required="is_day" string=" "/>
+                        </group>
+                        <group/>
+                    </group>
+                    <group col="3">
+                        <group>
+                            <field name="date_start" invisible="not is_hour" required="is_hour"/>
+                        </group>
+                        <group>
+                            <field name="date_end" invisible="not is_hour" required="is_hour"/>
+                        </group>
+                        <group>
+                            <field name="hours" invisible="not is_hour" required="is_hour"/>
+                        </group>
+                    </group>
                     <group col="2">
                         <group>
                             <field name="related_issues_id" invisible="is_issues == False"/>
                             <field name="reason_application"/>
                             <field name="company_id" invisible="1"/>
                             <field name="department_ids" widget="many2many_tags" invisible="1"/>
-                            <field name="employee_ids" widget="many2many_tags" options="{'no_create': True}" domain="[('department_id', 'in', department_ids)] if department_ids else [('company_id', '=', company_id)]"/>
+                            <field name="employee_ids" widget="many2many_tags" options="{'no_create': True}"
+                                   domain="[('department_id', 'in', department_ids)] if department_ids else [('company_id', '=', company_id)]"/>
                             <field name="is_issues" invisible="is_issues == False"/>
                             <field name="meal"/>
                             <field name="details"/>
diff --git a/yuthon_hr_attendance/views/leave_approval.xml b/yuthon_hr_attendance/views/leave_approval.xml
index 2c3888aee..bd6666f16 100644
--- a/yuthon_hr_attendance/views/leave_approval.xml
+++ b/yuthon_hr_attendance/views/leave_approval.xml
@@ -25,12 +25,6 @@
                     <button name="leave_approval" string="发起申请" type="object" class="oe_highlight"/>
                     <field name="statu" widget="statusbar"/>
                 </header>
-                <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_attendance/views/meal_approval.xml b/yuthon_hr_attendance/views/meal_approval.xml
index f6b233654..035fb3b9f 100644
--- a/yuthon_hr_attendance/views/meal_approval.xml
+++ b/yuthon_hr_attendance/views/meal_approval.xml
@@ -16,12 +16,6 @@
         <field name="arch" type="xml">
             <form string="报餐单">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_attendance/views/remove_holiday_approval.xml b/yuthon_hr_attendance/views/remove_holiday_approval.xml
index 24ddba913..c7c4e3ded 100644
--- a/yuthon_hr_attendance/views/remove_holiday_approval.xml
+++ b/yuthon_hr_attendance/views/remove_holiday_approval.xml
@@ -19,12 +19,6 @@
         <field name="arch" type="xml">
             <form create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml b/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
index 446cec297..dd84f0e6a 100644
--- a/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="值班调休审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml b/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
index 6e85df86b..1fff995ad 100644
--- a/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="值班调休审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml b/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
index 69f871b16..d2dd94017 100644
--- a/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
@@ -16,12 +16,6 @@
         <field name="arch" type="xml">
             <form string="客服值班审批" create="0">
                 <sheet>
-                   <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_attendance/views/yuthon_holiday_statement.xml b/yuthon_hr_attendance/views/yuthon_holiday_statement.xml
index 533140069..ae45cbc3b 100644
--- a/yuthon_hr_attendance/views/yuthon_holiday_statement.xml
+++ b/yuthon_hr_attendance/views/yuthon_holiday_statement.xml
@@ -65,21 +65,11 @@
         </field>
     </record>
     <record id="view_yuthon_holiday_statement_action" model="ir.actions.act_window">
-        <field name="name">请假情况</field>
+        <field name="name">请假归档</field>
         <field name="res_model">hr.leave</field>
         <field name="view_mode">tree,search</field>
-        <field name="domain">[('is_filing','=', False)]</field>
         <field name="context">{'search_default_now_month': 1, 'search_default_group_by_employee_id':1}</field>
         <field name="view_id" ref="view_hr_leave_statement_tree"/>
         <field name="search_view_id" ref="view_hr_leave_statement_search"/>
     </record>
-    <record id="view_yuthon_holiday_statement_active_action" model="ir.actions.act_window">
-        <field name="name">请假归档</field>
-        <field name="res_model">hr.leave</field>
-        <field name="view_mode">tree,search</field>
-        <field name="domain">[('is_filing','=', True)]</field>
-        <field name="context">{'search_default_now_month': 1, 'search_default_group_by_employee_id':1}</field>
-        <field name="view_id" ref="view_hr_leave_statement_active_tree"/>
-        <field name="search_view_id" ref="view_hr_leave_statement_search"/>
-    </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
index cce615419..45a9734bb 100644
--- a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
@@ -20,12 +20,6 @@
 <!--                    <header>-->
 <!--                        <button name="button_shift_approval" type="object" string="批准" class="oe_highlight"/>-->
 <!--                    </header>-->
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_attendance/views/yuthon_special_approval_views.xml b/yuthon_hr_attendance/views/yuthon_special_approval_views.xml
index 95d3312fe..8d6543735 100644
--- a/yuthon_hr_attendance/views/yuthon_special_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_special_approval_views.xml
@@ -20,12 +20,6 @@
 <!--                    <header>-->
 <!--                        <button name="button_special_approval" type="object" string="批准" class="oe_highlight"/>-->
 <!--                    </header>-->
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py
index 399c2adb8..6241a5e00 100644
--- a/yuthon_hr_employee/models/yuthon_hr_employee.py
+++ b/yuthon_hr_employee/models/yuthon_hr_employee.py
@@ -152,6 +152,9 @@ class YuthonHrEmployee(models.Model):
     employment_registration = fields.Text(string="就业登记办理情况")
     seniority_prize_pick_up_status = fields.Text(string="工龄相关年功奖领取情况")
 
+    # 考勤机信息
+    att_lot_ids = fields.One2many('attendance.iot.user', 'employee_id', string="考勤机信息")
+
     # 紧急联系人
     emergency_contact_ids = fields.One2many('yuthon.emergency.contact.line', 'employee_id', string="紧急联系人明细行")
     # 工作经历
diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index 20a14391e..27f209518 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -422,6 +422,15 @@
                         </tree>
                     </field>
                 </page>
+                <page string="考勤机信息">
+                    <field name="att_lot_ids">
+                        <tree editable="bottom">
+                            <field name="employee_id" column_invisible="1"/>
+                            <field name="attendance_iot_id"/>
+                            <field name="attendance_address"/>
+                        </tree>
+                    </field>
+                </page>
                 <page string="专项扣除" name="deduction">
                     <group string="3岁以下婴幼儿照护">
                         <field name="care_line_ids" string=" ">
diff --git a/yuthon_hr_employee_approval/views/contract_review_approval_views.xml b/yuthon_hr_employee_approval/views/contract_review_approval_views.xml
index 7c8318bfa..c3ddf7671 100644
--- a/yuthon_hr_employee_approval/views/contract_review_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/contract_review_approval_views.xml
@@ -23,12 +23,6 @@
                         class="btn-primary" invisible="not work_end"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/property_reimbursement_form_views.xml b/yuthon_hr_employee_approval/views/property_reimbursement_form_views.xml
index 0edcb6fc8..d96c9cac8 100644
--- a/yuthon_hr_employee_approval/views/property_reimbursement_form_views.xml
+++ b/yuthon_hr_employee_approval/views/property_reimbursement_form_views.xml
@@ -16,12 +16,6 @@
         <field name="model">property.reimbursement.form</field>
         <field name="arch" type="xml">
             <form string="报销单" create="0">
-                <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml
index 28694cb16..f6b963f52 100644
--- a/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml
@@ -20,12 +20,6 @@
         <field name="arch" type="xml">
             <form create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_department_change_viwes.xml b/yuthon_hr_employee_approval/views/yuthon_department_change_viwes.xml
index 3728a14fe..a2226a7c0 100644
--- a/yuthon_hr_employee_approval/views/yuthon_department_change_viwes.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_department_change_viwes.xml
@@ -19,12 +19,6 @@
         <field name="arch" type="xml">
             <form string="部门变更审批">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_employee_add_views.xml b/yuthon_hr_employee_approval/views/yuthon_employee_add_views.xml
index 1a4beb4c1..60c8814bd 100644
--- a/yuthon_hr_employee_approval/views/yuthon_employee_add_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_employee_add_views.xml
@@ -16,12 +16,6 @@
         <field name="arch" type="xml">
             <form string="员工合同补充协议">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml
index 9c9d5337a..7d330fb9f 100644
--- a/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml
@@ -22,12 +22,6 @@
                     <button name="put_interview_wizard" string="结束" type="object" class='btn btn-primary'/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
index 37028227e..a0a504a98 100644
--- a/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
@@ -25,12 +25,6 @@
                     />
                 </header>
                 <sheet>
-                   <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml b/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml
index 6ac2e3213..5199e491c 100644
--- a/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml
@@ -25,12 +25,6 @@
                     <button name="pub_name_button" string="发送邀请链接" type="object" class='btn btn-primary'/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="5">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
index 8aebab4dc..6d92785ec 100644
--- a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
@@ -22,12 +22,6 @@
                     <button name="action_print_onboard_approval" string="打印" type="object" class="btn-primary"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="5">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_pre_examination_views.xml b/yuthon_hr_employee_approval/views/yuthon_pre_examination_views.xml
index 96e7fd459..aba585844 100644
--- a/yuthon_hr_employee_approval/views/yuthon_pre_examination_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_pre_examination_views.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="投资项目预审表">
                 <sheet>
-                     <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml
index 59e7aa9b6..2ff48055e 100644
--- a/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml
index 67b1ef5c9..cb7411acb 100644
--- a/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml
@@ -22,12 +22,6 @@
         <field name="arch" type="xml">
             <form create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml
index da0486788..e8c332ef6 100644
--- a/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml
@@ -20,12 +20,6 @@
 <!--                    <header>-->
 <!--                        <button name="put_time_failure" type="object" string="Approve" class="btn btn-primary"/>-->
 <!--                    </header>-->
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
index 89a35b086..7949e46fc 100644
--- a/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
@@ -18,12 +18,6 @@
         <field name="arch" type="xml">
             <form create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml
index 7bc25acad..81c821844 100644
--- a/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml
@@ -20,12 +20,6 @@
                     <button name="action_print_renewal_approval" string="打印" type="object" class="btn-primary"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml
index c0d3d4ddb..e771828ef 100644
--- a/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml
@@ -18,12 +18,6 @@
         <field name="arch" type="xml">
             <form string="退休申请" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml
index d67535cd9..d300c9392 100644
--- a/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml
@@ -19,12 +19,6 @@
         <field name="arch" type="xml">
             <form create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml
index a415040d6..3f8e1ab13 100644
--- a/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml
@@ -19,12 +19,6 @@
         <field name="arch" type="xml">
             <form create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_social_files_approval_view.xml b/yuthon_hr_employee_approval/views/yuthon_social_files_approval_view.xml
index 7e03b461b..8f803fa5f 100644
--- a/yuthon_hr_employee_approval/views/yuthon_social_files_approval_view.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_social_files_approval_view.xml
@@ -33,12 +33,6 @@
         <field name="arch" type="xml">
             <form create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py
index 4d752cd24..b91fa324a 100644
--- a/yuthon_issue/models/issue_library.py
+++ b/yuthon_issue/models/issue_library.py
@@ -351,9 +351,6 @@ class IssueLibrary(models.Model):
             if push_update_vals:
                 rec.push_invisible = True
                 rec.write(push_update_vals)
-                rec.write({
-                    'issue_state': 'to_approval',
-                })
 
     def _compute_is_admin(self):
         is_admin = self.env.user.has_group('base.group_system')
@@ -831,6 +828,16 @@ class IssueLibrary(models.Model):
                 raise UserError('议题已上会，不能删除')
         return super().unlink()
 
+    def my_unlink(self):
+        is_admin = self.env.user.has_group('base.group_system')
+        current_user = self.env.user
+        for i in self:
+            if i.issue_state == 'on_meet':
+                raise UserError('议题已上会，不能删除')
+            if not is_admin:
+                if i.employee_id.user_id != current_user:
+                    raise UserError('只能删除自己的记录，无权删除他人数据')
+
     @api.depends('name')
     def _compute_name(self):
         for record in self:
diff --git a/yuthon_issue/views/issue_boss_approval_views.xml b/yuthon_issue/views/issue_boss_approval_views.xml
index 34b751bb2..231699e91 100644
--- a/yuthon_issue/views/issue_boss_approval_views.xml
+++ b/yuthon_issue/views/issue_boss_approval_views.xml
@@ -6,12 +6,6 @@
         <field name="arch" type="xml">
             <form string="董事议题申报">
                 <sheet>
-                     <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_issue/views/issue_class_approval_views.xml b/yuthon_issue/views/issue_class_approval_views.xml
index 40da8a137..70748393f 100644
--- a/yuthon_issue/views/issue_class_approval_views.xml
+++ b/yuthon_issue/views/issue_class_approval_views.xml
@@ -6,12 +6,6 @@
         <field name="arch" type="xml">
             <form string="班子议题申报">
                 <sheet>
-                     <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index d77ac0eb5..39b686e8d 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -4,7 +4,7 @@
         <field name="name">issue.library.tree</field>
         <field name="model">issue.library</field>
         <field name="arch" type="xml">
-            <tree string="我的议题"
+            <tree string="我的议题" delete="0"
                   decoration-info="issue_state == 'will'"
                   decoration-success="issue_state == 'done'"
                   decoration-muted="issue_state == 'cancel'">
@@ -39,7 +39,7 @@
                         invisible="issue_state == 'draft'" groups="soong_workflow.group_soong_workflow_manager"/>
                 <button name="issue_cancel" string="取消" type="object" class="btn btn-blue"
                         groups="soong_workflow.group_soong_workflow_manager"/>
-                <button name="unlink" string="删除" type="object" class="btn btn-blue"
+                <button name="my_unlink" string="删除" type="object" class="btn btn-blue"
                         invisible="is_push_depart == True"/>
                 <button name="approval_details" string="审批详情" type="object" class="btn btn-blue"
                         invisible="not issue_approval_id"/>
@@ -105,7 +105,7 @@
         <field name="name">issue.library.tree</field>
         <field name="model">issue.library</field>
         <field name="arch" type="xml">
-            <tree string="部门议题库"
+            <tree string="部门议题库" create="0" delete="0" edit="0"
                   decoration-info="issue_state == 'will'"
                   decoration-success="issue_state == 'done'"
                   decoration-muted="issue_state == 'cancel'">
diff --git a/yuthon_issue/views/issue_party_approval_views.xml b/yuthon_issue/views/issue_party_approval_views.xml
index 162e36207..121a7823b 100644
--- a/yuthon_issue/views/issue_party_approval_views.xml
+++ b/yuthon_issue/views/issue_party_approval_views.xml
@@ -6,12 +6,6 @@
         <field name="arch" type="xml">
             <form string="党议题申报">
                 <sheet>
-                     <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_lessee_service/views/property_report_repair.xml b/yuthon_lessee_service/views/property_report_repair.xml
index 37b5d57bc..ff33f0994 100644
--- a/yuthon_lessee_service/views/property_report_repair.xml
+++ b/yuthon_lessee_service/views/property_report_repair.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="报事报修审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_maintain/views/processing_order_approval_views.xml b/yuthon_maintain/views/processing_order_approval_views.xml
index 54355e5ff..9b5a12f75 100644
--- a/yuthon_maintain/views/processing_order_approval_views.xml
+++ b/yuthon_maintain/views/processing_order_approval_views.xml
@@ -22,12 +22,6 @@
         <field name="arch" type="xml">
             <form string="处理单审批" create="1">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="处理编号" readonly="1"/>
diff --git a/yuthon_maintain/views/property_device_repair_views.xml b/yuthon_maintain/views/property_device_repair_views.xml
index c46189199..a58da88d7 100644
--- a/yuthon_maintain/views/property_device_repair_views.xml
+++ b/yuthon_maintain/views/property_device_repair_views.xml
@@ -22,12 +22,6 @@
         <field name="arch" type="xml">
             <form string="报事报修" create="1">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="保修编号" readonly="1"/>
diff --git a/yuthon_maintain/views/property_report_repair.xml b/yuthon_maintain/views/property_report_repair.xml
index d7b445eee..65261ff15 100644
--- a/yuthon_maintain/views/property_report_repair.xml
+++ b/yuthon_maintain/views/property_report_repair.xml
@@ -22,12 +22,6 @@
         <field name="arch" type="xml">
             <form string="报事报修（物业）" create="1">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="保修编号" readonly="1"/>
diff --git a/yuthon_notice/views/yuthon_notice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml
index 3c676a695..2467873ac 100644
--- a/yuthon_notice/views/yuthon_notice_views.xml
+++ b/yuthon_notice/views/yuthon_notice_views.xml
@@ -8,13 +8,13 @@
                   decoration-info="notice_state == 'no'"
                   decoration-muted="notice_state == 'stop'" default_order="create_date1 desc">
                 <field name="name" required="1"/>
-                <field name="notice_type_id" string="类型" class="list_ids_width"/>
-                <field name="users_id" string="发布人" class="list_ids_width"/>
+                <field name="notice_type_id" string="类型"/>
+                <field name="users_id" string="发布人"/>
                 <field name="department_id" column_invisible="1"/>
                 <field name="users_ids" column_invisible="1"/>
                 <field name="create_date1"/>
                 <field name="end_date"/>
-                <field name="notice_state" class="list_ids_width"/>
+                <field name="notice_state"/>
                 <button name="on_sequence" string="置顶" invisible="sequence != 0" type="object" class="btn btn-blue"/>
                 <button name="no_sequence" string="取消置顶" invisible="sequence != 1" type="object" class="btn btn-blue"/>
                 <button name="look_up_notice_users" string="查阅情况" type="object" class="btn btn-blue"/>
@@ -33,12 +33,6 @@
                     <button name="action_print_notice" string="打印" type="object" class="btn-primary" invisible="not work_end"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
@@ -128,7 +122,7 @@
                   js_class="custom_notice_tree_button" default_order="create_date1 desc">
                 <field name="name"/>
                 <field name="notice_type_id" string="类型"/>
-                <field name="users_id" string="发布人" class="list_ids_width"/>
+                <field name="users_id" string="发布人"/>
                 <field name="is_notice_roger"/>
                 <field name="department_id" column_invisible="1"/>
                 <field name="users_ids" column_invisible="1"/>
diff --git a/yuthon_official/views/yuthon_cross_departmental_views.xml b/yuthon_official/views/yuthon_cross_departmental_views.xml
index f5efdc492..d1b0fb82e 100644
--- a/yuthon_official/views/yuthon_cross_departmental_views.xml
+++ b/yuthon_official/views/yuthon_cross_departmental_views.xml
@@ -16,12 +16,6 @@
         <field name="arch" type="xml">
             <form string="跨部门协作">
                 <sheet>
-                   <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_official/views/yuthon_file_processing_views.xml b/yuthon_official/views/yuthon_file_processing_views.xml
index 4509a2f81..9fd6b5a14 100644
--- a/yuthon_official/views/yuthon_file_processing_views.xml
+++ b/yuthon_official/views/yuthon_file_processing_views.xml
@@ -29,12 +29,6 @@
 <!--                    <button name="supervising_button" string="督办" type="object" class="btn-primary" invisible="not is_supervising"/>-->
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                    <group col="5">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_official/views/yuthon_official_branch_party_views.xml b/yuthon_official/views/yuthon_official_branch_party_views.xml
index ebae3316b..eb2542e9d 100644
--- a/yuthon_official/views/yuthon_official_branch_party_views.xml
+++ b/yuthon_official/views/yuthon_official_branch_party_views.xml
@@ -22,12 +22,6 @@
                     <field name="statu" widget="statusbar"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_official/views/yuthon_official_incoming_labor_views.xml b/yuthon_official/views/yuthon_official_incoming_labor_views.xml
index 9c15faaba..f1f96bd1b 100644
--- a/yuthon_official/views/yuthon_official_incoming_labor_views.xml
+++ b/yuthon_official/views/yuthon_official_incoming_labor_views.xml
@@ -22,12 +22,6 @@
                     <field name="statu" widget="statusbar"/>
                 </header>
                 <sheet>
-                     <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_official/views/yuthon_official_incoming_party_views.xml b/yuthon_official/views/yuthon_official_incoming_party_views.xml
index 5607349df..223284d6f 100644
--- a/yuthon_official/views/yuthon_official_incoming_party_views.xml
+++ b/yuthon_official/views/yuthon_official_incoming_party_views.xml
@@ -21,12 +21,6 @@
                     <field name="statu" widget="statusbar"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_official/views/yuthon_official_labor_views.xml b/yuthon_official/views/yuthon_official_labor_views.xml
index ec3c56689..7e059f692 100644
--- a/yuthon_official/views/yuthon_official_labor_views.xml
+++ b/yuthon_official/views/yuthon_official_labor_views.xml
@@ -19,12 +19,6 @@
         <field name="arch" type="xml">
             <form create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_official/views/yuthon_official_party_views.xml b/yuthon_official/views/yuthon_official_party_views.xml
index 7fcb27b77..ff246a98b 100644
--- a/yuthon_official/views/yuthon_official_party_views.xml
+++ b/yuthon_official/views/yuthon_official_party_views.xml
@@ -22,12 +22,6 @@
                     <field name="statu" widget="statusbar"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_official/views/yuthon_official_seal_views.xml b/yuthon_official/views/yuthon_official_seal_views.xml
index a79fc421d..35c0f0727 100644
--- a/yuthon_official/views/yuthon_official_seal_views.xml
+++ b/yuthon_official/views/yuthon_official_seal_views.xml
@@ -23,12 +23,6 @@
                     <field name="statu" widget="statusbar"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                            invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'extra_urgent'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_official/views/yuthon_official_views.xml b/yuthon_official/views/yuthon_official_views.xml
index 94231aa41..b169585ae 100644
--- a/yuthon_official/views/yuthon_official_views.xml
+++ b/yuthon_official/views/yuthon_official_views.xml
@@ -35,12 +35,6 @@
                             class="btn-primary" invisible="not work_end"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                    <group col="5">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_official/views/yuthon_property_official_views.xml b/yuthon_official/views/yuthon_property_official_views.xml
index a30df2f48..c92021857 100644
--- a/yuthon_official/views/yuthon_property_official_views.xml
+++ b/yuthon_official/views/yuthon_property_official_views.xml
@@ -33,12 +33,6 @@
                             class="btn-primary" invisible="not work_end"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                    <group col="5">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_official/views/yuthon_sub_enterprises_view.xml b/yuthon_official/views/yuthon_sub_enterprises_view.xml
index 4f71b41e9..e05e1fe55 100644
--- a/yuthon_official/views/yuthon_sub_enterprises_view.xml
+++ b/yuthon_official/views/yuthon_sub_enterprises_view.xml
@@ -28,12 +28,6 @@
                         class="btn-primary" invisible="not work_end"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                            invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'extra_urgent'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property/static/src/scss/property_scss.scss b/yuthon_property/static/src/scss/property_scss.scss
index 864cb4082..d8b62360d 100644
--- a/yuthon_property/static/src/scss/property_scss.scss
+++ b/yuthon_property/static/src/scss/property_scss.scss
@@ -7,4 +7,46 @@
 .list_name_width{
     width: 300px !important;
     max-width: 300px !important;
+}
+
+/* Many2one/Many2many 下拉选项换行显示 - 仅影响弹窗 */
+/* 精确选择 autocomplete 下拉列表 */
+.o-autocomplete .dropdown-menu .dropdown-item {
+    white-space: normal !important;
+    word-break: break-all !important;
+    word-wrap: break-word !important;
+    max-width: 400px !important;
+}
+
+/* 精确选择 select2 下拉选项 */
+.select2-container--odoo .select2-dropdown .select2-results__option {
+    white-space: normal !important;
+    word-break: break-all !important;
+    word-wrap: break-word !important;
+    max-width: 400px !important;
+}
+
+/* 精确选择 Many2One 搜索弹窗（仅弹窗内部）*/
+.o_field_many2one .modal-dialog .o_list_view .o_list_table td.o_data_cell {
+    white-space: normal !important;
+    word-break: break-all !important;
+    word-wrap: break-word !important;
+    max-width: 300px !important;
+}
+
+/* 精确选择 Many2Many 标签换行 */
+.o_field_many2many_tags .o_m2o_tags {
+    white-space: normal !important;
+}
+.o_field_many2many_tags .o_m2o_tag {
+    white-space: normal !important;
+    word-break: break-all !important;
+    max-width: 200px !important;
+}
+
+/* 主页面 tree 视图保持原样 - 防止被上面的样式影响 */
+.o_main_content .o_view_controller .o_list_view .o_list_table td.o_data_cell {
+    white-space: nowrap !important;
+    word-break: normal !important;
+    word-wrap: normal !important;
 }
\ No newline at end of file
diff --git a/yuthon_property/views/property_bank_statements_views.xml b/yuthon_property/views/property_bank_statements_views.xml
index 4c8c6c172..4644c46ab 100644
--- a/yuthon_property/views/property_bank_statements_views.xml
+++ b/yuthon_property/views/property_bank_statements_views.xml
@@ -118,7 +118,7 @@
         <field name="name">receivable.modify.line.tree</field>
         <field name="model">receivable.modify.line</field>
         <field name="arch" type="xml">
-            <tree string="应收流水中间表" editable="top">
+            <tree string="应收流水中间表" editable="top" default_order="due_date desc">
                 <field name="bank_id"/>
                 <field name="no_amount"/>
                 <field name="bank_state"/>
diff --git a/yuthon_property/views/property_evaluation_plan_view.xml b/yuthon_property/views/property_evaluation_plan_view.xml
index d445b5319..b8ca1fef7 100644
--- a/yuthon_property/views/property_evaluation_plan_view.xml
+++ b/yuthon_property/views/property_evaluation_plan_view.xml
@@ -63,12 +63,12 @@
             <field name="arch" type="xml">
                 <tree string="物业信息">
                     <field name="name" required="1" class="list_name_width"/>
-                    <field name="management_area" digits="[16, 4]" class="list_ids_width"/>
-                    <field name="rent_area" digits="[16, 4]" class="list_ids_width"/>
-                    <field name="equity_area" digits="[16, 4]" class="list_ids_width"/>
+                    <field name="management_area" digits="[16, 4]" />
+                    <field name="rent_area" digits="[16, 4]" />
+                    <field name="equity_area" digits="[16, 4]" />
                     <field name="title_deed"/>
                     <field name="title_address" optional="hide"/>
-                    <field name="property_state" class="list_ids_width"/>
+                    <field name="property_state"/>
                 </tree>
             </field>
     </record>
diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index 35e1b66b0..205b72416 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -14,14 +14,14 @@
                     <button name="put_property_management" string="物业变更" type="object" class="btn btn-primary"/>
                 </header>
                 <field name="name" required="1" class="list_name_width"/>
-                <field name="management_area" digits="[16, 4]" class="list_ids_width"/>
-                <field name="rent_area" digits="[16, 4]" class="list_ids_width"/>
-                <field name="equity_area" digits="[16, 4]" class="list_ids_width"/>
+                <field name="management_area" digits="[16, 4]"/>
+                <field name="rent_area" digits="[16, 4]"/>
+                <field name="equity_area" digits="[16, 4]"/>
                 <field name="title_deed"/>
                 <field name="title_address" optional="hide"/>
-                <field name="property_state" class="list_ids_width"/>
-                <field name="property_leasing" class="list_ids_width"/>
-                <field name="purpose_id" class="list_ids_width"/>
+                <field name="property_state"/>
+                <field name="property_leasing"/>
+                <field name="purpose_id"/>
                 <field name="property_type"/>
                 <field name="is_new" column_invisible="1"/>
                 <field name="first_letter" column_invisible="1"/>
diff --git a/yuthon_property_approval/models/property_bills_payable.py b/yuthon_property_approval/models/property_bills_payable.py
index 49c4c642c..dc8b20b34 100644
--- a/yuthon_property_approval/models/property_bills_payable.py
+++ b/yuthon_property_approval/models/property_bills_payable.py
@@ -4,6 +4,44 @@ from odoo.modules import get_module_resource
 from datetime import datetime, timedelta, date
 
 
+def rmb_upper(value):
+    """
+    人民币大写转换
+    :param value: 阿拉伯数字
+    :return: 中文大写金额
+    """
+    if not value or value == 0:
+        return ''
+    rmbmap = [u"零", u"壹", u"贰", u"叁", u"肆", u"伍", u"陆", u"柒", u"捌", u"玖"]
+    unit = [u"分", u"角", u"元", u"拾", u"佰", u"仟", u"万", u"拾", u"佰", u"仟", u"亿",
+            u"拾", u"佰", u"仟", u"万", u"拾", u"佰", u"仟", u"兆"]
+    xflag = 0
+    if value < 0:
+        xflag = value
+        value = abs(value)
+    nums = list(map(int, list(str('%0.2f' % value).replace('.', ''))))
+    words = []
+    zflag = 0
+    start = len(nums) - 3
+    for i in range(start, -3, -1):
+        if 0 != nums[start - i] or len(words) == 0:
+            if zflag:
+                words.append(rmbmap[0])
+                zflag = 0
+            words.append(rmbmap[nums[start - i]])
+            words.append(unit[i + 2])
+        elif 0 == i or (0 == i % 4 and zflag < 3):
+            words.append(unit[i + 2])
+            zflag = 0
+        else:
+            zflag += 1
+    if words[-1] != unit[0]:
+        words.append(u"整")
+    if xflag < 0:
+        words.insert(0, u"负")
+    return ''.join(words)
+
+
 class PropertyBillsPayable(models.Model):
     _name = 'property.bills.payable'
     _description = '应付账单申请'
@@ -23,21 +61,34 @@ class PropertyBillsPayable(models.Model):
     amount_payable = fields.Float('应付金额')
     deduction_amount = fields.Float('扣除金额')
     actual_amount = fields.Float('实付金额')
+    amount_upper = fields.Char(string='金额大写', compute='_compute_amount_upper')
     remake = fields.Text(string='备注')
+
+    @api.depends('actual_amount')
+    def _compute_amount_upper(self):
+        for record in self:
+            record.amount_upper = rmb_upper(record.actual_amount)
     remarks = fields.Text(string='正文')
     document_ids = fields.Many2many('ir.attachment', string="附件")
+    attachment_count = fields.Char(string='附件张数')
     active = fields.Boolean('Active', default=True, tracking=True)
     work_end = fields.Boolean(string="结束")
-    payment_type = fields.Selection([
-        ('deposit_refund', '退押'),
-        ('lease_refund', '退租'),
-        ('engineering', '工程款'),
-        ('agency_fee', '中介费'),
-        ('other', '其他')
-    ], string='付款类型')
+    business_type_id = fields.Many2one('property.business.type', string='业务类型')
+    payment_account = fields.Selection([
+        ('basic', '基本户'),
+        ('loan', '贷款户'),
+        ('bank_of_china', '中行'),
+        ('subsidy', '补贴专户'),
+        ('return', '回笼户'),
+        ('operating', '经营性专户')
+    ], string='支付账户')
+    payee_id = fields.Many2one('property.tenant.information', string='收款单位/收款人')
+    payee_bank = fields.Char(string='开户行')
+    payee_account = fields.Char(string='银行账号')
+    payment_type_id = fields.Many2one('property.payment.type', string='付款类型')
 
     def _get_default_name_title(self):
-        return self._description if self._description else self._name
+        return '付款申请单'
     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])])
@@ -47,6 +98,13 @@ class PropertyBillsPayable(models.Model):
         if self.amount_payable and self.deduction_amount:
             self.actual_amount = self.amount_payable - self.deduction_amount
 
+    @api.onchange('payee_id')
+    def _onchange_payee_id(self):
+        if self.payee_id and self.payee_id.bank_ids:
+            bank_line = self.payee_id.bank_ids[0]
+            self.payee_bank = bank_line.name
+            self.payee_account = bank_line.bank
+
     def end_approval(self):
         self.write({'work_end': True})
         management_type_id = self.env['yuthon.management.type'].search([('name', '=', '押金')], limit=1)
@@ -69,3 +127,21 @@ class PropertyBillsPayable(models.Model):
 class PropertyBillsLine(models.Model):
     _name = 'property.bills.line'
     _description = '账单明细'
+
+
+class PropertyBusinessType(models.Model):
+    _name = 'property.business.type'
+    _description = '业务类型'
+    
+    name = fields.Char(string='业务类型名称', required=True)
+    code = fields.Char(string='编码')
+    active = fields.Boolean('Active', default=True)
+
+
+class PropertyPaymentType(models.Model):
+    _name = 'property.payment.type'
+    _description = '付款类型'
+    
+    name = fields.Char(string='付款类型名称', required=True)
+    code = fields.Char(string='编码')
+    active = fields.Boolean('Active', default=True)
\ No newline at end of file
diff --git a/yuthon_property_approval/models/property_open_rent.py b/yuthon_property_approval/models/property_open_rent.py
index 3af73be1b..760f00df1 100644
--- a/yuthon_property_approval/models/property_open_rent.py
+++ b/yuthon_property_approval/models/property_open_rent.py
@@ -44,9 +44,9 @@ class PropertyOpenRent(models.Model):
     # 租期
     term_start_time = fields.Date(string="租期开始")
     term_end_time = fields.Date(string="租期结束")
-    lease_term_year = fields.Integer(string="租期(年)", compute='_compute_lease_term', store=True)
-    lease_term_month = fields.Integer(string="租期(月)", compute='_compute_lease_term', store=True)
-    lease_term_day = fields.Integer(string="租期(日)", compute='_compute_lease_term', store=True)
+    lease_term_year = fields.Integer(string="租期(年)", store=True)
+    lease_term_month = fields.Integer(string="租期(月)", store=True)
+    lease_term_day = fields.Integer(string="租期(日)", store=True)
 
     # 递增
     first_years_begin = fields.Integer(string="第几年开始", default=2)
diff --git a/yuthon_property_approval/security/ir.model.access.csv b/yuthon_property_approval/security/ir.model.access.csv
index b085ab4aa..278bc8e7c 100644
--- a/yuthon_property_approval/security/ir.model.access.csv
+++ b/yuthon_property_approval/security/ir.model.access.csv
@@ -140,4 +140,6 @@ access_property_fee_form,property_fee_form,model_property_fee_form,base.group_us
 access_property_fee_form_line,property_fee_form_line,model_property_fee_form_line,base.group_user,1,1,1,1
 
 access_refund_wizard,refund_wizard,model_refund_wizard,base.group_user,1,1,1,1
-access_refund_wizard_line,refund_wizard_line,model_refund_wizard_line,base.group_user,1,1,1,1
\ No newline at end of file
+access_refund_wizard_line,refund_wizard_line,model_refund_wizard_line,base.group_user,1,1,1,1
+access_property_business_type,property_business_type,model_property_business_type,base.group_user,1,1,1,1
+access_property_payment_type,property_payment_type,model_property_payment_type,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/yuthon_property_approval/views/payment_process_viwes.xml b/yuthon_property_approval/views/payment_process_viwes.xml
index 504c76abd..5dfbd2064 100644
--- a/yuthon_property_approval/views/payment_process_viwes.xml
+++ b/yuthon_property_approval/views/payment_process_viwes.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="支付流程">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_accounting_approval_views.xml b/yuthon_property_approval/views/property_accounting_approval_views.xml
index 79aa19f72..82ba7d767 100644
--- a/yuthon_property_approval/views/property_accounting_approval_views.xml
+++ b/yuthon_property_approval/views/property_accounting_approval_views.xml
@@ -19,12 +19,6 @@
         <field name="arch" type="xml">
             <form string="建设工程委托监理合同审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_accounts_approval_views.xml b/yuthon_property_approval/views/property_accounts_approval_views.xml
index 74a68f8d1..2e05c84cf 100644
--- a/yuthon_property_approval/views/property_accounts_approval_views.xml
+++ b/yuthon_property_approval/views/property_accounts_approval_views.xml
@@ -16,12 +16,6 @@
         <field name="arch" type="xml">
             <form string="应收账单生成审批单">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_approval_views.xml b/yuthon_property_approval/views/property_approval_views.xml
index 67d769f6d..701644df3 100644
--- a/yuthon_property_approval/views/property_approval_views.xml
+++ b/yuthon_property_approval/views/property_approval_views.xml
@@ -18,12 +18,6 @@
         <field name="arch" type="xml">
             <form string="新增物业审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_bills_payable_views.xml b/yuthon_property_approval/views/property_bills_payable_views.xml
index 75826c72f..ac34efe60 100644
--- a/yuthon_property_approval/views/property_bills_payable_views.xml
+++ b/yuthon_property_approval/views/property_bills_payable_views.xml
@@ -17,51 +17,90 @@
         <field name="arch" type="xml">
             <form string="应付账单审批">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                            invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
                         </group>
                         <group>
-                            <field name="urgency_level" readonly="1"/>
+                            <field name="urgency_level" string="紧急度"/>
+                        </group>
+                        <group>
+                            <field name="due_date" string="单据日期"/>
                         </group>
-                        <group/>
-                        <group/>
                     </group>
+
                     <div class="col-12 text-center">
                         <h1>
-                            <field name="name_title" readonly="1"/>
+                            <field name="name_title" string="标题" readonly="1"/>
                         </h1>
                     </div>
-                    <group string="审批事项">
+
+                    <group col="2">
                         <group>
-                            <field name="is_back" invisible="1"/>
-                            <field name="name"/>
-                            <field name="payment_type"/>
-                            <field name="users_id"/>
-                            <field name="work_end" invisible="1"/>
-                            <field name="company_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="remarks"/>
-                            <field name="document_ids" widget="preview_many2many"/>
+                            <field name="department_id" string="申请部门"/>
+                        </group>
+                        <group>
+                            <field name="users_id" string="申请人"/>
                         </group>
                     </group>
-                    <group string="详情">
+
+                    <separator string="业务核心信息"/>
+                    <group col="2">
                         <group>
-                            <field name="lease_contract_id"/>
-                            <field name="property_name"/>
-                            <field name="lessee_id" string="收款方"/>
-                            <field name="amount_payable"/>
-                            <field name="deduction_amount"/>
-                             <field name="remake" invisible="not deduction_amount"/>
-                            <field name="actual_amount"/>
+                            <field name="payment_type_id" string="付款类型"/>
+                            <field name="lease_contract_id" string="合同信息" options="{'no_create': True}"/>
+                            <field name="payment_account" string="支付账户"/>
+                        </group>
+                        <group>
+                            <field name="business_type_id" string="业务类型"/>
+                            <field name="property_name" string="物业信息"/>
                         </group>
                     </group>
+
+                    <separator string="收款方信息"/>
+                    <group col="1">
+                        <group>
+                            <field name="payee_id" string="收款单位/收款人"/>
+                        </group>
+                    </group>
+                    <group col="2">
+                        <group>
+                            <field name="payee_bank" string="开户行"/>
+                        </group>
+                        <group>
+                            <field name="payee_account" string="银行账号"/>
+                        </group>
+                    </group>
+
+                    <separator string="金额信息"/>
+                    <div class="oe_form_box">
+                        <group col="3">
+                            <group>
+                                <field name="amount_payable" string="应付金额"/>
+                                <field name="amount_upper" string="金额大写" readonly="1"/>
+                            </group>
+                            <group>
+                                <field name="deduction_amount" string="扣除金额"/>
+                                <field name="attachment_count" string="附件张数"/>
+                            </group>
+                            <group>
+                                <field name="actual_amount" string="实付金额"/>
+                            </group>
+                        </group>
+                    </div>
+                    <group col="1">
+                        <group>
+                            <field name="remarks" string="付款说明" style="height: 150px; width: 100%;"/>
+                        </group>
+                    </group>
+                    <field name="document_ids" widget="preview_many2many" invisible="1"/>
+                    <field name="is_back" invisible="1"/>
+                    <field name="work_end" invisible="1"/>
+                    <field name="company_id" invisible="1"/>
+                    <field name="lessee_id" invisible="1"/>
+                    <field name="remake" invisible="1"/>
+                    <field name="self_users_ids" invisible="1"/>
+                    <field name="name" invisible="1"/>
                 </sheet>
             </form>
         </field>
@@ -72,6 +111,3 @@
         <field name="view_mode">tree,form</field>
     </record>
 </odoo>
-
-
-
diff --git a/yuthon_property_approval/views/property_borrowing_approval_views.xml b/yuthon_property_approval/views/property_borrowing_approval_views.xml
index 39d769f8a..80250f746 100644
--- a/yuthon_property_approval/views/property_borrowing_approval_views.xml
+++ b/yuthon_property_approval/views/property_borrowing_approval_views.xml
@@ -18,12 +18,6 @@
         <field name="arch" type="xml">
             <form string="借支审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_capacity.xml b/yuthon_property_approval/views/property_capacity.xml
index 874afc1cb..1530c076f 100644
--- a/yuthon_property_approval/views/property_capacity.xml
+++ b/yuthon_property_approval/views/property_capacity.xml
@@ -16,12 +16,6 @@
         <field name="arch" type="xml">
             <form string="增容审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_confirm_views.xml b/yuthon_property_approval/views/property_confirm_views.xml
index a7653e40b..d68a5bc57 100644
--- a/yuthon_property_approval/views/property_confirm_views.xml
+++ b/yuthon_property_approval/views/property_confirm_views.xml
@@ -20,12 +20,6 @@
                     <button name="action_print_property_confirm" string="打印" type="object" class="btn-primary"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                            invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_construction_approval_views.xml b/yuthon_property_approval/views/property_construction_approval_views.xml
index ce2490d66..eaf25b7c6 100644
--- a/yuthon_property_approval/views/property_construction_approval_views.xml
+++ b/yuthon_property_approval/views/property_construction_approval_views.xml
@@ -19,12 +19,6 @@
         <field name="arch" type="xml">
             <form string="施工合同合同审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="合同编号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_current_approval_views.xml b/yuthon_property_approval/views/property_current_approval_views.xml
index a519e3f2f..6da729b00 100644
--- a/yuthon_property_approval/views/property_current_approval_views.xml
+++ b/yuthon_property_approval/views/property_current_approval_views.xml
@@ -18,12 +18,6 @@
         <field name="arch" type="xml">
             <form string="租赁合同审批表">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_delegated_agent_views.xml b/yuthon_property_approval/views/property_delegated_agent_views.xml
index 4855a9ef4..29e0ab673 100644
--- a/yuthon_property_approval/views/property_delegated_agent_views.xml
+++ b/yuthon_property_approval/views/property_delegated_agent_views.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="零星工程" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_design_approval_views.xml b/yuthon_property_approval/views/property_design_approval_views.xml
index 3e281ac45..8874d0394 100644
--- a/yuthon_property_approval/views/property_design_approval_views.xml
+++ b/yuthon_property_approval/views/property_design_approval_views.xml
@@ -19,12 +19,6 @@
         <field name="arch" type="xml">
             <form string="建设工程设计合同审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_eligibility.xml b/yuthon_property_approval/views/property_eligibility.xml
index 0e2b84620..b00d130f1 100644
--- a/yuthon_property_approval/views/property_eligibility.xml
+++ b/yuthon_property_approval/views/property_eligibility.xml
@@ -19,12 +19,6 @@
                     <button name="action_print_property_eligibility" string="打印" type="object" class="btn-primary"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="5">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_engineering_approval_views.xml b/yuthon_property_approval/views/property_engineering_approval_views.xml
index 704691285..501402e63 100644
--- a/yuthon_property_approval/views/property_engineering_approval_views.xml
+++ b/yuthon_property_approval/views/property_engineering_approval_views.xml
@@ -19,12 +19,6 @@
         <field name="arch" type="xml">
             <form string="工程合同审批表">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_fee_form_views.xml b/yuthon_property_approval/views/property_fee_form_views.xml
index 92b41c590..9fb93bb5d 100644
--- a/yuthon_property_approval/views/property_fee_form_views.xml
+++ b/yuthon_property_approval/views/property_fee_form_views.xml
@@ -24,12 +24,6 @@
         <field name="arch" type="xml">
             <form string="费用支出">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                            invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特级" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'extra_urgent'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_fee_spending_view.xml b/yuthon_property_approval/views/property_fee_spending_view.xml
index 5b211a016..bf8b03206 100644
--- a/yuthon_property_approval/views/property_fee_spending_view.xml
+++ b/yuthon_property_approval/views/property_fee_spending_view.xml
@@ -4,7 +4,7 @@
         <field name="name">property.fee.spending.tree</field>
         <field name="model">property.fee.spending</field>
         <field name="arch" type="xml">
-            <tree string="费用支出">
+            <tree string="费用支出" default_order="creart_datetime desc">
                 <field name="code" string="流水号"/>
                 <field name="name"/>
                 <field name="spending_fee"/>
@@ -22,12 +22,6 @@
         <field name="arch" type="xml">
             <form string="费用支出">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                            invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特级" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'extra_urgent'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_handover_views.xml b/yuthon_property_approval/views/property_handover_views.xml
index 8a7979f1d..a925007a5 100644
--- a/yuthon_property_approval/views/property_handover_views.xml
+++ b/yuthon_property_approval/views/property_handover_views.xml
@@ -18,12 +18,6 @@
         <field name="arch" type="xml">
             <form string="移交审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_intention_views.xml b/yuthon_property_approval/views/property_intention_views.xml
index 5a324a421..d6ac1ecbf 100644
--- a/yuthon_property_approval/views/property_intention_views.xml
+++ b/yuthon_property_approval/views/property_intention_views.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form create="0">
                  <sheet>
-                     <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_lease_extension.xml b/yuthon_property_approval/views/property_lease_extension.xml
index 79e907e86..4508edecd 100644
--- a/yuthon_property_approval/views/property_lease_extension.xml
+++ b/yuthon_property_approval/views/property_lease_extension.xml
@@ -19,12 +19,6 @@
         <field name="arch" type="xml">
             <form string="续租审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_lease_renewal.xml b/yuthon_property_approval/views/property_lease_renewal.xml
index 885fb2d58..15f8c280e 100644
--- a/yuthon_property_approval/views/property_lease_renewal.xml
+++ b/yuthon_property_approval/views/property_lease_renewal.xml
@@ -21,12 +21,6 @@
                     <button name="action_print_lease_renewal" string="打印" type="object" class="btn-primary"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                            invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_management.xml b/yuthon_property_approval/views/property_management.xml
index 9274efd94..73df5e8ef 100644
--- a/yuthon_property_approval/views/property_management.xml
+++ b/yuthon_property_approval/views/property_management.xml
@@ -21,12 +21,6 @@
 <!--                        <button string="approval" type="object" class="btn btn-primary" name="approval_end"/>-->
 <!--                    </header>-->
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_management_fee.xml b/yuthon_property_approval/views/property_management_fee.xml
index c545cf316..2be900b9b 100644
--- a/yuthon_property_approval/views/property_management_fee.xml
+++ b/yuthon_property_approval/views/property_management_fee.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="管理费审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_meeting_approval_views.xml b/yuthon_property_approval/views/property_meeting_approval_views.xml
index c463f43e7..0cb4eb1a9 100644
--- a/yuthon_property_approval/views/property_meeting_approval_views.xml
+++ b/yuthon_property_approval/views/property_meeting_approval_views.xml
@@ -18,12 +18,6 @@
         <field name="arch" type="xml">
             <form string="会议审批">
                 <sheet>
-                     <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_merge_approval_views.xml b/yuthon_property_approval/views/property_merge_approval_views.xml
index 493bc2ef6..e3c9c38dd 100644
--- a/yuthon_property_approval/views/property_merge_approval_views.xml
+++ b/yuthon_property_approval/views/property_merge_approval_views.xml
@@ -23,12 +23,6 @@
 <!--                    <header>-->
 <!--                        <button name="put_merge_message" type="object" string="按钮" class="oe_highlight"/>-->
 <!--                    </header>-->
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_offline_registration.xml b/yuthon_property_approval/views/property_offline_registration.xml
index 5d7e8d501..e01705531 100644
--- a/yuthon_property_approval/views/property_offline_registration.xml
+++ b/yuthon_property_approval/views/property_offline_registration.xml
@@ -19,12 +19,6 @@
         <field name="arch" type="xml">
             <form string="线下承租方报名表" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_open_rent_views.xml b/yuthon_property_approval/views/property_open_rent_views.xml
index 8bcae0a47..449098fd7 100644
--- a/yuthon_property_approval/views/property_open_rent_views.xml
+++ b/yuthon_property_approval/views/property_open_rent_views.xml
@@ -17,15 +17,12 @@
         <field name="arch" type="xml">
             <form string="物业公开招租" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success" invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning" invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger" invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
                         </group>
                         <group>
-                            <field name="urgency_level" readonly="1"/>
+                            <field name="urgency_level"/>
                         </group>
                         <group/>
                     </group>
diff --git a/yuthon_property_approval/views/property_penalty_proportion.xml b/yuthon_property_approval/views/property_penalty_proportion.xml
index 86d458599..89b966164 100644
--- a/yuthon_property_approval/views/property_penalty_proportion.xml
+++ b/yuthon_property_approval/views/property_penalty_proportion.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="违约金比例审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_penalty_relief.xml b/yuthon_property_approval/views/property_penalty_relief.xml
index 799d3fe42..6e56a3868 100644
--- a/yuthon_property_approval/views/property_penalty_relief.xml
+++ b/yuthon_property_approval/views/property_penalty_relief.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="违约金减免审批" create="0">
                 <sheet>
-                     <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_project_approval_views.xml b/yuthon_property_approval/views/property_project_approval_views.xml
index f2bf6ed84..4ce2b3d51 100644
--- a/yuthon_property_approval/views/property_project_approval_views.xml
+++ b/yuthon_property_approval/views/property_project_approval_views.xml
@@ -19,12 +19,6 @@
         <field name="arch" type="xml">
             <form string="项目立项审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_project_works_viwes.xml b/yuthon_property_approval/views/property_project_works_viwes.xml
index 73e685484..828eb8773 100644
--- a/yuthon_property_approval/views/property_project_works_viwes.xml
+++ b/yuthon_property_approval/views/property_project_works_viwes.xml
@@ -18,12 +18,6 @@
         <field name="arch" type="xml">
             <form string="项目工程" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特级" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_record_views.xml b/yuthon_property_approval/views/property_record_views.xml
index c24a297eb..f8185d7ac 100644
--- a/yuthon_property_approval/views/property_record_views.xml
+++ b/yuthon_property_approval/views/property_record_views.xml
@@ -23,12 +23,6 @@
         <field name="arch" type="xml">
             <form string="评估备案" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_renamed.xml b/yuthon_property_approval/views/property_renamed.xml
index d17ff12ba..2d3206000 100644
--- a/yuthon_property_approval/views/property_renamed.xml
+++ b/yuthon_property_approval/views/property_renamed.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="更名申请表" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特级" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_rent_relief.xml b/yuthon_property_approval/views/property_rent_relief.xml
index 8bc2eeb9c..247295cd4 100644
--- a/yuthon_property_approval/views/property_rent_relief.xml
+++ b/yuthon_property_approval/views/property_rent_relief.xml
@@ -19,12 +19,6 @@
         <field name="arch" type="xml">
             <form string="租金减免审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_rental_conditions.xml b/yuthon_property_approval/views/property_rental_conditions.xml
index 76db6e76d..9e26b12c0 100644
--- a/yuthon_property_approval/views/property_rental_conditions.xml
+++ b/yuthon_property_approval/views/property_rental_conditions.xml
@@ -20,12 +20,6 @@
         <field name="arch" type="xml">
             <form string="出租条件调整" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_rental_form_views.xml b/yuthon_property_approval/views/property_rental_form_views.xml
index 7cc877ad1..0af505535 100644
--- a/yuthon_property_approval/views/property_rental_form_views.xml
+++ b/yuthon_property_approval/views/property_rental_form_views.xml
@@ -16,12 +16,6 @@
         <field name="arch" type="xml">
             <form string="挂牌申报表" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特级" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_service_approval_views.xml b/yuthon_property_approval/views/property_service_approval_views.xml
index 277d3abe8..6d6b05c22 100644
--- a/yuthon_property_approval/views/property_service_approval_views.xml
+++ b/yuthon_property_approval/views/property_service_approval_views.xml
@@ -18,12 +18,6 @@
         <field name="arch" type="xml">
             <form string="服务审批表">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_split_approval_views.xml b/yuthon_property_approval/views/property_split_approval_views.xml
index 860fb556c..f0183d3bb 100644
--- a/yuthon_property_approval/views/property_split_approval_views.xml
+++ b/yuthon_property_approval/views/property_split_approval_views.xml
@@ -23,12 +23,6 @@
 <!--                    <header>-->
 <!--                        <button name="put_split_message" type="object" string="按钮" class="oe_highlight"/>-->
 <!--                    </header>-->
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_sporadic_works_views.xml b/yuthon_property_approval/views/property_sporadic_works_views.xml
index 62be5cd51..bc13ea678 100644
--- a/yuthon_property_approval/views/property_sporadic_works_views.xml
+++ b/yuthon_property_approval/views/property_sporadic_works_views.xml
@@ -15,12 +15,6 @@
         <field name="arch" type="xml">
             <form string="项目委托招标代理合同" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特级" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_supervising_approval_views.xml b/yuthon_property_approval/views/property_supervising_approval_views.xml
index ee01aa8a3..5b74fd377 100644
--- a/yuthon_property_approval/views/property_supervising_approval_views.xml
+++ b/yuthon_property_approval/views/property_supervising_approval_views.xml
@@ -19,12 +19,6 @@
         <field name="arch" type="xml">
             <form string="建设工程委托监理合同审批" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特级" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_transaction_confirmed.xml b/yuthon_property_approval/views/property_transaction_confirmed.xml
index 6111cfcd3..a6b11e098 100644
--- a/yuthon_property_approval/views/property_transaction_confirmed.xml
+++ b/yuthon_property_approval/views/property_transaction_confirmed.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="成交确认书" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特级" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/views/property_transfer_views.xml b/yuthon_property_approval/views/property_transfer_views.xml
index afe017ee0..fe36c9ef2 100644
--- a/yuthon_property_approval/views/property_transfer_views.xml
+++ b/yuthon_property_approval/views/property_transfer_views.xml
@@ -18,12 +18,6 @@
         <field name="arch" type="xml">
             <form string="物业移交" create="0">
                  <sheet>
-                      <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特级" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_property_approval/wizard/binding_information_wizard.py b/yuthon_property_approval/wizard/binding_information_wizard.py
index 9a3e9d2fa..c043c05a2 100644
--- a/yuthon_property_approval/wizard/binding_information_wizard.py
+++ b/yuthon_property_approval/wizard/binding_information_wizard.py
@@ -115,9 +115,12 @@ class BindingInformationWizard(models.Model):
                     'name': name,
                 })
 
-        bank_ids = self.env['property.bank.statements'].search([('name', '=', self.bank_id.name),
-                                                                ('your_own_unit', '=', self.bank_id.your_own_unit),
-                                                                ('bank_state', '=', 'not_reconciled'),
-                                                                ])
+        bank_accounts = self.bank_id.lessee_ids.bank_ids.mapped('bank')
+        clean_accounts = [x for x in bank_accounts if x.strip() if x]
+        bank_ids = self.env['property.bank.statements'].search([
+            ('name', 'in', clean_accounts),
+            ('your_own_unit', '=', self.bank_id.your_own_unit),
+            ('bank_state', '!=', 'reconciled'),
+        ])
         for bank_id in bank_ids:
             bank_id._compute_property_employee_id()
\ No newline at end of file
diff --git a/yuthon_purchase/__manifest__.py b/yuthon_purchase/__manifest__.py
index 57283d0c4..d69a46666 100644
--- a/yuthon_purchase/__manifest__.py
+++ b/yuthon_purchase/__manifest__.py
@@ -21,7 +21,8 @@
     'application': True,
     'assets': {
         'web.assets_backend': [
-            'yuthon_purchase/static/xml/misc.xml'
+            'yuthon_purchase/static/xml/misc.xml',
+            'yuthon_purchase/static/src/scss/purchase_order.scss'
         ],
     }
 
diff --git a/yuthon_purchase/static/src/scss/purchase_order.scss b/yuthon_purchase/static/src/scss/purchase_order.scss
new file mode 100644
index 000000000..1c1796958
--- /dev/null
+++ b/yuthon_purchase/static/src/scss/purchase_order.scss
@@ -0,0 +1,5 @@
+.o_m2o_mutil_line {
+    white-space: normal !important;
+    word-break: break-all !important;
+    word-wrap: break-word !important;
+}
diff --git a/yuthon_purchase/views/inherit_purchase_order_views.xml b/yuthon_purchase/views/inherit_purchase_order_views.xml
index 709a3db4f..28ffbcb1d 100644
--- a/yuthon_purchase/views/inherit_purchase_order_views.xml
+++ b/yuthon_purchase/views/inherit_purchase_order_views.xml
@@ -186,6 +186,7 @@
                 </xpath>
                 <xpath expr="//field[@name='order_line']//tree//field[@name='product_id']" position="attributes">
                     <attribute name="domain">purchase_type == 'fixed_asset' and [('product_tag_ids.name', 'in', ['固定资产'])] or purchase_type == 'sporadic' and [('product_tag_ids.name', 'not in', ['固定资产'])] or []</attribute>
+                    <attribute name="class">o_m2o_mutil_line</attribute>
                 </xpath>
                 <xpath expr="//field[@name='order_line']//tree//field[@name='product_id']" position="after">
                     <field name="brand_spec" string="品牌/规格" optional="show"/>
diff --git a/yuthon_report/__manifest__.py b/yuthon_report/__manifest__.py
index 87b40b247..0903b90d9 100644
--- a/yuthon_report/__manifest__.py
+++ b/yuthon_report/__manifest__.py
@@ -18,6 +18,7 @@
         'views/deposit_reports.xml',
         'views/cum_income_report.xml',
         'views/cum_arrears_report.xml',
+        'views/bank_statements_report.xml',
         'views/menu.xml',
         'views/ledger_report_views.xml',
         'views/receivable_report_views.xml',
@@ -36,6 +37,7 @@
         'views/staff_position_report.xml',
         'views/hydropower_report_views.xml',
         'views/receivable_flow_report.xml',
+        'views/text_summary_report.xml',
     ],
     'installable': True,
     'application': True,
@@ -66,6 +68,10 @@
             'yuthon_report/static/src/components/yuthon_report/receivable_report.js',
             'yuthon_report/static/src/components/yuthon_report/receivable_report.xml',
             'yuthon_report/static/src/components/yuthon_report/receivable_flow_report.js',
+            'yuthon_report/static/src/components/yuthon_report/text_summary_report.js',
+            'yuthon_report/static/src/components/yuthon_report/text_summary_report.xml',
+            'yuthon_report/static/src/components/yuthon_report/simple_bank_report.js',
+            'yuthon_report/static/src/components/yuthon_report/simple_bank_report.xml',
         ],
     }
 
diff --git a/yuthon_report/models/__init__.py b/yuthon_report/models/__init__.py
index bc84c2a18..8b3190974 100644
--- a/yuthon_report/models/__init__.py
+++ b/yuthon_report/models/__init__.py
@@ -30,4 +30,6 @@ from . import deposit_cum_arrears_report
 from . import deposit_month_refund_report
 from . import receivable_flow_report
 from . import hydropower_report
-from . import receivable_filter_domains
\ No newline at end of file
+from . import receivable_filter_domains
+from . import text_summary_report
+from . import bank_statements_report
\ No newline at end of file
diff --git a/yuthon_report/models/bank_statements_report.py b/yuthon_report/models/bank_statements_report.py
new file mode 100644
index 000000000..111552ab5
--- /dev/null
+++ b/yuthon_report/models/bank_statements_report.py
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+from odoo import api, models
+
+
+class BankStatementsReport(models.Model):
+    _name = 'bank.statements.report'
+    _description = '未对挂账报表'
+
+    @api.model
+    def get_bank_statements_report(self, params):
+        """
+        "未对挂账报表（数据源：property.bank.statements）："
+        - bank_state 字段值是'挂账'和'未对账'的
+        - 字段：交易时间、交易金额、已对账、未对、备注、摘要、对方户名、账号单位、状态
+        - 搜索条件：公司
+        """
+        domain = []
+
+        # 过滤 bank_state 为 '挂账' 和 '未对账'
+        domain.append(('bank_state', 'in', ['not_reconciled', 'registered']))
+
+        # 公司搜索条件
+        company_id = params.get('company_id')
+        if company_id:
+            domain.append(('company_id', '=', company_id))
+
+        # 账号单位搜索条件
+        your_own_unit = params.get('your_own_unit')
+        if your_own_unit and isinstance(your_own_unit, str) and your_own_unit.strip():
+            domain.append(('your_own_unit', 'ilike', your_own_unit.strip()))
+
+        # 搜索关键字
+        keyword = params.get('keyword')
+        if keyword and isinstance(keyword, str) and keyword.strip():
+            domain += [
+                '|', '|', '|', '|', '|', '|', '|',
+                ('name_account', 'ilike', keyword.strip()),
+                ('name', 'ilike', keyword.strip()),
+                ('your_own_account', 'ilike', keyword.strip()),
+                ('your_own_unit', 'ilike', keyword.strip()),
+                ('extract', 'ilike', keyword.strip()),
+                ('remake', 'ilike', keyword.strip()),
+                ('serial_number', 'ilike', keyword.strip()),
+            ]
+
+        # 搜索数据
+        lines = self.env['property.bank.statements'].sudo().search(domain, order="start_time desc")
+
+        rows = []
+        total_amount = 0.0
+        for idx, line in enumerate(lines, start=1):
+            amount = round(line.original_amount or 0.0, 2)
+            total_amount += amount
+
+            rows.append({
+                "序号": idx,
+                "交易时间": line.start_time.strftime('%Y-%m-%d %H:%M:%S') if line.start_time else '',
+                "交易金额": amount,
+                "已对账": round(line.yes_amount or 0.0, 2),
+                "未对": round(line.no_amount or 0.0, 2),
+                "备注": line.remake or '',
+                "摘要": line.extract or '',
+                "对方户名": line.name_account or '',
+                "账号单位": line.your_own_unit or '',
+                "状态": dict(line._fields['bank_state'].selection).get(line.bank_state, line.bank_state),
+            })
+
+        stats = [
+            {'name': '记录总数', 'amount': len(rows)},
+            {'name': '交易总金额', 'amount': round(total_amount, 2)},
+        ]
+
+        return {"rows": rows, "stats": stats}
+
+    @api.model
+    def get_your_own_unit_options(self):
+        """获取账号单位选项列表"""
+        # 使用 distinct 获取唯一的账号单位值
+        self.env.cr.execute("""
+            SELECT DISTINCT your_own_unit
+            FROM property_bank_statements
+            WHERE bank_state IN ('not_reconciled', 'registered')
+              AND your_own_unit IS NOT NULL
+              AND your_own_unit != ''
+            ORDER BY your_own_unit
+        """)
+        results = self.env.cr.fetchall()
+        return [{'label': row[0], 'value': row[0]} for row in results]
diff --git a/yuthon_report/models/cum_arrears_report.py b/yuthon_report/models/cum_arrears_report.py
index b3f1a6a47..c29f41823 100644
--- a/yuthon_report/models/cum_arrears_report.py
+++ b/yuthon_report/models/cum_arrears_report.py
@@ -31,22 +31,28 @@ class CumArrearsReport(models.Model):
         domain = [
             ('receivable_id.due_date', '<=', month_end),
             ('receivable_id.is_invalid', '=', False),
-            ('not_collected', '>', 0),
         ]
 
         keyword = params.get("keyword")
-        if keyword:
+        print(f"[累计欠收报表] keyword = {keyword}")
+        # 处理 False, None, '' 等falsy值，只对非空字符串进行搜索
+        # 前端可能传递 False 表示无搜索，所以需要特殊处理
+        if keyword is not False and keyword is not None and isinstance(keyword, str) and keyword.strip():
+            print(f"[累计欠收报表] 添加搜索条件: {keyword}")
             domain += [
                 '|', '|',
-                ('receivable_id.contract_id.contract_code', 'ilike', keyword),
-                ('receivable_id.property_name', 'ilike', keyword),
-                ('receivable_id.lessee_id.name', 'ilike', keyword),
+                ('receivable_id.contract_id.contract_code', 'ilike', keyword.strip()),
+                ('receivable_id.property_name', 'ilike', keyword.strip()),
+                ('receivable_id.lessee_id.name', 'ilike', keyword.strip()),
             ]
 
         condition = params.get('condition')
         partner_id = params.get('partner_id')
         company_id = params.get('company_id')
         management_type_id = params.get('management_type_id')
+        property_id = params.get('property_id')
+        lessee_id = params.get('lessee_id')
+        contract_id = params.get('contract_id')
 
         if condition:
             domain.append(('receivable_id.tenure_type', '=', condition))
@@ -59,8 +65,20 @@ class CumArrearsReport(models.Model):
         else:
             # 排除押金和违约金类型
             domain.append(('receivable_id.management_type_id.name', 'not in', ['押金', '违约金']))
+        if property_id:
+            domain.append(('receivable_id.property_ids', 'in', [property_id]))
+        if lessee_id:
+            domain.append(('receivable_id.lessee_id', '=', lessee_id))
+        if contract_id:
+            domain.append(('receivable_id.contract_id', '=', contract_id))
 
-        lines = self.search(domain, order="receivable_id asc")
+        print(f"[累计欠收报表] domain = {domain}")
+        lines = self.sudo().search(domain, order="receivable_id asc")
+        print(f"[累计欠收报表] 搜索到的记录数 = {len(lines)}")
+
+        # 欠收条件: not_collected > 0
+        lines = lines.filtered(lambda l: l.not_collected and l.not_collected > 0)
+        print(f"[累计欠收报表] 过滤后记录数 = {len(lines)}")
 
         rows = []
         total_amount = 0.0
diff --git a/yuthon_report/models/pre_arrears_report.py b/yuthon_report/models/pre_arrears_report.py
index f8bb1f5e7..85c89b9eb 100644
--- a/yuthon_report/models/pre_arrears_report.py
+++ b/yuthon_report/models/pre_arrears_report.py
@@ -30,9 +30,9 @@ class PreArrearsReport(models.Model):
         query_month_start = datetime.datetime.fromisoformat(date_start).date() if date_start else this_month_first
         query_month_end = datetime.datetime.fromisoformat(date_end).date() if date_end else this_month_first
 
-        # 核心逻辑:due_date <= cutoff_date(查询月及之前的应收)
+        # 核心逻辑:due_date < query_month_start(应收日期在查询月之前,不包含查询月)
         domain = [
-            ('receivable_id.due_date', '<=', cutoff_date),
+            ('receivable_id.due_date', '<', query_month_start),
             ('receivable_id.is_invalid', '=', False),
         ]
 
@@ -83,14 +83,6 @@ class PreArrearsReport(models.Model):
                       (l.not_collected and l.not_collected > 0)
             )
         )
-        
-        # 调试日志
-        print(f"[前期欠收报表] 查询到的 lines 数量: {len(lines)}")
-        for line in lines:
-            print(f"  - line.id={line.id}, receivable_id={line.receivable_id.id}, "
-                  f"due_date={line.receivable_id.due_date}, "
-                  f"reconciliation_date={line.reconciliation_date}, "
-                  f"not_collected={line.not_collected}, amount={line.amount}")
 
         # 按应收账单聚合
         rec_map = {}
@@ -103,11 +95,6 @@ class PreArrearsReport(models.Model):
             # 收集收款日期
             if line.reconciliation_date:
                 rec_map[rid]['reconciliation_dates'].append(line.reconciliation_date)
-        
-        # 调试日志
-        print(f"[前期欠收报表] 聚合后的 rec_map 数量: {len(rec_map)}")
-        for rid, data in rec_map.items():
-            print(f"  - receivable_id={rid}, amount={data['amount']}")
 
         rows = []
         total_amount = 0.0
diff --git a/yuthon_report/models/receivable_report.py b/yuthon_report/models/receivable_report.py
index c5dc6dd01..7b6dd6eb3 100644
--- a/yuthon_report/models/receivable_report.py
+++ b/yuthon_report/models/receivable_report.py
@@ -98,7 +98,7 @@ class YuthonProperty(models.Model):
             for rec in data['recs']:
                 type_name = rec.management_type_id.name if rec.management_type_id else ''
                 col = self._classify_fee_type(type_name)
-                fee_row[col] += rec.original_amount or 0.0
+                fee_row[col] += (rec.original_amount or 0.0) - (rec.discount_amount or 0.0)
 
             subtotal = sum(fee_row.values())
             for col in self.FEE_COLUMNS:
diff --git a/yuthon_report/models/text_summary_report.py b/yuthon_report/models/text_summary_report.py
new file mode 100644
index 000000000..fe00f0664
--- /dev/null
+++ b/yuthon_report/models/text_summary_report.py
@@ -0,0 +1,287 @@
+# -*- coding: utf-8 -*-
+import datetime
+import calendar
+
+from odoo import api, models
+
+
+class TextSummaryReport(models.Model):
+    _name = 'text.summary.report'
+    _description = '文字汇总报表'
+
+    @api.model
+    def get_text_summary_report(self, params):
+        """
+        生成文字汇总报表（类似图中的格式）
+        :param params: 筛选参数（date_start/company_id/partner_id等）
+        :return: 分组汇总数据
+        """
+        today = datetime.date.today()
+        
+        # 处理日期参数
+        date_str = params.get("date_start")
+        if date_str:
+            # 支持 YYYY-MM 和 YYYY-MM-DD 两种格式
+            if len(date_str) == 7:  # YYYY-MM 格式
+                year, month = map(int, date_str.split('-'))
+                query_date = datetime.date(year, month, 1)
+            else:  # YYYY-MM-DD 格式
+                query_date = datetime.datetime.fromisoformat(date_str).date()
+        else:
+            query_date = today
+        
+        # 获取筛选条件
+        company_id = params.get('company_id')
+        precinct_id = params.get('partner_id')
+        
+        # 构建报表数据结构
+        report_data = {
+            'summary_info': {
+                '统计时间': f"{query_date.year}-{query_date.month:02d}",
+                '统计片区': '全部' if not precinct_id else self._get_precinct_name(precinct_id),
+                '所属公司': '全部' if not company_id else self._get_company_name(company_id),
+                '创建时间': datetime.date.today().strftime("%Y-%m-%d"),
+            },
+            'groups': [
+                {
+                    'title': '租金累计欠收',
+                    'items': self._get_rent_arrears_data(query_date, company_id, precinct_id)
+                },
+                {
+                    'title': '违约金累计欠收',
+                    'items': self._get_penalty_arrears_data(query_date, company_id, precinct_id)
+                },
+                {
+                    'title': '本月预收',
+                    'items': self._get_month_precollection_data(query_date, company_id, precinct_id)
+                },
+                {
+                    'title': '其他收入',
+                    'items': self._get_other_income_data(query_date, company_id, precinct_id)
+                },
+                {
+                    'title': '管理费支出',
+                    'items': self._get_management_fee_data(query_date, company_id, precinct_id)
+                },
+            ]
+        }
+        
+        return report_data
+    
+    def _get_precinct_name(self, precinct_id):
+        """获取片区名称"""
+        try:
+            precinct = self.env['res.users'].browse(precinct_id)
+            return precinct.name if precinct else '未知'
+        except:
+            return '未知'
+    
+    def _get_company_name(self, company_id):
+        """获取公司名称"""
+        try:
+            company = self.env['yuthon.property.company'].browse(company_id)
+            return company.name if company else '未知'
+        except:
+            return '未知'
+    
+    def _get_rent_arrears_data(self, query_date, company_id, precinct_id):
+        """获取租金累计欠收数据 - 从累计欠收报表获取"""
+        params = {
+            'date_start': query_date.strftime("%Y-%m-%d"),
+            'company_id': company_id,
+            'partner_id': precinct_id,
+        }
+        
+        # 调用累计欠收报表
+        result = self.env['receivable.modify.line'].get_cum_arrears_report(params)
+        rows = result.get('rows', [])
+        
+        items = []
+        # 按片区分组
+        area_map = {}
+        for row in rows:
+            area = row.get('管理员', {}).get('display_name', '未分配') if isinstance(row.get('管理员'), dict) else row.get('管理员', '未分配')
+            if area not in area_map:
+                area_map[area] = []
+            
+            property_name = row.get('物业名称', {})
+            if isinstance(property_name, dict):
+                property_name = property_name.get('display_name', '未命名物业')
+            
+            amount = row.get('未收金额', 0.0)
+            area_map[area].append(f"{property_name} 欠收：{amount:.2f}元")
+        
+        for area, texts in area_map.items():
+            items.append({
+                'area': area,
+                'content': '。'.join(texts[:10]) + '。'  # 每个片区最多显示10条
+            })
+        
+        return items if items else [{'area': '暂无数据', 'content': '暂无租金累计欠收数据。'}]
+    
+    def _get_penalty_arrears_data(self, query_date, company_id, precinct_id):
+        """获取违约金累计欠收数据 - 从违约金欠收报表获取"""
+        params = {
+            'date_start': query_date.strftime("%Y-%m-%d"),
+            'company_id': company_id,
+            'partner_id': precinct_id,
+        }
+        
+        # 调用违约金欠收报表
+        result = self.env['property.accounts.receivable'].get_penalty_arrears_report(params)
+        rows = result.get('rows', [])
+        
+        items = []
+        # 按片区分组
+        area_map = {}
+        for row in rows:
+            area = row.get('管理员', {}).get('display_name', '未分配') if isinstance(row.get('管理员'), dict) else row.get('管理员', '未分配')
+            if area not in area_map:
+                area_map[area] = []
+            
+            property_name = row.get('物业名称', {})
+            if isinstance(property_name, dict):
+                property_name = property_name.get('display_name', '未命名物业')
+            
+            amount = row.get('总未收', 0.0)
+            area_map[area].append(f"{property_name} 违约金欠收：{amount:.2f}元")
+        
+        for area, texts in area_map.items():
+            items.append({
+                'area': area,
+                'content': '。'.join(texts[:10]) + '。'
+            })
+        
+        return items if items else [{'area': '暂无数据', 'content': '暂无违约金累计欠收数据。'}]
+    
+    def _get_month_precollection_data(self, query_date, company_id, precinct_id):
+        """获取本月预收数据 - 从本月预收报表获取"""
+        params = {
+            'date_start': query_date.strftime("%Y-%m-%d"),
+            'company_id': company_id,
+            'partner_id': precinct_id,
+        }
+        
+        # 调用本月预收报表
+        result = self.env['receivable.modify.line'].get_monthly_precollection_report(params)
+        rows = result.get('rows', [])
+        
+        items = []
+        # 按片区分组
+        area_map = {}
+        for row in rows:
+            area = row.get('管理员', {}).get('display_name', '未分配') if isinstance(row.get('管理员'), dict) else row.get('管理员', '未分配')
+            if area not in area_map:
+                area_map[area] = []
+            
+            property_name = row.get('物业名称', {})
+            if isinstance(property_name, dict):
+                property_name = property_name.get('display_name', '未命名物业')
+            
+            amount = row.get('金额', 0.0)
+            area_map[area].append(f"{property_name}本月预收：{amount:.2f}元")
+        
+        for area, texts in area_map.items():
+            items.append({
+                'area': area,
+                'content': '。'.join(texts[:10]) + '。'
+            })
+        
+        return items if items else [{'area': '暂无数据', 'content': '暂无本月预收数据。'}]
+    
+    def _get_other_income_data(self, query_date, company_id, precinct_id):
+        """获取其他收入数据 - 从停车费报表获取"""
+        params = {
+            'date_start': query_date.strftime("%Y-%m-%d"),
+            'company_id': company_id,
+            'partner_id': precinct_id,
+        }
+        
+        # 调用停车费本月实收报表
+        result = self.env['property.accounts.receivable'].get_parking_fee_current_month_report(params)
+        rows = result.get('rows', [])
+        
+        items = []
+        # 按片区分组
+        area_map = {}
+        total_parking = 0.0
+        
+        for row in rows:
+            area = row.get('管理员', {}).get('display_name', '未分配') if isinstance(row.get('管理员'), dict) else row.get('管理员', '未分配')
+            if area not in area_map:
+                area_map[area] = []
+            
+            property_name = row.get('物业名称', {})
+            if isinstance(property_name, dict):
+                property_name = property_name.get('display_name', '未命名物业')
+            
+            amount = row.get('金额', 0.0)
+            total_parking += amount
+            area_map[area].append(f"{property_name}停车费：{amount:.2f}元")
+        
+        for area, texts in area_map.items():
+            items.append({
+                'area': area,
+                'content': '。'.join(texts[:10]) + '。'
+            })
+        
+        # 如果停车费有数据，添加汇总信息
+        if total_parking > 0:
+            items.append({
+                'area': '合计',
+                'content': f"停车费总收入：{total_parking:.2f}元。"
+            })
+        
+        return items if items else [{'area': '暂无数据', 'content': '暂无其他收入数据。'}]
+    
+    def _get_management_fee_data(self, query_date, company_id, precinct_id):
+        """获取管理费支出数据 - 从管理费相关报表获取"""
+        # 管理费支出需要根据实际业务逻辑查询
+        # 这里查询管理费类型的应收记录作为支出参考
+        
+        # 查询管理费类型
+        management_types = self.env['yuthon.management.type'].search([('name', 'ilike', '管理')])
+        
+        params = {
+            'date_start': query_date.strftime("%Y-%m-%d"),
+            'company_id': company_id,
+            'partner_id': precinct_id,
+            'management_type_id': management_types[0].id if management_types else None,
+        }
+        
+        # 调用归属本月报表获取管理费数据
+        result = self.env['receivable.modify.line'].get_current_month_received_report(params)
+        rows = result.get('rows', [])
+        
+        items = []
+        # 按片区分组
+        area_map = {}
+        total_fee = 0.0
+        
+        for row in rows:
+            area = row.get('管理员', {}).get('display_name', '未分配') if isinstance(row.get('管理员'), dict) else row.get('管理员', '未分配')
+            if area not in area_map:
+                area_map[area] = []
+            
+            property_name = row.get('物业名称', {})
+            if isinstance(property_name, dict):
+                property_name = property_name.get('display_name', '未命名物业')
+            
+            amount = row.get('金额', 0.0)
+            total_fee += amount
+            area_map[area].append(f"{property_name}管理费 支出：{amount:.2f}元")
+        
+        for area, texts in area_map.items():
+            items.append({
+                'area': area,
+                'content': '。'.join(texts[:10]) + '。'
+            })
+        
+        # 如果管理费有数据，添加汇总信息
+        if total_fee > 0:
+            items.append({
+                'area': '合计',
+                'content': f"管理费总支出：{total_fee:.2f}元。"
+            })
+        
+        return items if items else [{'area': '暂无数据', 'content': '暂无管理费支出数据。'}]
\ No newline at end of file
diff --git a/yuthon_report/models/yuthon_contract_report.py b/yuthon_report/models/yuthon_contract_report.py
index 4bcff01e7..907a85b64 100644
--- a/yuthon_report/models/yuthon_contract_report.py
+++ b/yuthon_report/models/yuthon_contract_report.py
@@ -5,8 +5,6 @@ from odoo import fields, models, api
 
 class YuthonContractReport(models.Model):
     _inherit = 'property.lease.contract'
-    _description = '合同信息报表'
-
 
     @api.model
     def get_contract_info_report(self, params):
diff --git a/yuthon_report/static/src/components/yuthon_report/simple_bank_report.js b/yuthon_report/static/src/components/yuthon_report/simple_bank_report.js
new file mode 100644
index 000000000..e630a5ee5
--- /dev/null
+++ b/yuthon_report/static/src/components/yuthon_report/simple_bank_report.js
@@ -0,0 +1,186 @@
+/** @odoo-module **/
+
+import {registry} from "@web/core/registry";
+import {Component, onMounted, useRef, useState} from "@odoo/owl";
+import {useService} from "@web/core/utils/hooks";
+import {
+    standardActionServiceProps
+} from "@web/webclient/actions/action_service";
+
+class SimpleBankReport extends Component {
+    setup() {
+        this.gridRef = useRef("grid");
+        console.log(this.props.action.context.report_config)
+
+        this.serviceOrm = useService("orm")
+
+        this.state = useState({
+            yourOwnUnit: "",
+            yourOwnUnitOptions: [],
+            stats: []
+        });
+
+        this.config = this.props.action.context.report_config || {};
+
+        onMounted(async () => {
+            // 加载账号单位选项
+            await this.loadYourOwnUnitOptions();
+
+            const columns = this.config.columns || [];
+            columns.forEach((col) => {
+                // 对固定宽度列（如序号列）单独设置 minWidth
+                if (col.width && col.flex === 0) {
+                    col.minWidth = col.width;
+                    col.maxWidth = col.width;
+                }
+            });
+
+            this.gridOptions = {
+                localeText: AG_GRID_LOCALE_CN,
+                theme: agGrid.themeMaterial,
+                columnDefs: columns,
+                rowData: [],
+                rowClassRules: {
+                    'ag-row-registered': function(params) {
+                        return params.data && params.data.状态 === '挂账';
+                    }
+                },
+                sideBar: this.config.sideBar ? {
+                    toolPanels: [
+                        {
+                            id: 'columns',
+                            labelDefault: '列',
+                            labelKey: 'columns',
+                            iconKey: 'columns',
+                            toolPanel: 'agColumnsToolPanel',
+                            toolPanelParams: {
+                                suppressValues: true,
+                                suppressPivots: true,
+                                suppressPivotMode: true,
+                            }
+                        },
+                        {
+                            id: 'filters',
+                            labelDefault: '过滤器',
+                            labelKey: 'filters',
+                            iconKey: 'filter',
+                            toolPanel: 'agFiltersToolPanel'
+                        }
+                    ],
+                    defaultToolPanel: '',
+                } : undefined,
+                enableCharts: true,
+                cellSelection: true,
+                defaultColDef: {
+                    sortable: true,
+                    filter: true,
+                    width: 200,
+                    minWidth: 150,
+                    flex: false,
+                    resizable: false,
+                    wrapText: false,
+                    autoHeight: false,
+                    valueFormatter: (params) => {
+                        if (params.value === false || params.value === null || params.value === undefined || params.value === 'false') {
+                            return '';
+                        }
+                        return params.value;
+                    }
+                }
+            };
+            this.grid = new agGrid.createGrid(this.gridRef.el, this.gridOptions);
+            // 初始加载数据
+            await this.onSearch();
+        });
+    }
+
+    async loadYourOwnUnitOptions() {
+        try {
+            const options = await this.serviceOrm.call(
+                'bank.statements.report',
+                'get_your_own_unit_options',
+                []
+            );
+            this.state.yourOwnUnitOptions = options;
+        } catch (e) {
+            console.error('加载账号单位选项失败:', e);
+            this.state.yourOwnUnitOptions = [];
+        }
+    }
+
+    async onKeyUp(e) {
+        if (e.keyCode === 13) {
+            await this.onSearch();
+        }
+    }
+
+    async onSearch() {
+        let params = {
+            your_own_unit: this.state.yourOwnUnit || false,
+        };
+        
+        const result = await this.serviceOrm.call(
+            this.config.model,
+            this.config.method,
+            [params]
+        );
+
+        if (result && typeof result === 'object') {
+            if (result.rows) {
+                this.grid.setGridOption('rowData', result.rows);
+                this.grid.setGridOption('pinnedBottomRowData', []);
+                this.state.stats = result.stats || [];
+            } else {
+                this.grid.setGridOption('rowData', result);
+                this.grid.setGridOption('pinnedBottomRowData', []);
+                this.state.stats = [];
+            }
+
+            if (this.grid) {
+                const columnApi = this.grid.columnApi && this.grid.columnApi;
+                if (columnApi && typeof columnApi.autoSizeAllColumns === 'function') {
+                    try {
+                        if (typeof columnApi.getAllColumns === 'function') {
+                            const allCols = columnApi.getAllColumns() || [];
+                            const allColIds = allCols.map(col => col.getColId());
+                            columnApi.autoSizeAllColumns(allColIds);
+                        } else {
+                            columnApi.autoSizeAllColumns();
+                        }
+                    } catch (e) {
+                        console.error('autoSizeAllColumns failed:', e);
+                    }
+                } else if (typeof this.grid.autoSizeAllColumns === 'function') {
+                    try {
+                        this.grid.autoSizeAllColumns();
+                    } catch (e) {
+                        console.error('grid.autoSizeAllColumns failed:', e);
+                    }
+                }
+            }
+        }
+    }
+
+    onExportExcel() {
+        this.grid.exportDataAsExcel({
+            fileName: 'my-data.xlsx',
+            sheetName: 'Sheet1',
+            processCellCallback(params) {
+                const value = params.value
+                if (value === undefined || value === null || value === '') {
+                    return ''
+                }
+                if (typeof value === 'object') {
+                    return value?.display_name ?? ''
+                }
+                return value
+            },
+        });
+    }
+}
+
+SimpleBankReport.props = {...standardActionServiceProps};
+SimpleBankReport.template = "youthon_report.SimpleBankReport";
+SimpleBankReport.components = {};
+
+registry.category("actions").add("simple_bank_report_client", SimpleBankReport);
\ No newline at end of file
diff --git a/yuthon_report/static/src/components/yuthon_report/simple_bank_report.xml b/yuthon_report/static/src/components/yuthon_report/simple_bank_report.xml
new file mode 100644
index 000000000..e3c26b800
--- /dev/null
+++ b/yuthon_report/static/src/components/yuthon_report/simple_bank_report.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates id="template" xml:space="preserve">
+  <t t-name="youthon_report.SimpleBankReport">
+    <div class="container-fluid d-flex flex-column h-100 mt-2 pb-3">
+      <!-- 筛选卡片 -->
+      <div class="card mb-2">
+        <div class="card-body py-2">
+          <!-- 搜索区域 -->
+          <div class="row align-items-end" t-ref="search_area">
+            <!-- 账号单位 -->
+            <div class="col-4">
+              <label class="mb-1">账号单位</label>
+              <select
+                class="form-control"
+                t-model="state.yourOwnUnit"
+                t-on-change="onSearch"
+              >
+                <option value="">全部</option>
+                <option
+                  t-foreach="state.yourOwnUnitOptions"
+                  t-as="option"
+                  t-key="option.value"
+                  t-att-value="option.value"
+                >
+                  <t t-esc="option.label"/>
+                </option>
+              </select>
+            </div>
+
+            <!-- 操作按钮 -->
+            <div class="col-auto">
+              <button class="btn btn-primary" t-on-click="onSearch">搜索</button>
+              <button class="btn btn-success ml-2" t-on-click="onExportExcel">导出</button>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 统计卡片区域 -->
+      <div class="card mb-2" t-if="state.stats and state.stats.length">
+        <div class="card-body py-2">
+          <div class="row g-2">
+            <div class="col-auto" t-foreach="state.stats" t-as="stat" t-key="stat.name">
+              <div class="badge bg-light text-dark p-2" style="font-size: 0.9rem; background-color: #d1ecf1 !important; border: 1px solid #bee5eb;">
+                <strong t-esc="stat.name"/>: <t t-esc="stat.amount"/>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- ag-grid 表格区域 -->
+      <div class="row flex-grow-1">
+        <div class="col-12 h-100">
+          <div class="ag-theme-alpine w-100 h-100" t-ref="grid"></div>
+        </div>
+      </div>
+    </div>
+  </t>
+</templates>
\ No newline at end of file
diff --git a/yuthon_report/static/src/components/yuthon_report/text_summary_report.js b/yuthon_report/static/src/components/yuthon_report/text_summary_report.js
new file mode 100644
index 000000000..2d842376d
--- /dev/null
+++ b/yuthon_report/static/src/components/yuthon_report/text_summary_report.js
@@ -0,0 +1,52 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { Component, onMounted, useState } from "@odoo/owl";
+import { useService } from "@web/core/utils/hooks";
+import { standardActionServiceProps } from "@web/webclient/actions/action_service";
+
+class TextSummaryReport extends Component {
+    setup() {
+        this.serviceOrm = useService("orm");
+        
+        this.state = useState({
+            reportData: null,
+            dateStart: "",
+            loading: false,
+        });
+
+        this.config = this.props.action.context.report_config || {};
+
+        onMounted(() => {
+            // 页面加载时自动执行搜索
+            this.onSearch();
+        });
+    }
+
+    async onSearch() {
+        this.state.loading = true;
+        
+        const params = {
+            date_start: this.state.dateStart,
+        };
+        
+        try {
+            const result = await this.serviceOrm.call(
+                this.config.model || 'text.summary.report',
+                this.config.method || 'get_text_summary_report',
+                [params]
+            );
+            this.state.reportData = result;
+        } catch (error) {
+            console.error('报表查询失败:', error);
+            this.state.reportData = null;
+        } finally {
+            this.state.loading = false;
+        }
+    }
+}
+
+TextSummaryReport.props = { ...standardActionServiceProps };
+TextSummaryReport.template = "text_summary_report.TextSummaryReport";
+
+registry.category("actions").add("text_summary_report_client", TextSummaryReport);
\ No newline at end of file
diff --git a/yuthon_report/static/src/components/yuthon_report/text_summary_report.xml b/yuthon_report/static/src/components/yuthon_report/text_summary_report.xml
new file mode 100644
index 000000000..af753c0a0
--- /dev/null
+++ b/yuthon_report/static/src/components/yuthon_report/text_summary_report.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates id="template" xml:space="preserve">
+  <t t-name="text_summary_report.TextSummaryReport">
+      <div class="container-fluid" style="height: calc(100vh - 80px); display: flex; flex-direction: column;">
+          <!-- 搜索区域 -->
+          <div class="card mb-3 flex-shrink-0">
+              <div class="card-body">
+                  <div class="row">
+                      <div class="col-md-2">
+                          <label class="form-label">年月:</label>
+                          <input 
+                              type="month" 
+                              class="form-control" 
+                              t-model="state.dateStart"
+                          />
+                      </div>
+                      <div class="col-md-10 d-flex align-items-end justify-end">
+                          <button class="btn btn-primary" t-on-click="onSearch">
+                              <span t-if="state.loading" class="fa fa-spinner fa-spin"></span>
+                              查询
+                          </button>
+                      </div>
+                  </div>
+              </div>
+          </div>
+
+          <!-- 报表信息栏 -->
+          <div t-if="state.reportData" class="card mb-3 flex-shrink-0">
+              <div class="card-body">
+                  <div class="row">
+                      <div class="col-md-3">
+                          <span class="text-muted">统计时间：</span>
+                          <span t-esc="state.reportData.summary_info['统计时间']"></span>
+                      </div>
+                      <div class="col-md-3">
+                          <span class="text-muted">统计片区：</span>
+                          <span t-esc="state.reportData.summary_info['统计片区']"></span>
+                      </div>
+                      <div class="col-md-3">
+                          <span class="text-muted">所属公司：</span>
+                          <span t-esc="state.reportData.summary_info['所属公司']"></span>
+                      </div>
+                      <div class="col-md-3 text-right">
+                          <span class="text-muted">创建时间：</span>
+                          <span t-esc="state.reportData.summary_info['创建时间']"></span>
+                      </div>
+                  </div>
+              </div>
+          </div>
+
+          <!-- 报表内容区域 - 可滚动 -->
+          <div t-if="state.reportData" class="card flex-grow-1 overflow-auto" style="min-height: 0;">
+              <div class="card-body">
+                  <t t-foreach="state.reportData.groups" t-as="group" t-key="group_index">
+                      <div class="mb-4">
+                          <div class="bg-danger text-white p-2 mb-2">
+                              <strong t-esc="group.title"></strong>
+                          </div>
+                          <div class="border-left-4 border-danger pl-3">
+                              <t t-foreach="group.items" t-as="item" t-key="item_index">
+                                  <div class="mb-2">
+                                      <div class="font-weight-bold text-primary" t-esc="item.area"></div>
+                                      <div class="text-sm text-gray-700" t-esc="item.content"></div>
+                                  </div>
+                              </t>
+                          </div>
+                      </div>
+                  </t>
+              </div>
+          </div>
+
+          <!-- 加载提示 -->
+          <div t-if="state.loading" class="flex-grow-1 flex items-center justify-center">
+              <div class="text-center">
+                  <i class="fa fa-spinner fa-spin fa-3x"></i>
+                  <p>加载中...</p>
+              </div>
+          </div>
+
+          <!-- 空状态提示 -->
+          <div t-if="!state.loading &amp;&amp; !state.reportData" class="flex-grow-1 flex items-center justify-center">
+              <div class="text-center text-muted">
+                  <i class="fa fa-file-text-o fa-3x mb-2"></i>
+                  <p>请点击查询按钮获取报表数据</p>
+              </div>
+          </div>
+      </div>
+  </t>
+</templates>
\ No newline at end of file
diff --git a/yuthon_report/static/src/components/yuthon_report/yuthon_report.scss b/yuthon_report/static/src/components/yuthon_report/yuthon_report.scss
index 21619d483..2a4c26ac5 100644
--- a/yuthon_report/static/src/components/yuthon_report/yuthon_report.scss
+++ b/yuthon_report/static/src/components/yuthon_report/yuthon_report.scss
@@ -81,3 +81,8 @@
       justify-content: flex-start;
       text-align: left;
     }
+
+    /* 挂账状态行金黄色背景 */
+    .ag-row-registered {
+      background-color: #fffbeb !important;
+    }
diff --git a/yuthon_report/views/bank_statements_report.xml b/yuthon_report/views/bank_statements_report.xml
new file mode 100644
index 000000000..54d4bd820
--- /dev/null
+++ b/yuthon_report/views/bank_statements_report.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="action_bank_statements_report" model="ir.actions.client">
+            <field name="name">未对挂账报表</field>
+            <field name="tag">simple_bank_report_client</field>
+            <field name="context">
+                {
+                    &quot;sideBar&quot;: true,
+                    &quot;report_config&quot;: {
+                        &quot;model&quot;: &quot;bank.statements.report&quot;,
+                        &quot;method&quot;: &quot;get_bank_statements_report&quot;,
+                        &quot;columns&quot;: [
+                            {&quot;headerName&quot;: &quot;序号&quot;, &quot;field&quot;: &quot;序号&quot;, &quot;width&quot;: 45, &quot;flex&quot;: 0, &quot;pinned&quot;: &quot;left&quot;},
+                            {&quot;headerName&quot;: &quot;交易时间&quot;, &quot;field&quot;: &quot;交易时间&quot;, &quot;flex&quot;: 1.5},
+                            {&quot;headerName&quot;: &quot;交易金额&quot;, &quot;field&quot;: &quot;交易金额&quot;, &quot;flex&quot;: 1, &quot;type&quot;: &quot;number&quot;},
+                            {&quot;headerName&quot;: &quot;已对账&quot;, &quot;field&quot;: &quot;已对账&quot;, &quot;flex&quot;: 1, &quot;type&quot;: &quot;number&quot;},
+                            {&quot;headerName&quot;: &quot;未对&quot;, &quot;field&quot;: &quot;未对&quot;, &quot;flex&quot;: 1, &quot;type&quot;: &quot;number&quot;},
+                            {&quot;headerName&quot;: &quot;备注&quot;, &quot;field&quot;: &quot;备注&quot;, &quot;flex&quot;: 2},
+                            {&quot;headerName&quot;: &quot;摘要&quot;, &quot;field&quot;: &quot;摘要&quot;, &quot;flex&quot;: 2},
+                            {&quot;headerName&quot;: &quot;对方户名&quot;, &quot;field&quot;: &quot;对方户名&quot;, &quot;flex&quot;: 1.5},
+                            {&quot;headerName&quot;: &quot;账号单位&quot;, &quot;field&quot;: &quot;账号单位&quot;, &quot;flex&quot;: 1.2},
+                            {&quot;headerName&quot;: &quot;状态&quot;, &quot;field&quot;: &quot;状态&quot;, &quot;flex&quot;: 1}
+                        ]
+                    }
+                }
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/yuthon_report/views/menu.xml b/yuthon_report/views/menu.xml
index 3b272620e..2b6373656 100644
--- a/yuthon_report/views/menu.xml
+++ b/yuthon_report/views/menu.xml
@@ -63,8 +63,13 @@
                   name="累计欠收"
                   parent="yuthon_property_income_menu"
                   action="action_cum_arrears_report"/>
-        <menuitem id="yuthon_property_income_cum_income_menu"
+        <menuitem id="yuthon_property_income_bank_statements_menu"
                   sequence="9"
+                  name="未对挂账报表"
+                  parent="yuthon_property_income_menu"
+                  action="yuthon_report.action_bank_statements_report"/>
+        <menuitem id="yuthon_property_income_cum_income_menu"
+                  sequence="10"
                   name="累计收入"
                   parent="yuthon_property_income_menu"
                   action="action_cum_income_report"/>
diff --git a/yuthon_report/views/receivable_report_views.xml b/yuthon_report/views/receivable_report_views.xml
index eba60276d..092fa09a0 100644
--- a/yuthon_report/views/receivable_report_views.xml
+++ b/yuthon_report/views/receivable_report_views.xml
@@ -2,7 +2,7 @@
 <odoo>
     <data>
         <record id="action_property_accounts_receivable_report" model="ir.actions.client">
-            <field name="name">应收账单报表</field>
+            <field name="name">当期应收</field>
             <field name="tag">receivable_report_client</field>
             <field name="context">
                 {
@@ -37,7 +37,7 @@
 
         <menuitem
             id="menu_property_accounts_receivable_report2"
-            name="应收账单报表"
+            name="当期应收"
             parent="yuthon_property_income_menu"
             action="action_property_accounts_receivable_report"
             sequence="1"
diff --git a/yuthon_report/views/text_summary_report.xml b/yuthon_report/views/text_summary_report.xml
new file mode 100644
index 000000000..742278f58
--- /dev/null
+++ b/yuthon_report/views/text_summary_report.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <!-- 文字汇总报表 Action -->
+        <record id="action_text_summary_report" model="ir.actions.client">
+            <field name="name">文字汇总报表</field>
+            <field name="tag">text_summary_report_client</field>
+            <field name="context">
+                {
+                    "report_config": {
+                        "model": "text.summary.report",
+                        "method": "get_text_summary_report"
+                    }
+                }
+            </field>
+        </record>
+
+        <!-- 菜单 -->
+        <menuitem
+            id="menu_text_summary_report"
+            name="文字汇总报表"
+            parent="yuthon_property_approval.property_approval_report_menu"
+            action="action_text_summary_report"
+            sequence="10"
+        />
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/yuthon_trade/views/parking_fee_approval_views.xml b/yuthon_trade/views/parking_fee_approval_views.xml
index 786a7cc66..48a98d4b1 100644
--- a/yuthon_trade/views/parking_fee_approval_views.xml
+++ b/yuthon_trade/views/parking_fee_approval_views.xml
@@ -16,12 +16,6 @@
         <field name="arch" type="xml">
             <form string="停车票发放">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="2">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_trade/views/trade_project_approval_views.xml b/yuthon_trade/views/trade_project_approval_views.xml
index be80bf55d..87f84f2a2 100644
--- a/yuthon_trade/views/trade_project_approval_views.xml
+++ b/yuthon_trade/views/trade_project_approval_views.xml
@@ -18,12 +18,6 @@
         <field name="arch" type="xml">
             <form string="立项申请">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="2">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_trade/views/trade_reward_approval_views.xml b/yuthon_trade/views/trade_reward_approval_views.xml
index 139fff2f6..27bcf659b 100644
--- a/yuthon_trade/views/trade_reward_approval_views.xml
+++ b/yuthon_trade/views/trade_reward_approval_views.xml
@@ -16,12 +16,6 @@
         <field name="arch" type="xml">
             <form string="奖励申报呈批表">
                 <sheet>
-                   <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_trade/views/yuthon_business_approval_viwes.xml b/yuthon_trade/views/yuthon_business_approval_viwes.xml
index 39ef6d797..b63ec3ca0 100644
--- a/yuthon_trade/views/yuthon_business_approval_viwes.xml
+++ b/yuthon_trade/views/yuthon_business_approval_viwes.xml
@@ -21,12 +21,6 @@
                         class="btn-primary" invisible="not work_end"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
@@ -68,8 +62,8 @@
                             <!--<field name="type_stamp_ids" widget="many2many_tags" options="{'no_create': True, 'no_open': True}}"/>-->
                             <field name="department_id" invisible="1"/>
                             <field name="is_finance_business" invisible="1"/>
-                            <field name="receivable_amount" invisible="not is_finance_business"/>
-                            <field name="payable_amount" invisible="not is_finance_business"/>
+                            <field name="receivable_amount" string="收款金额" invisible="not is_finance_business"/>
+                            <field name="payable_amount" string="付款金额" invisible="not is_finance_business"/>
                         </group>
                     </group>
                     <group>
diff --git a/yuthon_trade/views/yuthon_care_condolences_views.xml b/yuthon_trade/views/yuthon_care_condolences_views.xml
index c6ae77be6..8e7e8cfe4 100644
--- a/yuthon_trade/views/yuthon_care_condolences_views.xml
+++ b/yuthon_trade/views/yuthon_care_condolences_views.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="关怀慰问" create="0">
                 <sheet>
-                     <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                            invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_trade/views/yuthon_contract_addition_views.xml b/yuthon_trade/views/yuthon_contract_addition_views.xml
index e007ebc95..fed96464b 100644
--- a/yuthon_trade/views/yuthon_contract_addition_views.xml
+++ b/yuthon_trade/views/yuthon_contract_addition_views.xml
@@ -15,12 +15,6 @@
         <field name="arch" type="xml">
             <form string="合同补充协议">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_trade/views/yuthon_message_approval_views.xml b/yuthon_trade/views/yuthon_message_approval_views.xml
index 7842e167f..18412f27b 100644
--- a/yuthon_trade/views/yuthon_message_approval_views.xml
+++ b/yuthon_trade/views/yuthon_message_approval_views.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="信息发布审批" create="0">
                 <sheet>
-                   <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_trade/views/yuthon_mutual_approval_views.xml b/yuthon_trade/views/yuthon_mutual_approval_views.xml
index ed4ef1186..5af5f7a25 100644
--- a/yuthon_trade/views/yuthon_mutual_approval_views.xml
+++ b/yuthon_trade/views/yuthon_mutual_approval_views.xml
@@ -18,12 +18,6 @@
         <field name="arch" type="xml">
             <form string="互助审批">
                 <sheet>
-                   <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_trade/views/yuthon_seals_approval_views.xml b/yuthon_trade/views/yuthon_seals_approval_views.xml
index 7437004fa..13f924012 100644
--- a/yuthon_trade/views/yuthon_seals_approval_views.xml
+++ b/yuthon_trade/views/yuthon_seals_approval_views.xml
@@ -20,12 +20,6 @@
         <field name="arch" type="xml">
             <form string="用章审批">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" readonly="1"/>
diff --git a/yuthon_trade/views/yuthon_social_transfer.xml b/yuthon_trade/views/yuthon_social_transfer.xml
index d6b0fcfe1..ef591ab44 100644
--- a/yuthon_trade/views/yuthon_social_transfer.xml
+++ b/yuthon_trade/views/yuthon_social_transfer.xml
@@ -15,12 +15,6 @@
         <field name="arch" type="xml">
             <form string="移交社会化">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="4">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_trade/views/yuthon_task_approval_views.xml b/yuthon_trade/views/yuthon_task_approval_views.xml
index 287e28bd1..edba23048 100644
--- a/yuthon_trade/views/yuthon_task_approval_views.xml
+++ b/yuthon_trade/views/yuthon_task_approval_views.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="作业审批表">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="保修编号" readonly="1"/>
diff --git a/yuthon_trade/views/yuthon_trade_premium.xml b/yuthon_trade/views/yuthon_trade_premium.xml
index 35ee67cea..edfaf9514 100644
--- a/yuthon_trade/views/yuthon_trade_premium.xml
+++ b/yuthon_trade/views/yuthon_trade_premium.xml
@@ -16,12 +16,6 @@
         <field name="arch" type="xml">
             <form string="缴保申请表" create="0">
                 <sheet>
-                   <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_trade/views/yuthon_work_condolences_views.xml b/yuthon_trade/views/yuthon_work_condolences_views.xml
index 87d52559f..59806a6e0 100644
--- a/yuthon_trade/views/yuthon_work_condolences_views.xml
+++ b/yuthon_trade/views/yuthon_work_condolences_views.xml
@@ -17,12 +17,6 @@
         <field name="arch" type="xml">
             <form string="节日慰问" create="0">
                 <sheet>
-                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                            invisible="urgency_level != 'normal'"/>
-                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
-                            invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_will_task/data/will_task_time_data.xml b/yuthon_will_task/data/will_task_time_data.xml
index bc34e541b..5a22366d2 100644
--- a/yuthon_will_task/data/will_task_time_data.xml
+++ b/yuthon_will_task/data/will_task_time_data.xml
@@ -14,5 +14,18 @@
             <field name="numbercall">-1</field>
             <field eval="False" name="doall"/>
         </record>
+        <record forcecreate="True" id="add_done_time_data" model="ir.cron">
+            <field name="name">定时任务:日程待办自动转为已办</field>
+            <field name="model_id" ref="model_yuthon_will_task"/>
+            <field name="state">code</field>
+            <field name="code">model.add_done()</field>
+            <field eval="False" name="active"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="nextcall" eval="(DateTime.now()).strftime('%Y-%m-%d 00:00:00')"/>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+        </record>
     </data>
 </odoo>
diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py
index 6b7753dee..e76915821 100644
--- a/yuthon_will_task/models/yuthon_will_task.py
+++ b/yuthon_will_task/models/yuthon_will_task.py
@@ -271,6 +271,16 @@ class YuthonWillTask(models.Model):
         else:
             return timedelta.max
 
+    def add_done(self):
+        today =  datetime.date.today()
+        records = self.search([
+            ('task_state', '=', 'will'),
+            ('end_date', '<', today),
+            ('end_date', '!=', False),
+        ])
+        if records:
+            records.write({'task_state': 'done'})
+
     def add_comment(self):
         """日程定时任务提醒"""
         _logger.info('-----------日程任务验证--------')
@@ -409,6 +419,8 @@ class YuthonWillTask(models.Model):
                 task_vals['yuthon_will_task_id'] = self.id
                 self.env['yuthon.dates.task'].create(task_vals)
 
+
+
     def schedule_reminders(self):
         return {
             'type': 'ir.actions.act_window',
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index 3d03ca568..b393a1bb7 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -181,11 +181,6 @@
               parent="hr_attendance_root_board_menu"
               action="yuthon_hr_attendance.action_overtime_approval_report"
               sequence="15"/>
-    <menuitem id="menu_yuthon_holiday_statement_board"
-              name="请假明细"
-              parent="hr_attendance_root_board_menu"
-              action="yuthon_hr_attendance.view_yuthon_holiday_statement_action"
-              sequence="16"/>
     <menuitem id="menu_yuthon_meal_case_board"
               name="误餐明细"
               parent="hr_attendance_root_board_menu"
@@ -765,7 +760,7 @@
     <menuitem id="yuthon_holiday_active_menu"
               parent="yuthon_vacation_active_menu"
               name="请假归档"
-              action="yuthon_hr_attendance.view_yuthon_holiday_statement_active_action"
+              action="yuthon_hr_attendance.view_yuthon_holiday_statement_action"
               sequence="10"
     />
     <menuitem id="yuthon_overtime_active_menu"