!4463 添加功能

Merge pull request !4463 from 李鹏宇/dev_zhou
2025-08-12 03:27:54 +00:00
parent 893c1ad034 c3101b06ed
commit 957a15fe87
12 changed files with 45 additions and 35 deletions
@@ -240,6 +240,12 @@ class SoongWorkflowMixin(models.AbstractModel):
                        ("approval_state", "!=", "2")
                    ]
                )
+                self.log_ids[-1].approval_state = "3"
+                self.log_ids[-1].lase_click_date = fields.Datetime.now()
+                self.work_end = True
+                self.env['soong.workflow.record'].search([('code', '=', self.code)]).write({'approve_state': 'end',
+                                                                                                 "employee_ids": False,
+                                                                                                 "node_id": False, })
                if apostille_log_obj:
                    raise UserError("当前加签人员还有没有审批完成的！")
            # 继续正常流程
@@ -11,30 +11,6 @@
                  parent="menu_soong_workflow_root"
                  action="action_kklw_workflow_approval_request"
                  sequence="1"/>
-        <menuitem id="menu_workflow_approval_request_my"
-                  name="我的流程"
-                  parent="menu_soong_workflow_root"
-                  sequence="3"/>
-        <menuitem id="menu_workflow_approval_request_my_start"
-                  name="草稿"
-                  parent="menu_workflow_approval_request_my"
-                  action="soong_workflow_record_start_action"
-                  sequence="1"/>
-        <menuitem id="menu_workflow_approval_request_my_pending_to_do"
-                  name="待办"
-                  parent="menu_workflow_approval_request_my"
-                  action="soong_workflow_record_pending_to_do_action"
-                  sequence="3"/>
-        <menuitem id="menu_workflow_approval_request_my_pending_done"
-                  name="已办"
-                  parent="menu_workflow_approval_request_my"
-                  action="soong_workflow_record_pending_done_action"
-                  sequence="4"/>
-        <menuitem id="menu_workflow_approval_request_my_end"
-                  name="结束"
-                  parent="menu_workflow_approval_request_my"
-                  action="soong_workflow_record_end_action"
-                  sequence="5"/>
       <menuitem id="menu_soong_workflow_other_record"
                  name="流程查询"
                  parent="menu_soong_workflow_root"
@@ -29,6 +29,9 @@
                <tree string="流程查询" action="open_record" type="object"
                      decoration-danger="approve_state == 'end'"
                      create="false" default_order="write_date2 desc" expand="1">
+                    <header>
+                       <button name="admin_end" type="object" string="管理员强制结束" dclass="oe_highlight"/>
+                    </header>
                    <field name="code"/>
                    <field name="name"/>
                    <field name="workflow_id" string="审批类型"/>
@@ -46,7 +49,7 @@
                    <field name="soong_state"/>
                    <field name="reclaim_state" column_invisible="1"/>
                    <field name="member_of_department" optional="hide"/>
-                    <button name="delete_record" type="object" string="删除" class="btn-primary" confirm="你确定要删除吗?"/>
+                    <button name="delete_record" type="object" string="删除" class="btn-primary" confirm="你确定要删除吗?" groups="soong_workflow.group_soong_workflow_manager"/>
                    <button name="reminders_record" type="object" string="催办" class="btn-primary"
                            groups="soong_workflow.group_soong_workflow_manager"/>
                    <button name="revoke_record" type="object" string="撤销" class="btn-primary"
@@ -7,6 +7,7 @@
        <field name="arch" type="xml">
            <form string="撤销确认">
               <p>确认要撤销当前所选的工作流吗?</p>
+               <p>会把当前流程还原成初始状态</p>
               <field name="record_id" invisible="1" />
               <footer>
                    <button name="add_comment_revoke" string="确认" type="object" class="oe_highlight"/>
