Commit d526af81 authored by lanbaoming's avatar lanbaoming

2024-04-29 测试问题修复

parent af9f3485
...@@ -151,7 +151,7 @@ export default { ...@@ -151,7 +151,7 @@ export default {
}, },
height: { height: {
type: String, type: String,
default: "1500px", default: "500px",
}, },
autoResize: { autoResize: {
type: Boolean, type: Boolean,
...@@ -185,6 +185,7 @@ export default { ...@@ -185,6 +185,7 @@ export default {
//报表权限信息 //报表权限信息
objEcwReportPermission: {}, objEcwReportPermission: {},
DeptEx: { id: undefined, name: undefined, parentId: undefined }, DeptEx: { id: undefined, name: undefined, parentId: undefined },
resultList: [],
}; };
}, },
watch: {}, watch: {},
...@@ -228,9 +229,12 @@ export default { ...@@ -228,9 +229,12 @@ export default {
initChart() { initChart() {
var chartDom = this.$refs["mainBar"]; var chartDom = this.$refs["mainBar"];
this.chart = echarts.init(chartDom, "macarons"); this.chart = echarts.init(chartDom, "macarons");
this.chart.on("click", () => { this.chart.on("click", (params) => {
if (this.isRight() == false) return; if (this.isRight() == false) return;
let p = {}; let p = {};
this.queryParams.salesmanid = parseInt(
this.resultList[params.dataIndex].salesmanid
);
Object.assign(p, this.queryParams); Object.assign(p, this.queryParams);
this.$router.push({ this.$router.push({
path: "/report/customer_analysis", path: "/report/customer_analysis",
...@@ -244,7 +248,8 @@ export default { ...@@ -244,7 +248,8 @@ export default {
getReportResult(this.queryParams).then((response) => { getReportResult(this.queryParams).then((response) => {
//全部列表数据 //全部列表数据
this.total = response.data.total; this.total = response.data.total;
let resultList = response.data.resultList; this.resultList = response.data.resultList;
let resultList2 = response.data.resultList;
this.loading = false; this.loading = false;
this.chart.setOption({ this.chart.setOption({
title: { title: {
...@@ -263,10 +268,12 @@ export default { ...@@ -263,10 +268,12 @@ export default {
//var s=JSON.stringify(item); //var s=JSON.stringify(item);
//alert(s); //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.name === arr[1]);
result += "客户:" + item.name + "<br/>"; result += "客户:" + item.name + "<br/>";
result += "客户编号:" + vR[0].number + "<br/>"; result += "客户编号:" + vR[0].number + "<br/>";
result += "客户经理部门:" + vR[0].deptname + "<br/>"; result += "客户经理" + vR[0].salesman + "<br/>";
result += "总V值:" + item.value + "<br/>"; result += "总V值:" + item.value + "<br/>";
result += "海运V值:" + vR[0].sumvolume1 + "<br/>"; result += "海运V值:" + vR[0].sumvolume1 + "<br/>";
result += "空运V值:" + vR[0].sumweight3 + "<br/>"; result += "空运V值:" + vR[0].sumweight3 + "<br/>";
......
This diff is collapsed.
...@@ -129,7 +129,7 @@ import SalesPanelGroup from "../../dashboard/SalesPanelGroup"; ...@@ -129,7 +129,7 @@ import SalesPanelGroup from "../../dashboard/SalesPanelGroup";
//2024-04-27 //2024-04-27
export default { export default {
name: "salesreport", name: "ReportSalesreportIndex",
components: { components: {
SalesPanelGroup, SalesPanelGroup,
UserSelector, UserSelector,
......
...@@ -23,11 +23,7 @@ ...@@ -23,11 +23,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item v-show="false"> <el-form-item v-show="false">
<Treeselect <Treeselect v-model="id" :options="listTree"> </Treeselect>
v-model="id"
:options="listTree"
>
</Treeselect>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery" <el-button type="primary" icon="el-icon-search" @click="handleQuery"
...@@ -156,6 +152,7 @@ import { ...@@ -156,6 +152,7 @@ import {
} from "@/api/report/vz"; } from "@/api/report/vz";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@/assets/styles/vue-treeselect.css"; import "@/assets/styles/vue-treeselect.css";
import { MessageBox } from "element-ui";
//2024-04-27 //2024-04-27
export default { export default {
...@@ -189,7 +186,15 @@ export default { ...@@ -189,7 +186,15 @@ export default {
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: {}, rules: {
vz: [
{
required: true,
message: this.$t("V值不能为空"),
trigger: "blur",
},
],
},
id: 1, id: 1,
listTree: [ listTree: [
{ {
...@@ -300,6 +305,7 @@ export default { ...@@ -300,6 +305,7 @@ export default {
if (!valid) { if (!valid) {
return; return;
} }
// 修改的提交 // 修改的提交
if (this.form.id != null) { if (this.form.id != null) {
update(this.form).then((response) => { update(this.form).then((response) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment