Merge branch 'dev'

src/api/report/customeranalysis.js

@@ -19,3 +19,12 @@ export function exportExcel(data) {
     responseType: 'blob'
   })
 }
+
+export function exportExcel2(data) {
+  return request({
+    url: '/Report/CustomerAnalysis/exportExcel2',
+    method: 'get',
+    params: data,
+    responseType: 'blob'
+  })
+}

src/api/report/salesanalysis.js

@@ -18,3 +18,13 @@ export function exportExcel(query) {
     responseType: 'blob'
   })
 }
+
+//获取统计汇总数据 lanbm 2024-05-04 add
+export function getStatisticalSummary(query) {
+  return request({
+    url: '/Report/SalesAnalysis/getStatisticalSummary',
+    method: 'get',
+    params: query
+  })
+}
+

src/api/report/vz.js

@@ -49,3 +49,12 @@ export function exportExcel(query) {
     responseType: 'blob'
   })
 }
+
+//测试功能
+export function test(query) {
+  return request({
+    url: '/ecwVz/vz/Test',
+    method: 'get',
+    params: query
+  })
+}

src/views/ecw/box/query.vue

@@ -133,7 +133,8 @@
               </el-table-column>
               <el-table-column prop="price" :label="$t('金额')" align="center"></el-table-column>
               <el-table-column prop="payPrice" :label="$t('实付金额')" align="center"></el-table-column>
-              <el-table-column prop="payTime" :label="$t('实付日期')" align="center">
+              <el-table-column prop="payTime" :label="$t('创建日期')" align="center">
+                <!--实付日期 改为 创建日期 lanbm 2024-05-06 add-->
                 <template slot-scope="scope">
                   <span v-if="scope.row.payTime">{{formatDate(scope.row.payTime)}}</span>
                 </template>

src/views/ecw/financial/creatCollection.vue

@@ -376,7 +376,8 @@
             </template>
           </el-table-column>
           <el-table-column :label="$t('期望收款汇率')" align="center">
-            <template slot-scope="scope">
+            <!--lanbm 2024-05-06 汇率保留小数增加到6位，为了方便显示，加宽此列的显示-->
+            <template slot-scope="scope" style="width: 200px;">
               <el-form-item
                 v-if="scope.row.type !== 'total'"
                 label=""

src/views/ecw/order/success.vue

@@ -88,7 +88,7 @@ export default {
     },
   computed:{
       orderInfoForCopy(){
-        return `订单号：${this.order.orderNo}\n唛头：${this.order.marks}\n提货点：${this.order.logisticsInfoDto?.destTitleZh}\n送货地址：${this.order.logisticsInfoDto?.startAddressZh}`
+        return `订单号：${this.order.orderNo}\n唛头：${this.order.marks}\n提货点：${this.order.logisticsInfoDto?.destTitleZh}\n送货地址：${this.order.logisticsInfoDto?.startAddressZh}\n仓库电话: ${this.order.logisticsInfoDto?.startTell}`
       }
   },
     async created(){

src/views/report/customer_analysis/index.vue

@@ -249,7 +249,7 @@
           size="mini"
           @click="handleExport"
           :loading="exportLoading"
-          v-show="objEcwReportPermission.exportdataq == 1"
+          v-show="false"
         >
           {{ $t("导出") }}</el-button
         >
@@ -264,9 +264,9 @@
           size="mini"
           @click="handleExport2"
           :loading="exportLoading"
-          v-show="false"
+          v-show="objEcwReportPermission.exportdataq == 1"
         >
-          {{ $t("导出测试") }}</el-button
+          {{ $t("导出") }}</el-button
         >
       </el-form-item>
     </el-form>
@@ -327,12 +327,24 @@
       <el-table-column label="泡货占比" align="center" prop="phSumZb" />
       <el-table-column label="控货总V值" align="center" prop="khSumV" />
       <el-table-column label="控货占比" align="center" prop="khSumZb" />
-      <el-table-column label="是否首次成交" align="center" prop="isFirst" />
-      <el-table-column label="首次成交时间" align="center" prop="firstDate">
+      <!--2024-05-06和张工确认这几个参数无取数逻辑，暂时隐藏-->
+      <el-table-column
+        label="是否首次成交"
+        v-show="false"
+        align="center"
+        prop="isFirst"
+      />
+      <el-table-column
+        label="首次成交时间"
+        v-show="false"
+        align="center"
+        prop="firstDate"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.firstDate) }}</span>
         </template>
       </el-table-column>
+      <!--2024-05-06和张工确认这几个参数无取数逻辑，暂时隐藏-->
       <el-table-column label="提货率" align="center" prop="thL" />
       <el-table-column label="客户业绩类型" align="center" prop="cusYjType" />
       <el-table-column label="客户来源" align="center" prop="sourcename" />
@@ -367,7 +379,11 @@ import Treeselect from "@riophae/vue-treeselect";
 //自定义目录数样式
 import "@/assets/styles/vue-treeselect.css";
 import { listSimpleDepts } from "@/api/system/dept";
-import { getListPage, exportExcel } from "@/api/report/customeranalysis";
+import {
+  getListPage,
+  exportExcel,
+  exportExcel2,
+} from "@/api/report/customeranalysis";
 import {
   getCurUserPermission,
   getDeptChild,
@@ -517,50 +533,20 @@ export default {
     getCountryListAll().then((r) => {
       this.countryList = r.data;
     });
-
-    //获取当前用户报表权限
-    getCurUserPermission().then((response) => {
-      //复制对象
-      Object.assign(this.objEcwReportPermission, response.data);
-      //this.objEcwReportPermission = response.data;
-      if (this.objEcwReportPermission.permissionFw == 1) {
-        //只能看自己的，不能选择部门和客户经理
-        this.showCustomsManage = false;
-        this.showDept = false;
-      }
-      //获取页面传参
-      let sSalesmanid = this.$route.query.salesmanid;
-      let sDeptid = this.$route.query.deptid;
-      let s = this.$route.query.sDate;
-      let e = this.$route.query.eDate;
-      let bd = this.$route.query.duibiYear;
-      //客户编号
-      let number = this.$route.query.number;
-      if (sSalesmanid != undefined && sSalesmanid != null) {
-        this.queryParams.salesmanid = parseInt(sSalesmanid);
-      }
-      if (sDeptid != undefined && sDeptid != null) {
-        this.queryParams.deptid = parseInt(sDeptid);
-      }
-      if (s != undefined && s != null) {
-        this.queryParams.sdate = s + "-01";
-      }
-      if (e != undefined && s != null) {
-        let lastDay = getLastDay(e + "-01");
-        this.queryParams.edate = e + "-" + lastDay;
-      }
-      if (bd != undefined && bd != null) {
-        this.queryParams.duibiYear = bd;
-      }
-      if (number != undefined && number != null) {
-        this.queryParams.searchtype = "eq";
-        this.queryParams.name = number;
+    this.doLoadData();
+  },
+  watch: {
+    $route(to) {
+      //lanbm 2024-05-06 解决重新进入参数不刷新的问题
+      if (this.$route.name == "客户分析") {
+        this.doLoadData();
       }
-      this.getTreeselect();
-      this.getList();
-    });
+    },
+  },
+  computed: {
+    //这几个函数的执行顺序
+    //created ------> computed ------> mounted ------> watch
   },
-  computed: {},
   methods: {
     /** 查询列表 */
     getList() {
@@ -582,6 +568,49 @@ export default {
         this.loading = false;
       });
     },
+    doLoadData() {
+      //获取当前用户报表权限
+      getCurUserPermission().then((response) => {
+        //复制对象
+        Object.assign(this.objEcwReportPermission, response.data);
+        //this.objEcwReportPermission = response.data;
+        if (this.objEcwReportPermission.permissionFw == 1) {
+          //只能看自己的，不能选择部门和客户经理
+          this.showCustomsManage = false;
+          this.showDept = false;
+        }
+        //获取页面传参
+        let sSalesmanid = this.$route.query.salesmanid;
+        let sDeptid = this.$route.query.deptid;
+        let s = this.$route.query.sDate;
+        let e = this.$route.query.eDate;
+        let bd = this.$route.query.duibiYear;
+        //客户编号
+        let number = this.$route.query.number;
+        if (sSalesmanid != undefined && sSalesmanid != null) {
+          this.queryParams.salesmanid = parseInt(sSalesmanid);
+        }
+        if (sDeptid != undefined && sDeptid != null) {
+          this.queryParams.deptid = parseInt(sDeptid);
+        }
+        if (s != undefined && s != null) {
+          this.queryParams.sdate = s + "-01";
+        }
+        if (e != undefined && s != null) {
+          let lastDay = getLastDay(e + "-01");
+          this.queryParams.edate = e + "-" + lastDay;
+        }
+        if (bd != undefined && bd != null) {
+          this.queryParams.duibiYear = bd;
+        }
+        if (number != undefined && number != null) {
+          this.queryParams.searchtype = "eq";
+          this.queryParams.name = number;
+        }
+        this.getTreeselect();
+        this.getList();
+      });
+    },
     isChinese() {
       //基础函数，判断系统显示语言是中文还是英文
       return this.$i18n.locale === "zh_CN";
@@ -688,7 +717,7 @@ export default {
         .confirm("是否确认导出所有数据项?")
         .then(() => {
           this.exportLoading = true;
-          return exportExcel(this.queryParams);
+          return exportExcel2(this.queryParams);
         })
         .then((response) => {
           //放入后台队列需要注释此行代码

src/views/report/vz/index.vue

@@ -59,6 +59,17 @@
           {{ $t("导出") }}</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus" v-show="false"
+          size="mini"
+          @click="TestFun"
+        >
+          {{ $t("测试功能") }}</el-button
+        >
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -149,6 +160,7 @@ import {
   getModel,
   getPageList,
   exportExcel,
+  test,
 } from "@/api/report/vz";
 import Treeselect from "@riophae/vue-treeselect";
 import "@/assets/styles/vue-treeselect.css";
@@ -305,7 +317,7 @@ export default {
         if (!valid) {
           return;
         }
-        
+
         // 修改的提交
         if (this.form.id != null) {
           update(this.form).then((response) => {
@@ -337,6 +349,11 @@ export default {
         })
         .catch(() => {});
     },
+    TestFun() {
+      test().then((response) => {
+        this.$modal.msgSuccess("测试发送");
+      });
+    },
     /** 导出按钮操作 */
     handleExport() {
       // 处理查询参数