@@ -67,7 +67,7 @@ class AppletAttendance(Controller):
         }
        """
        _logger.info("----------------/yuthon/att/today---------接口收到响应-------------------------------")
-        current_date = fields.Date.today()
+        current_date = fields.Date.today() + timedelta(hours=8)
        user_id = request.env(user=SUPERUSER_ID)["res.users"].search([('id', '=', int(kw['user_id']))])
        employee_id = request.env(user=SUPERUSER_ID)["hr.employee"].search([('name', '=', user_id.name)])
        attendance_id = request.env(user=SUPERUSER_ID)["hr.attendance"].search(
@@ -793,7 +793,7 @@ class AppletAttendance(Controller):
                'original_amount': float_repr(float_round(record.original_amount - record.discount_amount, precision_rounding=0.01), 2),
                'management_type': record.management_type_id.name,
                'start_date':  fields.Date.to_string(record.due_date),
-                'end_date':  fields.Date.to_string(record.due_date_end) if record.due_date_end else (  fields.Date.to_string(record.payout_date) if record.payout_date else '----'),
+                'end_date':  fields.Date.to_string(record.due_date_end) if record.due_date_end else '----'
            })

        result = []
@@ -415,8 +415,8 @@ class YuthonVacationReports(models.Model):
                    elif line.update_type == 'reduce':
                        leave_hours -= line_value
                        done_leave_hours += line_value
-            record.leave = leave_hours / 8
-            record.done_leave = done_leave_hours / 8
+            record.leave = max(leave_hours / 8, 0)
+            record.done_leave = max(done_leave_hours / 8, 0)

    @api.depends(
        'overtime_ids.workday',
@@ -459,8 +459,8 @@
            <tree string="会员列表" crate="false" delete="false" editable="bottom">
                <field name="name" readonly="1"/>
                <field name="work_phone" readonly="1"/>
-                <field name="department_id" readonly="1"/>
-                <field name="job_id" readonly="1"/>
+                <field name="department_id" readonly="1" options='{"no_open": True, "no_create": True}'/>
+                <field name="job_id" readonly="1" options='{"no_open": True, "no_create": True}'/>
                <field name="is_company" optional="hide"/>
                <field name="company_id" column_invisible="1"/>
            </tree>
@@ -11,7 +11,7 @@ class YuthonProperty(models.Model):
    _rec_name = 'name'
    _order = 'first_letter'

-    name = fields.Char(string="资产名称")
+    name = fields.Text(string="资产名称")
    users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
    code = fields.Char(string="物业编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_property_message_code'))
    referred_id = fields.Many2one('yuthon.lot.setting', string="地段")
@@ -625,7 +625,7 @@ class PropertyRentList(models.Model):

            # 创建应收记录
            self.env['property.accounts.receivable'].create({
-                'contract_id': contract.id if contract else False,
+                'contract_id': contract.id if contract else None,
                'property_id': rec.property_id.id,
                'lessee_id': contract.lessee_id.id if contract and contract.lessee_id else None,
                'original_amount': rec.original_amount,
@@ -54,7 +54,7 @@ class PropertyHandoverLine(models.Model):

    property_handover_id = fields.Many2one('property.handover', string="审批信息")
    property_id = fields.Many2one('yuthon.property', string="关联物业信息")
-    property_address = fields.Char(related='property_id.name',string="资产名称")
+    property_address = fields.Text(related='property_id.name',string="资产名称")
    is_affirmation = fields.Boolean(related='property_id.is_confirm_authorization',string="是否确权")
    title_number = fields.Char(string="产权编号")
    area = fields.Float(related='property_id.rent_area',string="面积")
@@ -12,7 +12,7 @@ class PropertyOfflineRegistration(models.Model):
    users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
    department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
    property_id = fields.Many2one('yuthon.property',string='物业名称')
-    address = fields.Char(related='property_id.name',string='物业地址')
+    address = fields.Text(related='property_id.name',string='物业地址')
    area = fields.Float(related='property_id.rent_area',string='面积(m²)')
    rental_price = fields.Float(string='租金底价(元/m²)')
    monthly_rent = fields.Float(string='月租金(元)')
@@ -642,6 +642,30 @@
              parent="holiday_manage_menu_root_board"
              sequence="20"
              action="yuthon_salary.action_view_my_payslip"/>
+    <menuitem id="menu_workflow_approval_request_my"
+              name="我的流程"
+              parent="holiday_manage_menu_root_board"
+              sequence="25"/>
+    <menuitem id="menu_workflow_approval_request_my_start"
+              name="草稿"
+              parent="menu_workflow_approval_request_my"
+              action="soong_workflow.soong_workflow_record_start_action"
+              sequence="1"/>
+    <menuitem id="menu_workflow_approval_request_my_pending_to_do"
+              name="待办"
+              parent="menu_workflow_approval_request_my"
+              action="soong_workflow.soong_workflow_record_pending_to_do_action"
+              sequence="3"/>
+    <menuitem id="menu_workflow_approval_request_my_pending_done"
+              name="已办"
+              parent="menu_workflow_approval_request_my"
+              action="soong_workflow.soong_workflow_record_pending_done_action"
+              sequence="4"/>
+    <menuitem id="menu_workflow_approval_request_my_end"
+              name="结束"
+              parent="menu_workflow_approval_request_my"
+              action="soong_workflow.soong_workflow_record_end_action"
+              sequence="5"/>
     <menuitem id="menu_hr_attendance_approval_request_board"
              name="流程"
              parent="holiday_manage_menu_root_board"