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

src/views/report/customer_analysis/index.vue

@@ -271,12 +271,7 @@
       <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"
-        width="200px"
-      >
+      <el-table-column label="首次成交时间" align="center" prop="firstDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.firstDate) }}</span>
         </template>
@@ -287,7 +282,7 @@
       <el-table-column label="客户角色" align="center" prop="customerrole" />
       <el-table-column label="客户国家" align="center" prop="country" />
       <el-table-column
-        label="客户户创建时间"
+        label="客户创建时间"
         align="center"
         prop="createtime"
         width="200px"
@@ -504,6 +499,8 @@ export default {
       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);
       }
@@ -520,6 +517,10 @@ export default {
       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();
     });

src/views/report/customerreport/index.vue

@@ -151,7 +151,7 @@ export default {
     },
     height: {
       type: String,
-      default: "1500px",
+      default: "500px",
     },
     autoResize: {
       type: Boolean,
@@ -179,12 +179,14 @@ export default {
         duibiYear: getLastYear(), //对比年份
         deptid: undefined, //部门
         salesmanid: undefined, //客户经理
+        number: undefined, //客户编号
         pageNo: 1,
         pageSize: 30,
       },
       //报表权限信息
       objEcwReportPermission: {},
       DeptEx: { id: undefined, name: undefined, parentId: undefined },
+      resultList: [],
     };
   },
   watch: {},
@@ -228,9 +230,13 @@ export default {
     initChart() {
       var chartDom = this.$refs["mainBar"];
       this.chart = echarts.init(chartDom, "macarons");
-      this.chart.on("click", () => {
+      this.chart.on("click", (params) => {
         if (this.isRight() == false) return;
         let p = {};
+        this.queryParams.salesmanid = parseInt(
+          this.resultList[params.dataIndex].salesmanid
+        );
+        this.queryParams.number = this.resultList[params.dataIndex].number;
         Object.assign(p, this.queryParams);
         this.$router.push({
           path: "/report/customer_analysis",
@@ -244,7 +250,8 @@ export default {
       getReportResult(this.queryParams).then((response) => {
         //全部列表数据
         this.total = response.data.total;
-        let resultList = response.data.resultList;
+        this.resultList = response.data.resultList;
+        let resultList2 = response.data.resultList;
         this.loading = false;
         this.chart.setOption({
           title: {
@@ -263,10 +270,12 @@ export default {
                 //var s=JSON.stringify(item);
                 //alert(s);
                 //在数据中查询
-                let vR = resultList.filter((r) => r.name === item.name);
+                let sN = item.name;
+                var arr = sN.split("_");
+                let vR = resultList2.filter((r) => r.number === arr[1]);
                 result += "客户：" + item.name + "<br/>";
                 result += "客户编号：" + vR[0].number + "<br/>";
-                result += "客户经理部门：" + vR[0].deptname + "<br/>";
+                result += "客户经理：" + vR[0].salesman + "<br/>";
                 result += "总V值：" + item.value + "<br/>";
                 result += "海运V值：" + vR[0].sumvolume1 + "<br/>";
                 result += "空运V值：" + vR[0].sumweight3 + "<br/>";

src/views/report/vz/index.vue

@@ -23,11 +23,7 @@
         />
       </el-form-item>
       <el-form-item v-show="false">
-        <Treeselect
-          v-model="id"
-          :options="listTree"
-        >
-        </Treeselect>
+        <Treeselect v-model="id" :options="listTree"> </Treeselect>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery"
@@ -156,6 +152,7 @@ import {
 } from "@/api/report/vz";
 import Treeselect from "@riophae/vue-treeselect";
 import "@/assets/styles/vue-treeselect.css";
+import { MessageBox } from "element-ui";
 
 //2024-04-27
 export default {
@@ -189,7 +186,15 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        vz: [
+          {
+            required: true,
+            message: this.$t("V值不能为空"),
+            trigger: "blur",
+          },
+        ],
+      },
       id: 1,
       listTree: [
         {
@@ -300,6 +305,7 @@ export default {
         if (!valid) {
           return;
         }
+        
         // 修改的提交
         if (this.form.id != null) {
           update(this.form).then((response) => {