Merge branch 'dev'

.env.dev

@@ -5,7 +5,8 @@ NODE_ENV = 'production'
 VUE_APP_TITLE = 捷道管理系统 - 测试版
 
 # 捷道管理系统/开发环境
-VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
+ VUE_APP_BASE_API = 'http://127.0.0.1:48080'
+# VUE_APP_BASE_API = 'http://110.41.143.128:48080'
 # VUE_APP_BASE_API = '/api'
 
 # 路由懒加载

.env.development

@@ -7,7 +7,11 @@ VUE_APP_TITLE = 捷道管理系统-测试站
 # 捷道管理系统/开发环境
 
 # VUE_APP_BASE_API = 'https://apitest.groupage.cn'
-VUE_APP_BASE_API = 'http://127.0.0.1:48080'
+
+# VUE_APP_BASE_API = 'http://110.41.143.128:48080'
+ VUE_APP_BASE_API = 'http://127.0.0.1:48080'
+
+
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

src/api/report/EcwReportPermission.js

 import request from '@/utils/request'
+
+//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
 // 获得测试分页
 export function getListPage(data) {
   return request({

src/api/report/customerreport.js

 import request from '@/utils/request'
 
+//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
 export function getListPage(query) {
   return request({
     url: '/Report/SalesAnalysis/getListPage',

src/api/report/salesreport.js

 import request from '@/utils/request'
 
+//2024-05-01
 //查询运输方式体积货重量 lanbm 2024-04-01 add
 export function SalesReportCount(data) {
   return request({
@@ -27,6 +28,17 @@ export function SalesReportList(data) {
   })
 }
 
+//获取销售分析图表数据
+export function getEChartData(query) {
+  return request({
+    url: '/Report/SalesReport/getEChartData',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
 // 导出测试 Excel 2024-04-27
 export function exportTestExcel(query) {
   return request({

src/api/report/vz.js

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

src/views/ecw/box/queryAir.vue

@@ -252,7 +252,7 @@ import cancelClear from "./cancelClear.vue";
 import { listUser } from "@/api/system/user";
 
 export default {
-  name: "boxDetail",
+  name: "EcwBoxBoxQueryAir",
   props: {
     shipmentId: String,
   },

src/views/report/EcwReportPermission/index.vue

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

src/views/report/customer_analysis/index.vue

@@ -109,23 +109,32 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="数据筛选" prop="searchDataType">
+      <el-form-item label="总V值" prop="searchDataType1">
         <el-select
           v-model="queryParams.searchDataType1"
           clearable
-          style="width: 200px"
+          style="width: 130px"
         >
           <el-option
-            v-for="dict in SearchDataTypeList1"
+            v-for="dict in SearchDataTypeList"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
+        <el-input
+          v-model="queryParams.searchData1"
+          style="width: 130px"
+          placeholder="请输入数值"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="海运拼柜" prop="searchDataType2">
         <el-select
           v-model="queryParams.searchDataType2"
           clearable
-          style="width: 200px"
+          style="width: 130px"
         >
           <el-option
             v-for="dict in SearchDataTypeList"
@@ -135,57 +144,93 @@
           />
         </el-select>
         <el-input
-          v-model="queryParams.searchDataType3"
-          style="width: 200px"
+          v-model="queryParams.searchData2"
+          style="width: 130px"
           placeholder="请输入数值"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="时间筛选" prop="searchDateType4">
+      <el-form-item label="专线空运" prop="searchDataType3">
         <el-select
-          v-model="queryParams.searchDataType4"
+          v-model="queryParams.searchDataType3"
           clearable
-          style="width: 200px"
+          style="width: 130px"
         >
-          <el-option label="首次成交时间" value="1"></el-option>
-          <el-option label="客户创建时间" value="0"></el-option>
+          <el-option
+            v-for="dict in SearchDataTypeList"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
+        <el-input
+          v-model="queryParams.searchData3"
+          style="width: 130px"
+          placeholder="请输入数值"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户创建时间">
         <el-date-picker
           v-model="queryParams.sdate4"
           type="date"
+          style="width: 130px"
           value-format="yyyy-MM-dd"
           clearable
-          placeholder="请输入起始日期"
+          placeholder="起始日期"
         />
         <el-date-picker
           v-model="queryParams.edate4"
           type="date"
+          style="width: 130px"
           value-format="yyyy-MM-dd"
           clearable
-          placeholder="请输截止日期"
+          placeholder="截止日期"
+        />
+      </el-form-item>
+      <el-form-item label="首次成交时间">
+        <el-date-picker
+          v-model="queryParams.sdate5"
+          type="date"
+          style="width: 130px"
+          value-format="yyyy-MM-dd"
+          clearable
+          placeholder="起始日期"
+        />
+        <el-date-picker
+          v-model="queryParams.edate5"
+          type="date"
+          style="width: 130px"
+          value-format="yyyy-MM-dd"
+          clearable
+          placeholder="截止日期"
         />
       </el-form-item>
       <el-form-item label="业绩产生时间" prop="searchDateType">
         <el-date-picker
           v-model="queryParams.sdate"
           type="date"
+          style="width: 130px"
           value-format="yyyy-MM-dd"
           clearable
-          placeholder="请输入起始日期"
+          placeholder="起始日期"
         />
         <el-date-picker
           v-model="queryParams.edate"
           type="date"
+          style="width: 130px"
           value-format="yyyy-MM-dd"
           clearable
-          placeholder="请输截止日期"
+          placeholder="截止日期"
         />
       </el-form-item>
       <el-form-item label="同比年份" prop="duibiYear">
         <el-date-picker
           v-model="queryParams.duibiYear"
           type="year"
+          style="width: 130px"
           value-format="yyyy"
           placeholder="请选择同比年份"
         />
@@ -211,6 +256,18 @@
         <el-button type="primary" size="mini" @click="test" v-show="false">
           测试
         </el-button>
+
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport2"
+          :loading="exportLoading"
+          v-show="false"
+        >
+          {{ $t("导出测试") }}</el-button
+        >
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="list">
@@ -256,13 +313,13 @@
       <el-table-column
         label="海运月均同比"
         align="center"
-        prop="sumvolumeTbShow1"
+        prop="seaMonthAvgTb"
       />
       <el-table-column label="空运月均重量" align="center" prop="airMothAvg" />
       <el-table-column
         label="空运月均同比"
         align="center"
-        prop="sumweightTbShow3"
+        prop="airMothAvgTb"
       />
       <el-table-column label="重货总V值" align="center" prop="weightSumV" />
       <el-table-column label="重货占比" align="center" prop="weithtSumZb" />
@@ -370,7 +427,7 @@ function getLastDay(sDate) {
   return lastDay;
 }
 
-//2024-04-27
+//2024-05-01
 export default {
   name: "ReportCustomer_analysisIndex",
   components: {
@@ -411,38 +468,11 @@ export default {
           return time.getTime() <= _now;
         },
       },
-      SearchDataTypeList1: [
-        { value: "allsumvolume", label: "总值" },
-        { value: "2", label: "总值同比" },
-        { value: "3", label: "海运拼柜" },
-        { value: "4", label: "海运占比" },
-        { value: "5", label: "海运同比" },
-        { value: "6", label: "海运占比" },
-        { value: "7", label: "专线空运" },
-        { value: "8", label: "空运占比" },
-        { value: "9", label: "空运同比" },
-        { value: "10", label: "月均" },
-        { value: "11", label: "月均同比" },
-        { value: "12", label: "海运月均方数" },
-        { value: "13", label: "空运月均重量" },
-        { value: "14", label: "重货总V值" },
-        { value: "15", label: "重货占比" },
-        { value: "16", label: "泡货总V值" },
-        { value: "17", label: "泡货总V值" },
-        { value: "18", label: "泡货占比" },
-        { value: "19", label: "控货总V值" },
-        { value: "20", label: "控货占比" },
-        { value: "21", label: "提货率" },
-      ],
       SearchDataTypeList: [
         { value: "1", label: "大于等于" },
         { value: "2", label: "等于" },
         { value: "3", label: "小于等于" },
       ],
-      SearchDateTypeList: [
-        { value: "firstdate", label: "首次成交时间" },
-        { value: "createdate", label: "客户创建时间" },
-      ],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -458,15 +488,20 @@ export default {
         first: undefined, //是否首次成交
         cusYjType: undefined, //客户业绩类型，新客户还是老客户
         searchDataType1: undefined, //查询数据类型
-        searchDataType2: undefined,
-        searchDataType3: undefined,
+        searchData1: undefined, //总V值查询
+        searchDataType2: undefined, //海运拼柜
+        searchData2: undefined, //海运拼柜
+        searchDataType3: undefined, //专线空运
+        searchData3: undefined, //专线空运
         searchDataType4: undefined, //时间筛选
         searchDateType: "createdate", //日期查询类型
         sdate: formatDate3(), //开始日期
         edate: formatDate2(), //结束日期
         duibiYear: getLastYear(), //对比年份
-        sdate4: undefined, //时间筛选开始值
-        edate4: undefined, //时间筛选结束值
+        sdate4: undefined, //客户创建时间
+        edate4: undefined, //客户创建时间
+        sdate5: undefined, //首次成交时间
+        edate5: undefined, //首次成交时间
       },
       // 表单参数
       form: {},
@@ -634,7 +669,7 @@ export default {
       if (this.isRightPar() == false) return;
       // 执行导出
       this.$modal
-        .confirm("是否确认导出数据项?")
+        .confirm("是否确认导出所有数据项?")
         .then(() => {
           this.exportLoading = true;
           return exportExcel(this.queryParams);
@@ -643,7 +678,29 @@ export default {
           this.$download.excel(response, "客户分析报表.xls");
           this.exportLoading = false;
         })
-        .catch(() => {});
+        .catch(() => {
+          this.exportLoading = false;
+        });
+    },
+    handleExport2() {
+      if (this.isRightPar() == false) return;
+      this.$modal
+        .confirm("是否确认导出所有数据项?")
+        .then(() => {
+          this.exportLoading = true;
+          return exportExcel(this.queryParams);
+        })
+        .then((response) => {
+          //放入后台队列需要注释此行代码
+          //this.$download.excel(response, "客户分析报表.xls");
+          this.exportLoading = false;
+          this.$message.success(
+            this.$t("已加入导出队列，请稍后在下载日志中下载")
+          );
+        })
+        .catch(() => {
+          this.exportLoading = false;
+        });
     },
 
     /** 查询部门下拉树结构 + 岗位下拉 */

src/views/report/customerreport/index.vue

@@ -132,7 +132,7 @@ function getLastYear() {
   return year.toString();
 }
 
-//2024-04-27
+//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-04-27
+//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-04-27
+//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-04-27
+//2024-05-01
 export default {
   name: "vz",
   components: {