pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!7940 1

Browse Source 
Merge pull request !7940 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-01-13 14:17:38 +00:00
committed by Gitee
parent f8178ec4b8 1a725ecfb0
commit 92b83fe736
3 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/templates/soong_workflow_templates.xml
+1 -18
View File
@@ -2,7 +2,7 @@
<odoo>
<template id="soong_workflow_log_manager">
<notebook>
<page string="审批详情" invisible="work_end">
<page string="审批详情">
<field name="log_ids" style="width:100%; margin-top: 10px;" mode="kanban,tree" context="{'kanban_view_ref':'soong_workflow.soong_workflow_log_kanban'}">
<tree editable="bottom">
<field name="sequence" string="" widget="handle" groups="soong_workflow.group_soong_workflow_manager"/>
@@ -17,23 +17,6 @@
</tree>
</field>
</page>
<page string="审批详情" invisible="not work_end">
<field name="log_ids" style="width:100%; margin-top: 10px;" domain="[('node_btn_name', '!=', '1')]" context="{'kanban_view_ref':'soong_workflow.soong_workflow_log_kanban'}">
<tree editable="bottom">
<field name="sequence" string="" widget="handle"
groups="soong_workflow.group_soong_workflow_manager"/>
<field name="name" string="" readonly="0"/>
<field name="comment" string=""/>
<field name="msg_id" column_invisible="1"/>
<field name="done_by" string="" column_invisible="1"/>
<field name="display_field" string=""/>
<field name="lase_click_date" string="" groups="base.group_system"/>
<field name="approval_state" string=""/>
<field name="node_btn_name" string="" groups="soong_workflow.group_soong_workflow_manager"/>
<field name="document_ids" string="" widget="preview_many2many"/>
</tree>
</field>
</page>
<page string="抄送/传阅记录" invisible="not log_ids2" mode="kanban,tree" context="{'kanban_view_ref':'soong_workflow.soong_workflow_log2_kanban'}">
<field name="log_ids2" style="width:100%; margin-top: 10px;">
<tree editable="bottom" >
soong_workflow/wizard/soong_workflow_comment_wizard.py
+1 -1
View File
@@ -702,7 +702,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
title=record_id._description,
description=f"编号为{record_id.code}的{record_id._description}已结束，请归档",
url=url, btntxt="查看详情")
return self.node_btn_id.with_context(cx).run()
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', '=', '行政收文')])
yuthon_salary/controllers/salary_phone.py
+9 -4
View File
@@ -9,7 +9,7 @@ class YuthonWillTask(http.Controller):
@http.route('/party/list', methods=['POST'], type='http', auth='public', csrf=False)
def party_list(self, **kwargs):
party_ids = request.env['yuthon.salary.party'].sudo().search([])[0]
party_ids = request.env['yuthon.salary.party'].sudo().search([('employee_id.id', '=', kwargs.get('employee_id'))])
data_list = []
for party in party_ids:
result = {
@@ -20,15 +20,20 @@ class YuthonWillTask(http.Controller):
'payment': party.payment,
'total_payment': party.total_payment,
'toll_state': party.toll_state,
'year_total': sum(party_ids.filtered(lambda p: p.select_year == party.select_year).mapped('total_payment'))
}
data_list.append(result)
return json.dumps({'data': data_list, 'code': 200, 'message': 'success'})
@http.route('/party/list/confirm', methods=['POST'], type='http', auth='public', csrf=False)
def meal_list_confirm(self, **kwargs):
def party_list_confirm(self, **kwargs):
meal_id = request.env['yuthon.salary.party'].sudo().search([('id', '=', kwargs.get('id'))])
meal_id.write({'toll_state': 'True'})
meal_id.write({'toll_state': 'done'})
if not meal_id:
return json.dumps({'code': 200, 'message': '没有找到对应的数据id'})
else:
return json.dumps({'code': 200, 'message': 'OK'})
@http.route('/meal/list', methods=['POST'], type='http', auth='public', csrf=False)
def meal_list(self, **kwargs):
meal_ids = request.env['yuthon.meal.expenses'].sudo().search([('employee_id.id', '=', kwargs.get('employee_id'))])