Merge branch 'dev' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into dev

.env.development

@@ -7,9 +7,11 @@ VUE_APP_TITLE = 捷道管理系统-测试站
 # 捷道管理系统/开发环境
 
 # VUE_APP_BASE_API = 'https://apitest.groupage.cn'
+
 # 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
+//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({
@@ -19,6 +19,15 @@ export function FirstCustomerCount(data) {
   })
 }
 
+//获取一段时间客户成交数目
+export function CustomerTargetCount(query) {
+  return request({
+    url: '/Report/SalesReport/CustomerTargetCount',
+    method: 'get',
+    params: query
+  })
+}
+
 //销售分析统计列表 lanbm 2024-04-01 add
 export function SalesReportList(data) {
   return request({
@@ -28,6 +37,8 @@ export function SalesReportList(data) {
   })
 }
 
+
+
 //获取销售分析图表数据
 export function getEChartData(query) {
   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/bpm/processInstance/index.vue

@@ -106,7 +106,8 @@
 import { getMyProcessInstancePage, cancelProcessInstance } from "@/api/bpm/processInstance";
 
 export default {
-  name: "ProcessInstance",
+  //lanbm 2024-05-08 添加查询条件不清空优化
+  name: "BpmProcessinstanceIndex",
   components: {
   },
   data() {
@@ -137,6 +138,14 @@ export default {
   created() {
     this.getList();
   },
+  watch: {
+    //lanbm 2024-05-08 添加页面再次进入刷新列表优化
+    $route(to) {
+      if (this.$route.path == "/task/my") {
+        this.getList();
+      }
+    },
+  },
   methods: {
     /** 查询列表 */
     getList() {

src/views/bpm/task/copy.vue

@@ -73,7 +73,8 @@
 import {getCopyTaskPage} from '@/api/bpm/task'
 
 export default {
-  name: "Copy",
+  //lanbm 2024-05-08 添加查询条件不清空优化
+  name: "BpmTaskCopy",
   components: {},
   data() {
     return {
@@ -100,6 +101,14 @@ export default {
   created() {
     this.getList();
   },
+  watch: {
+    //lanbm 2024-05-08 添加页面再次进入刷新列表优化
+    $route(to) {
+      if (this.$route.path == "/task/copy") {
+        this.getList();
+      }
+    },
+  },
   methods: {
     /** 查询列表 */
     getList() {

src/views/bpm/task/done.vue

@@ -80,7 +80,8 @@ import {getDoneTaskPage} from '@/api/bpm/task'
 import {getDate} from "@/utils/dateUtils";
 
 export default {
-  name: "Done",
+  //lanbm 2024-05-08 添加查询条件不清空优化
+  name: "BpmTaskDone",
   components: {},
   data() {
     return {
@@ -104,6 +105,14 @@ export default {
   created() {
     this.getList();
   },
+  watch: {
+    //lanbm 2024-05-08 添加页面再次进入刷新列表优化
+    $route(to) {
+      if (this.$route.path == "/task/done") {
+        this.getList();
+      }
+    },
+  },
   methods: {
     /** 查询列表 */
     getList() {

src/views/bpm/task/todo.vue

 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item :label="$t('流程编号')" prop="processInstanceId">
-        <el-input v-model="queryParams.processInstanceId" :placeholder="$t('流程编号')" clearable
-                  @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.processInstanceId"
+          :placeholder="$t('流程编号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item :label="$t('流程名称')" prop="name">
-        <el-input v-model="queryParams.name" :placeholder="$t('任务名称')" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.name"
+          :placeholder="$t('任务名称')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item :label="$t('流程分类')" prop="category">
-        <el-select v-model="queryParams.category" :placeholder="$t('请选择流程分类')" clearable>
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
-                     :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
+        <el-select
+          v-model="queryParams.category"
+          :placeholder="$t('请选择流程分类')"
+          clearable
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
+            :key="dict.value"
+            :label="$l(dict, 'label')"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('提交时间')">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')"
-                        :end-placeholder="$t('结束日期')"/>
+        <el-date-picker
+          v-model="dateRangeCreateTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          :start-placeholder="$t('开始日期')"
+          :end-placeholder="$t('结束日期')"
+        />
       </el-form-item>
       <el-form-item :label="$t('业务编号')" prop="businessNo">
-        <el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编号')" clearable
-                  @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.businessNo"
+          :placeholder="$t('请输入业务编号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{
+          $t("搜索")
+        }}</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">{{
+          $t("重置")
+        }}</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('流程编号')" align="center" prop="processInstance.id" width="220"/>
-      <el-table-column :label="$t('流程名称')" align="center" prop="processInstance.name" width="220"/>
+      <el-table-column
+        :label="$t('流程编号')"
+        align="center"
+        prop="processInstance.id"
+        width="220"
+      />
+      <el-table-column
+        :label="$t('流程名称')"
+        align="center"
+        prop="processInstance.name"
+        width="220"
+      />
 
       <el-table-column :label="$t('流程分类')" align="center" prop="category">
         <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category"/>
+          <dict-tag
+            :type="DICT_TYPE.BPM_MODEL_CATEGORY"
+            :value="scope.row.category"
+          />
         </template>
       </el-table-column>
-      <el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
+      <el-table-column
+        :label="$t('业务编号')"
+        align="center"
+        prop="businessNo"
+      />
 
-      <el-table-column :label="$t('当前审批节点')" align="center" prop="name"/>
+      <el-table-column :label="$t('当前审批节点')" align="center" prop="name" />
       <!-- <el-table-column :label="$t('状态')" align="center" prop="version" width="80">
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.suspensionState === 1">{{ $t('激活') }}</el-tag>
@@ -56,7 +111,12 @@
           <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
         </template>
       </el-table-column> -->
-      <el-table-column :label="$t('提交时间')" align="center" prop="createTime" width="180">
+      <el-table-column
+        :label="$t('提交时间')"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -66,33 +126,53 @@
           <span>{{ parseTime(scope.row.endTime) }}</span>
         </template>
       </el-table-column> -->
-      <el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width" width="150">
+      <el-table-column
+        :label="$t('操作')"
+        align="center"
+        fixed="right"
+        class-name="small-padding fixed-width"
+        width="150"
+      >
         <template slot-scope="scope">
           <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCancel(scope.row)"
                      v-hasPermi="['bpm:task:update']">{{ $t('取消') }}
           </el-button> -->
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
-                     v-hasPermi="['bpm:task:update']">{{ $t('详情') }}
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleAudit(scope.row)"
+            v-hasPermi="['bpm:task:update']"
+            >{{ $t("详情") }}
           </el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
-                     v-hasPermi="['bpm:task:update']">{{ $t('审批') }}
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleAudit(scope.row)"
+            v-hasPermi="['bpm:task:update']"
+            >{{ $t("审批") }}
           </el-button>
-
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
   </div>
 </template>
 
 <script>
-import {getTodoTaskPage} from '@/api/bpm/task'
+import { getTodoTaskPage } from "@/api/bpm/task";
 import { cancelProcessInstance } from "@/api/bpm/processInstance";
 export default {
-  name: "Todo",
+  //lanbm 2024-05-08 添加查询条件不清空优化
+  name: "BpmTaskTodo",
   components: {},
   data() {
     return {
@@ -118,14 +198,22 @@ export default {
   created() {
     this.getList();
   },
+  watch: {
+    //lanbm 2024-05-08 添加页面再次进入刷新列表优化
+    $route(to) {
+      if (this.$route.path == "/task/todo") {
+        this.getList();
+      }
+    },
+  },
   methods: {
     /** 查询列表 */
     getList() {
       this.loading = true;
       // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
-      getTodoTaskPage(params).then(response => {
+      let params = { ...this.queryParams };
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
+      getTodoTaskPage(params).then((response) => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -144,23 +232,28 @@ export default {
     },
     /** 处理审批按钮 */
     handleAudit(row) {
-      this.$router.push({path: "/bpm/process-instance/detail", query: {id: row.processInstance.id}});
+      this.$router.push({
+        path: "/bpm/process-instance/detail",
+        query: { id: row.processInstance.id },
+      });
     },
     handleCancel(row) {
       const id = row.id;
-      this.$prompt(this.$t('请输入取消原因？'), this.$t("取消流程"), {
-        type: 'warning',
+      this.$prompt(this.$t("请输入取消原因？"), this.$t("取消流程"), {
+        type: "warning",
         confirmButtonText: this.$t("确定"),
         cancelButtonText: this.$t("取消"),
         inputPattern: /^[\s\S]*.*[^\s][\s\S]*$/, // 判断非空，且非空格
         inputErrorMessage: this.$t("取消原因不能为空"),
-      }).then(({ value }) => {
+      })
+        .then(({ value }) => {
           return cancelProcessInstance(id, value);
-      }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess(this.$t("取消成功"));
-      })
+        });
+    },
   },
-  }
 };
 </script>

src/views/ecw/order/index.vue

@@ -237,8 +237,9 @@
           effect="dark"
           :content="row.orderType===2 ? (row.wvolume||0)+'m³' : (row.vweight || 0) + 'kg'"
           placement="bottom">
-            <div v-if="row.sumNum > 0">{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div>
-            <div v-else>{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div>
+            <!-- <div v-if="row.sumNum > 0">{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div>
+            <div v-else>{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div> -->
+            <div >{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div>
           </component>
           <!-- <el-tooltip v-if="scope.row.orderExceptionType=='order_heavy_cargo_exception'" class="item" effect="dark" :content="(scope.row.wvolume||0)+'m³'" placement="bottom">
             <span style="color:#ff4949" v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>

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

@@ -328,6 +328,7 @@
       <el-table-column label="控货总V值" align="center" prop="khSumV" />
       <el-table-column label="控货占比" align="center" prop="khSumZb" />
       <!--2024-05-06和张工确认这几个参数无取数逻辑，暂时隐藏-->
+      <!--
       <el-table-column
         label="是否首次成交"
         v-show="false"
@@ -343,7 +344,7 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.firstDate) }}</span>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <!--2024-05-06和张工确认这几个参数无取数逻辑，暂时隐藏-->
       <el-table-column label="提货率" align="center" prop="thL" />
       <el-table-column label="客户业绩类型" align="center" prop="cusYjType" />
@@ -443,7 +444,7 @@ function getLastDay(sDate) {
   return lastDay;
 }
 
-//2024-05-01
+//2024-05-01合并
 export default {
   name: "ReportCustomer_analysisIndex",
   components: {
@@ -538,7 +539,9 @@ export default {
   watch: {
     $route(to) {
       //lanbm 2024-05-06 解决重新进入参数不刷新的问题
-      if (this.$route.name == "客户分析") {
+      //this.$route.name == "客户分析" 用name做逻辑判断，有时候菜单名称会变化
+      //"/report/customer_analysis" lanbm 2024-05-07 调整为根据path做逻辑判断
+      if (this.$route.path== "/report/customer_analysis") {
         this.doLoadData();
       }
     },
@@ -765,6 +768,24 @@ export default {
       return strDate;
     },
     test() {
+      //当前路径
+      let sP=this.$route.path;
+      alert(sP);
+      //当前参数
+      let sPar= this.$route.params;
+      alert(sPar);
+      //路由名称
+      let sRoute=this.$route.name;
+      alert(sRoute);
+      //路由查询参数
+      let sQ=this.$route.query;
+      alert(sQ.toString());
+      //路由匹配项
+      let sM=this.$route.matched;
+      alert(sM.toString());
+
+      return;
+
       this.DeptEx.id = this.objEcwReportPermission.deptId;
       listServiceUser(this.DeptEx).then((response) => {
         let json1 = JSON.stringify(response.data);
@@ -772,8 +793,6 @@ export default {
         return;
       });
 
-      return;
-
       let json1 = JSON.stringify(this.deptOptions);
       alert(json1);
       return;

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

@@ -366,7 +366,6 @@
         </el-card>
       </el-col>
     </el-row>
-
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="排名" align="center" prop="px" />
@@ -488,7 +487,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/vz/index.vue

@@ -63,7 +63,8 @@
         <el-button
           type="primary"
           plain
-          icon="el-icon-plus" v-show="false"
+          icon="el-icon-plus"
+          v-show="false"
           size="mini"
           @click="TestFun"
         >
@@ -166,7 +167,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: {

vue.config.js

@@ -47,6 +47,7 @@ module.exports = {
     disableHostCheck: true
   },
   css: {
+    sourceMap: true,  // 开启 CSS source maps
     loaderOptions: {
       sass: {
         sassOptions: { outputStyle: "expanded" }