diff --git a/sh_backmate_theme_adv_enterprise/static/src/xml/menu.xml b/sh_backmate_theme_adv_enterprise/static/src/xml/menu.xml index 45656675f..75508184b 100644 --- a/sh_backmate_theme_adv_enterprise/static/src/xml/menu.xml +++ b/sh_backmate_theme_adv_enterprise/static/src/xml/menu.xml @@ -55,7 +55,7 @@ onSelected="() => this.onNavBarDropdownItemSelection(menu)" > - + @@ -73,7 +73,7 @@
- + @@ -103,7 +103,7 @@ onSelected="() => this.onNavBarDropdownItemSelection(children)" > - + diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index 3190ca1ed..644426afc 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -846,16 +846,9 @@ class SoongWorkflowMixin(models.AbstractModel): "default_trans_link_id": default_trans_link_id, "all_workflow_links": allowed_link_ids, "default_invalid_link_ids": invalid_links.ids, - "default_allowed_issue_ids": [(6, 0, self._get_avoid_issue_ids())], }, } - def _get_avoid_issue_ids(self): - """获取当前记录中可回避的议题ID列表""" - if hasattr(self, 'line_ids'): - return self.line_ids.mapped('issue_id').ids - return [] - def get_all_sub_departments(self, department, level=0, print_tree=True): all_departments = department.child_ids diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 2a977fc67..0787092ef 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -36,32 +36,6 @@ class SoongWorkflowCommentWizard(models.TransientModel): workflow_record_id = fields.Many2one('soong.workflow.record', string="流程") is_selection = fields.Boolean(string="是否自动选择") trans_link_id = fields.Many2one('trans.link', string='转交节点', ondelete='set null') - is_avoid = fields.Boolean(string='是否回避') - allowed_issue_ids = fields.Many2many('issue.library', 'soong_comment_wizard_allowed_issue_rel', - 'wizard_id', 'issue_id', string='可选议题') - avoid_issue_ids = fields.Many2many('issue.library', 'soong_comment_wizard_avoid_issue_rel', - 'wizard_id', 'issue_id', string='回避议题') - avoid_comment = fields.Char(string='回避意见') - - @api.onchange('is_avoid') - def _onchange_is_avoid(self): - if not self.is_avoid: - self.avoid_issue_ids = [(5, 0, 0)] - self.avoid_comment = False - - @api.onchange('is_avoid') - def _onchange_is_avoid(self): - if not self.is_avoid: - self.avoid_issue_ids = [(5, 0, 0)] - self.avoid_comment = False - - def _handle_avoidance(self): - """回避处理：勾选回避且选了议题时，在对应议题中记录回避""" - if not self.is_avoid or not self.avoid_issue_ids: - return - for issue in self.avoid_issue_ids: - issue.log_avoidance(self.env.user, self.avoid_comment or '') - document_ids = fields.Many2many('ir.attachment', string="附件") return_link_id = fields.Many2one('trans.link', string='退回节点', ondelete='set null') invalid_link_ids = fields.Many2many( @@ -94,6 +68,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): 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): if not self.employee_ids1: @@ -157,7 +132,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): ]) self.employee_ids2 = self.env['hr.employee'].search(domain) - @api.depends('comment_note_id', 'comment_note', 'avoid_comment') + @api.depends('comment_note_id', 'comment_note') def _compute_comment(self): for record in self: comment_parts = [] @@ -165,8 +140,6 @@ class SoongWorkflowCommentWizard(models.TransientModel): comment_parts.append(record.comment_note_id.name) if record.comment_note: comment_parts.append(record.comment_note) - if record.avoid_comment: - comment_parts.append(f'【回避意见】{record.avoid_comment}') record.comment = " ".join(comment_parts) if comment_parts else "" @api.depends('user_id.employee_ids.user_role_ids', 'user_id.employee_ids.user_role_id') diff --git a/yuthon_ai_agent/data/demo_report_template.xml b/yuthon_ai_agent/data/demo_report_template.xml index 14f3430da..e22bdc95f 100644 --- a/yuthon_ai_agent/data/demo_report_template.xml +++ b/yuthon_ai_agent/data/demo_report_template.xml @@ -12,7 +12,7 @@ {"name":"订单号","partner_id":"客户","date_order":"下单日期","amount_total":"金额","state":"状态","user_id":"销售员"} date_order desc 5 - + =","description":"查询起始日期"},{"name":"date_to","label":"结束日期","type":"date","domain_field":"date_order","op":"<=","description":"查询截止日期"}]]]> 当用户查询销售订单列表或销售业绩时使用此模板。支持按日期范围筛选。 10 @@ -26,7 +26,7 @@ {"name":"线索名称","partner_name":"客户","expected_revenue":"预期收入","probability":"赢单率","stage_id":"阶段","create_date":"创建时间","user_id":"负责人"} create_date desc 6 - + 当用户查询销售线索列表或销售管道时使用此模板。 20 diff --git a/yuthon_ai_agent/models/ai_report_template.py b/yuthon_ai_agent/models/ai_report_template.py index e157524e1..cae02896b 100644 --- a/yuthon_ai_agent/models/ai_report_template.py +++ b/yuthon_ai_agent/models/ai_report_template.py @@ -69,6 +69,8 @@ class AiReportTemplate(models.Model): help='列定义中已配置的字段，用于限制分组/筛选器的可选范围') param_def_ids = fields.One2many('ai.report.template.param.def', 'template_id', string='AI 参数定义', copy=True) + chart_ids = fields.One2many('ai.report.template.chart', 'template_id', + string='图表配置', copy=True) default_visible = fields.Integer('默认可见列数', default=10) @@ -88,7 +90,7 @@ class AiReportTemplate(models.Model): # ===== Computed: report_config ===== @api.depends('column_ids', 'card_ids', 'group_by_ids', - 'filter_ids', 'default_visible') + 'filter_ids', 'default_visible', 'chart_ids') def _compute_report_config(self): for t in self: cfg = {} @@ -162,6 +164,23 @@ class AiReportTemplate(models.Model): cfg['filters'] = flt if t.default_visible: cfg['defaultVisible'] = t.default_visible + charts = [] + for ch in t.chart_ids: + lf_name = ch.label_field_name or (ch.label_field_id.name if ch.label_field_id else '') + vf_name = ch.value_field_name or (ch.value_field_id.name if ch.value_field_id else '') + if not lf_name: + continue + cd = { + 'type': ch.chart_type, + 'labelField': lf_name, + 'calc': ch.calc_method, + 'title': ch.title or '', + } + if vf_name: + cd['valueField'] = vf_name + charts.append(cd) + if charts: + cfg['charts'] = charts t.report_config = json.dumps(cfg, ensure_ascii=False) if cfg else '{}' def _inverse_report_config(self): diff --git a/yuthon_ai_agent/models/ai_report_template_config.py b/yuthon_ai_agent/models/ai_report_template_config.py index cdd6ceb10..53d3cf69c 100644 --- a/yuthon_ai_agent/models/ai_report_template_config.py +++ b/yuthon_ai_agent/models/ai_report_template_config.py @@ -200,6 +200,51 @@ class AiReportTemplateParamDef(models.Model): self.label = self.field_id.field_description +class AiReportTemplateChart(models.Model): + """报表模板 - 图表配置""" + _name = 'ai.report.template.chart' + _description = '图表配置' + _order = 'sequence, id' + + template_id = fields.Many2one('ai.report.template', string='模板', + required=True, ondelete='cascade') + model_id = fields.Many2one('ir.model', related='template_id.model_id', store=True) + chart_type = fields.Selection([ + ('bar', '柱状图'), + ('line', '折线图'), + ('pie', '饼图'), + ('doughnut', '环形图'), + ('polarArea', '玫瑰图'), + ], string='图表类型', default='bar', required=True) + label_field_id = fields.Many2one('ir.model.fields', string='分组字段', + domain="[('model_id', '=', model_id)]", ondelete='set null', + help='作为图表分类轴的字段（必填）') + label_field_name = fields.Char('分组字段名', + compute='_compute_label_field_name', store=True) + value_field_id = fields.Many2one('ir.model.fields', string='数值字段', + domain="[('model_id', '=', model_id), ('ttype', 'in', ('integer', 'float', 'monetary'))]", + ondelete='set null', help='留空则使用计数') + value_field_name = fields.Char('数值字段名', + compute='_compute_value_field_name', store=True) + calc_method = fields.Selection([ + ('count', '计数'), + ('sum', '求和'), + ('avg', '平均值'), + ], string='计算方式', default='count') + title = fields.Char('图表标题') + sequence = fields.Integer('排序', default=10) + + @api.depends('label_field_id') + def _compute_label_field_name(self): + for r in self: + r.label_field_name = r.label_field_id.name if r.label_field_id else '' + + @api.depends('value_field_id') + def _compute_value_field_name(self): + for r in self: + r.value_field_name = r.value_field_id.name if r.value_field_id else '' + + class AiReportTemplateDomainLine(models.Model): _name = 'ai.report.template.domain.line' _description = '报表模板-查询条件行' diff --git a/yuthon_ai_agent/security/ir.model.access.csv b/yuthon_ai_agent/security/ir.model.access.csv index 45c15f221..9ba8e3f2c 100644 --- a/yuthon_ai_agent/security/ir.model.access.csv +++ b/yuthon_ai_agent/security/ir.model.access.csv @@ -29,3 +29,5 @@ access_ai_report_template_param_def_user,参数定义-用户只读,model_ai_repo access_ai_report_template_param_def_admin,参数定义-管理员,model_ai_report_template_param_def,yuthon_ai_agent.group_ai_agent_admin,1,1,1,1 access_ai_report_template_domain_line_user,查询条件行-用户只读,model_ai_report_template_domain_line,yuthon_ai_agent.group_ai_agent_user,1,0,0,0 access_ai_report_template_domain_line_admin,查询条件行-管理员,model_ai_report_template_domain_line,yuthon_ai_agent.group_ai_agent_admin,1,1,1,1 +access_ai_report_template_chart_user,图表配置-用户只读,model_ai_report_template_chart,yuthon_ai_agent.group_ai_agent_user,1,0,0,0 +access_ai_report_template_chart_admin,图表配置-管理员,model_ai_report_template_chart,yuthon_ai_agent.group_ai_agent_admin,1,1,1,1 diff --git a/yuthon_ai_agent/static/src/html/report_template.html b/yuthon_ai_agent/static/src/html/report_template.html index 51c3c2191..3a28f6823 100644 --- a/yuthon_ai_agent/static/src/html/report_template.html +++ b/yuthon_ai_agent/static/src/html/report_template.html @@ -5,6 +5,7 @@ {{REPORT_TITLE}} · 动态报表 +