From d8c8f60eb56ec16a31678fa3fe0bc45dd415a2af Mon Sep 17 00:00:00 2001
From: gaoxq <376340421@qq.com>
Date: Wed, 10 Dec 2025 15:50:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=89=8D=E7=AB=AFvue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jeesite/modules/erp/entity/ErpExpInc.java   | 9 +--------
 .../com/jeesite/modules/erp/entity/ErpSummaryAll.java    | 4 +---
 .../views/biz/dataReport/erp/components/ChartLine.vue    | 6 +++---
 .../biz/views/biz/dataReport/erp/components/chartBar.vue | 4 ++--
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/web-api/src/main/java/com/jeesite/modules/erp/entity/ErpExpInc.java b/web-api/src/main/java/com/jeesite/modules/erp/entity/ErpExpInc.java
index 82fc8396..0201679a 100644
--- a/web-api/src/main/java/com/jeesite/modules/erp/entity/ErpExpInc.java
+++ b/web-api/src/main/java/com/jeesite/modules/erp/entity/ErpExpInc.java
@@ -3,11 +3,6 @@ package com.jeesite.modules.erp.entity;
 import java.io.Serializable;
 import java.util.Date;
 
-import com.jeesite.common.mybatis.annotation.JoinTable;
-import com.jeesite.common.mybatis.annotation.JoinTable.Type;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import jakarta.validation.constraints.Size;
-
 import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
@@ -24,9 +19,7 @@ import java.io.Serial;
  * @version 2025-12-10
  */
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "erp_exp_inc", alias = "a", label = "收支信息信息", columns = {
-        @Column(name = "create_time", attrName = "createTime", label = "记录时间", isUpdateForce = true),
-        @Column(name = "id", attrName = "id", label = "主键ID", isPK = true),
+@Table(name = "erp_exp_inc_view", alias = "a", label = "收支信息", columns = {
         @Column(name = "account_name", attrName = "accountName", label = "account_name", queryType = QueryType.LIKE),
         @Column(name = "stat_date", attrName = "statDate", label = "stat_date"),
         @Column(name = "cycle_type", attrName = "cycleType", label = "cycle_type"),
diff --git a/web-api/src/main/java/com/jeesite/modules/erp/entity/ErpSummaryAll.java b/web-api/src/main/java/com/jeesite/modules/erp/entity/ErpSummaryAll.java
index 72ba6c6a..ff5e9c58 100644
--- a/web-api/src/main/java/com/jeesite/modules/erp/entity/ErpSummaryAll.java
+++ b/web-api/src/main/java/com/jeesite/modules/erp/entity/ErpSummaryAll.java
@@ -22,9 +22,7 @@ import java.io.Serial;
  * @version 2025-12-09
  */
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "erp_summary_all", alias = "a", label = "汇总信息信息", columns = {
-        @Column(name = "create_time", attrName = "createTime", label = "记录时间", isQuery = false, isUpdateForce = true),
-        @Column(name = "id", attrName = "id", label = "主键ID", isPK = true),
+@Table(name = "erp_summary_all_view", alias = "a", label = "汇总信息信息", columns = {
         @Column(name = "c_date", attrName = "cdate", label = "汇总日期"),
         @Column(name = "c_type", attrName = "ctype", label = "交易类型"),
         @Column(name = "this_value", attrName = "thisValue", label = "当期金额", isQuery = false, isUpdateForce = true),
diff --git a/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLine.vue b/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLine.vue
index ab74cec9..6f9f042c 100644
--- a/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLine.vue
+++ b/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLine.vue
@@ -24,7 +24,7 @@ import * as echarts from 'echarts';
 
 const defaultFormValues = {
   ctype: '1', 
-  fcycle: 'D'
+  fcycle: 'M'
 };
 
 const currentFormValues = ref<Record<string, any>>({ ...defaultFormValues });
@@ -32,7 +32,7 @@ const currentFormValues = ref<Record<string, any>>({ ...defaultFormValues });
 // 表单配置
 const schemas: FormSchema[] = [
   {
-    label: '交易类型',
+    label: '类型',
     field: 'ctype',
     component: 'Select',
     defaultValue: defaultFormValues.ctype,
@@ -47,7 +47,7 @@ const schemas: FormSchema[] = [
     colProps: { md: 12, lg: 12 },
   },
   {
-    label: '周期类型',
+    label: '周期',
     field: 'fcycle',
     component: 'Select',
     defaultValue: defaultFormValues.fcycle,
diff --git a/web-vue/packages/biz/views/biz/dataReport/erp/components/chartBar.vue b/web-vue/packages/biz/views/biz/dataReport/erp/components/chartBar.vue
index 27c3bf8a..b71e1938 100644
--- a/web-vue/packages/biz/views/biz/dataReport/erp/components/chartBar.vue
+++ b/web-vue/packages/biz/views/biz/dataReport/erp/components/chartBar.vue
@@ -28,13 +28,13 @@ import type {
 
 // 表单默认值
 const defaultFormValues = ref({
-  cycleType: 'D'
+  cycleType: 'M'
 });
 
 // 表单配置
 const schemas: FormSchema[] = [
   {
-    label: '周期类型',
+    label: '周期',
     field: 'cycleType',
     defaultValue: defaultFormValues.value.cycleType,
     component: 'Select',