2024-05-01合并到主分支

src/api/report/EcwReportPermission.js

 import request from '@/utils/request'
 
-//2024-05-01
+//2024-05-01合并
 //报表权限 lanbm 2024-04-15 add
 export function create(data) {
   return request({

src/api/report/customeranalysis.js

 import request from '@/utils/request'
 
-//2024-05-01
+//2024-05-01合并
 // 获得测试分页
 export function getListPage(data) {
   return request({

src/api/report/customerreport.js

 import request from '@/utils/request'
 
-//2024-05-01
+//2024-05-01合并
 //lanbm 2024-03-31 add
 //获取报表统计结果
 export function getReportResult(data) {

src/api/report/salesanalysis.js

 import request from '@/utils/request'
 
-//2024-05-01
+//2024-05-01合并
 export function getListPage(query) {
   return request({
     url: '/Report/SalesAnalysis/getListPage',

src/api/report/salesreport.js

 import request from '@/utils/request'
 
-//2024-05-01
+//2024-05-01合并
 //查询运输方式体积货重量 lanbm 2024-04-01 add
 export function SalesReportCount(data) {
   return request({

src/api/report/vz.js

 import request from '@/utils/request'
 
-//2024-05-01
+//2024-05-01合并
 //报表V值设置参数 lanbm 2024-04-03 add
 export function create(data) {
   return request({

src/views/report/EcwReportPermission/index.vue

@@ -185,7 +185,7 @@ import {
   exportExcel,
 } from "@/api/report/EcwReportPermission";
 
-//2024-05-01
+//2024-05-01合并
 export default {
   name: "EcwReportPermission",
   components: {

src/views/report/customer_analysis/index.vue

@@ -427,7 +427,7 @@ function getLastDay(sDate) {
   return lastDay;
 }
 
-//2024-05-01
+//2024-05-01合并
 export default {
   name: "ReportCustomer_analysisIndex",
   components: {

src/views/report/customerreport/index.vue

@@ -132,7 +132,7 @@ function getLastYear() {
   return year.toString();
 }
 
-//2024-05-01
+//2024-05-01合并
 export default {
   name: "ReportCustomerreportIndex",
   components: {

src/views/report/sales_analysis/index.vue

@@ -428,7 +428,7 @@ import { listSimpleDepts } from "@/api/system/dept";
 //入仓记录页面
 import WarehouseDetail from "@/views/ecw/order/components/WarehouseDetail";
 
-//2024-05-01
+//2024-05-01合并
 export default {
   name: "ReportSales_analysisIndex",
   components: {

src/views/report/salesreport/index.vue

@@ -193,7 +193,7 @@ require("echarts/theme/macarons");
 import resize from "../../dashboard/mixins/resize";
 import SalesPanelGroup from "../../dashboard/SalesPanelGroup";
 
-//2024-05-01
+//2024-05-01合并
 export default {
   name: "ReportSalesreportIndex",
   components: {

src/views/report/vz/index.vue

@@ -154,7 +154,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@/assets/styles/vue-treeselect.css";
 import { MessageBox } from "element-ui";
 
-//2024-05-01
+//2024-05-01合并
 export default {
   name: "vz",
   components: {