Skip to content

S
SuperMan
Commit ec184c07 authored by youjie's avatar youjie
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 3b9ddeff 8df35d94
Show whitespace changes
Inline Side-by-side
Showing with 341 additions and 273 deletions
src/components/rank/entryForm.vue
View file @ ec184c07
......@@ -71,45 +71,53 @@
<li>
<span>
<em>公司</em>
<el-select filterable v-model="msg.EnterId" class="w200" clearable>
<el-option :value="0" label="不限"></el-option>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"
<el-select
filterable
v-model="queryMsg.RB_Branch_Id"
@change="getDepartment"
>
</el-option>
<el-option
:value="-1"
:label="$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for="item in CompanyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>部门</em>
<el-select filterable v-model="msg.EnterId" class="w200" clearable>
<el-option :value="0" label="不限"></el-option>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"
<el-select
filterable
v-model="queryMsg.RB_Department_Id"
@change="getEmployee"
>
</el-option>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option
v-for="item in DepartmentList"
:label="item.DepartmentName"
:value="item.DepartmentID"
:key="item.DepartmentID"
></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>人员</em>
<el-select filterable v-model="msg.EnterId" class="w200" clearable>
<el-option :value="0" label="不限"></el-option>
<el-select filterable v-model="queryMsg.EnterID" class>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"
>
</el-option>
></el-option>
</el-select>
</span>
</li>
......@@ -117,32 +125,27 @@
<span>
<em>出团日期</em>
<el-date-picker
style="height: 34px"
value-format="yyyy-MM-dd"
v-model="DatelistBM"
v-model="queryMsg.tStartDates"
type="daterange"
:range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')"
@change="getDatesBM"
>
</el-date-picker>
range-separator="-"
:start-placeholder="$t('hotel.hotel_StartDate')"
:end-placeholder="$t('hotel.hotel_EndDate')"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
></el-date-picker>
</span>
</li>
<li>
<span>
<em>报名日期</em>
<el-date-picker
style="height: 34px"
value-format="yyyy-MM-dd"
v-model="DatelistBM"
v-model="queryMsg.qStartDates"
type="daterange"
:range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')"
@change="getDatesBM"
>
</el-date-picker>
range-separator="-"
:start-placeholder="$t('hotel.hotel_StartDate')"
:end-placeholder="$t('hotel.hotel_EndDate')"
value-format="yyyy-MM-dd"
></el-date-picker>
</span>
</li>
<li>
......@@ -159,61 +162,36 @@
<div class="groupTourOrder_count">
<el-row :gutter="20">
<template v-for="(item, index) in SummaryList">
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="8">
<el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
<div class="groupTourOrder_count_item HT_total">
<div>
<span>{{ item.CurrencyName }}</span>
</div>
<p>
<!-- groupTourOrder_count_green -->
<span
>应收：
{{ item.Money.toFixed(2) }}
>收款金额：
{{ (item.Income|| 0).toFixed(2) }}
</span>
<span
>实收：
{{ item.Income.toFixed(2) }}
>团应收金额：
{{ (item.PreferPrice|| 0).toFixed(2) }}
</span>
<span
>退款：
{{ item.Refund.toFixed(2) }}
</span>
<span
<!-- <span
>手续费：
{{ item.PlatformTax.toFixed(2) }}
</span>
<span
>应收小费：
{{ item.PreferTipAmount.toFixed(2) }}
</span>
</span> -->
<span
>实收小费：
{{ item.IncomeTipAmount.toFixed(2) }}
>应收金额：
{{ (item.SumPreferPrice|| 0).toFixed(2) }}
</span>
<span
>成本：
{{ item.CostMoney.toFixed(2) }}
</span>
<span
>待收：
<span :style="{ color: item.DueInMoney > 0 ? 'red' : '' }">{{
item.DueInMoney.toFixed(2)
}}</span>
</span>
<span
>预期利润：
<span :style="{ color: item.OrderProfit > 0 ? 'red' : '' }">{{
item.OrderProfit.toFixed(2)
}}</span>
</span>
<span
>预期销售额：
{{ item.OrderSalesMoney.toFixed(2) }}
</span>
<span
>报名数：
<span style="color: #3a7cf7">{{ item.GuestNum }}人</span>
>单项收客数：
{{ item.TotalGuestNum }}
</span>
<!-- <span
>单项收客数：
{{ item.ZaiTuMoney }}
</span> -->
</p>
</div>
</el-col>
......@@ -252,6 +230,13 @@ export default {
components: { OrderList },
data() {
return {
pickerOptions: {
disabledDate(time) {
return time < new Date("2018-12-31");
},
},
CompanyList: [],
DepartmentList: [],
showWarningSearch: false,
TotalMsg: null,
MultipleChoiceList: [
......@@ -286,6 +271,35 @@ export default {
OrderList: [],
//默认高度
tableHeight: 0,
queryMsg: {
RB_Branch_Id: -1,
RB_Department_Id: 0,
EnterID: 0,
tStartDates: [],
qStartDates: [],
QueryType: 0,
},
getCompanyMsg: {
// 公司
RB_Group_Id: "0",
Status: "0",
},
getDepartmentMsg: {
// 部门
RB_Group_Id: "",
RB_Branch_Id: "",
Status: 0,
ParentId: -1,
Tier: 0,
},
employeeMsg: {
// 员工
GroupId: "",
BranchId: -1,
DepartmentId: 0,
PostId: 0,
IsLeave: 0,
},
msg: {
pageIndex: 1,
pageSize: 15,
......@@ -335,23 +349,6 @@ export default {
PostId: 0,
IsLeave: 0,
},
OrderStatusList: [
{ Name: "不限", Id: "0" },
{ Name: "正常", Id: "1" },
{ Name: "取消", Id: "2" },
],
QIsCollectList: [
{ Name: "不限", Id: "0" },
{ Name: "已收齐", Id: "1" },
{ Name: "未收齐", Id: "2" },
],
ticketingStatusList: [],
VisaList: [
{ Name: "不限", Id: "0" },
{ Name: "未出签", Id: "1" },
{ Name: "已出签", Id: "2" },
],
LineList: [],
SummaryList: [],
};
},
......@@ -369,56 +366,49 @@ export default {
},
},
methods: {
GetOrderTypeEnumList() {
this.apipost("CarSingle_post_GetOrderTypeEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.OrderTypeList = res.data.data;
let data = {
Name: "不限",
Id: "0",
};
this.OrderTypeList.unshift(data);
} else {
this.$message.error(res.data.message);
}
});
},
getLineList() {
getCompanyList() {
//获取公司列表
this.apipost(
"line_post_GetAllList",
{
LineDirection: 0,
},
"admin_get_BranchGetList",
this.getCompanyMsg,
(res) => {
console.log("getCompanyList", res);
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
this.CompanyList = res.data.data;
} else {
this.$message.error(res.data.message);
}
}
},
(err) => {}
);
},
// 获取出票状态枚举
GetTicketStatusEnumList() {
this.crmapipost("/api/Order/GetTicketStatusEnumList", {}, (res) => {
getDepartment(bool) {
//部门
if (bool) {
this.queryMsg.RB_Department_Id = 0;
this.queryMsg.EnterID = 0;
this.DepartmentList = [];
this.EmployeeList = [];
}
this.getDepartmentMsg.RB_Branch_Id = this.queryMsg.RB_Branch_Id;
if (this.queryMsg.RB_Branch_Id != -1) {
this.apipost(
"admin_get_DepartmentGetList",
this.getDepartmentMsg,
(res) => {
if (res.data.resultCode == 1) {
this.ticketingStatusList = res.data.data;
} else {
this.$message.error(res.data.message);
this.DepartmentList = res.data.data;
}
});
},
// 获取订单状态枚举
GetOrderStatusEnumList() {
this.crmapipost("/api/Order/GetOrderStatusEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.OrderStatusList = res.data.data;
} else {
this.$message.error(res.data.message);
(err) => {}
);
}
});
},
getEmployee() {
getEmployee(bool) {
if (bool) {
this.queryMsg.EnterID = 0;
this.EmployeeList = [];
}
this.employeeMsg.DepartmentId = this.queryMsg.RB_Department_Id;
//员工
this.apipost(
"admin_get_EmployeeGetList",
......@@ -431,6 +421,20 @@ export default {
(err) => {}
);
},
GetOrderTypeEnumList() {
this.apipost("CarSingle_post_GetOrderTypeEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.OrderTypeList = res.data.data;
let data = {
Name: "不限",
Id: "0",
};
this.OrderTypeList.unshift(data);
} else {
this.$message.error(res.data.message);
}
});
},
getDatesBM() {
if (this.DatelistBM) {
this.msg.StartTime = this.DatelistBM[0];
......@@ -492,19 +496,49 @@ export default {
let nowDate = myYear + "-" + myMonth + "-" + myToday;
return nowDate;
},
getParams() {
let param = {
pageIndex: this.msg.pageIndex,
pageSize: 15,
RB_Branch_Id:
this.queryMsg.RB_Branch_Id == -1 ? null : this.queryMsg.RB_Branch_Id,
RB_Department_Id:
this.queryMsg.RB_Department_Id == 0
? null
: this.queryMsg.RB_Department_Id,
EnterID: this.queryMsg.EnterID == 0 ? null : this.queryMsg.EnterID,
QStartDate:
this.queryMsg.tStartDates && this.queryMsg.tStartDates.length == 2
? this.queryMsg.tStartDates[0]
: null,
QEndDate:
this.queryMsg.tStartDates && this.queryMsg.tStartDates.length == 2
? this.queryMsg.tStartDates[1]
: null,
CStartDate:
this.queryMsg.qStartDates && this.queryMsg.qStartDates.length == 2
? this.queryMsg.qStartDates[0]
: null,
CEndDate:
this.queryMsg.qStartDates && this.queryMsg.qStartDates.length == 2
? this.queryMsg.qStartDates[1]
: null,
GroupBy: this.queryMsg.GroupBy,
QueryType: this.queryMsg.QueryType,
};
if (!param.QStartDate) {
param.QStartDate = "2023-01-01";
}
return param;
},
//获取酒店订单列表
GetList() {
this.loading = true;
let url = "CarSingle_post_GetGuestOrderStatisticsPageList";
// 销售 OP
if (this.pagesTitle == "销售") {
this.msg.IsMyOrder = "1";
} else {
this.msg.IsMyOrder = "0";
}
let url = "sellorder_get_GetSalesVolumeRankDetail";
let param = this.getParams();
this.apipost(
url,
this.msg,
param,
(res) => {
if (res.data.resultCode == 1) {
this.getSummaryData();
......@@ -523,13 +557,14 @@ export default {
);
},
getSummaryData() {
let param = this.getParams();
this.apipost(
"CarSingle_post_GetGuestOrderStatistics",
this.msg,
"sellorder_get_GetSalesVolumeRankDetailStatistics",
param,
(res) => {
if (res.data.resultCode == 1) {
let data = res.data.data;
this.SummaryList = data;
this.SummaryList = [data];
} else {
this.$message.error(res.data.message);
}
......@@ -560,17 +595,28 @@ export default {
// this.msg.EnterID = userInfo.EmployeeId;
},
mounted() {
this.Title = this.pagesTitle;
if (this.Title != "销售") {
this.getEmployee();
this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
this.getDepartmentMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
this.employeeMsg.employeeMsg = this.getLocalStorage().RB_Group_id;
const { BranchId = 0, EnterID = 0, RB_Department_Id = 0 } = this.$route.query;
console.log("this.$route.query.", this.$route);
this.queryMsg.RB_Branch_Id = Number(BranchId);
this.queryMsg.EnterID = Number(EnterID);
this.queryMsg.RB_Department_Id = Number(RB_Department_Id);
this.getCompanyList();
if (this.queryMsg.RB_Department_Id) {
this.getDepartment(false);
}
if (this.queryMsg.EnterID) {
this.getEmployee(false);
}
this.Title = this.pagesTitle;
this.msg.StartTime = this.getBeforeDate(0, new Date());
this.msg.EndTime = this.getBeforeDate(0, new Date());
this.DatelistBM = [new Date(this.msg.StartTime), new Date()];
// this.GetOrderStatusEnumList()//订单状态
// this.GetTicketStatusEnumList()//出票状态
this.GetOrderTypeEnumList();
this.getLineList();
this.Datelist = this.getyMDOne();
this.userInfo = this.getLocalStorage();
this.GetList();
......
src/components/rank/salesVolumeRank.vue
View file @ ec184c07
......@@ -3,16 +3,28 @@
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane :label="$t('sm.Personalrank')" name="first"></el-tab-pane>
<el-tab-pane :label="$t('sm.derprank')" name="second"></el-tab-pane>
<el-tab-pane :label="$t('sm.companyrank')" name="third" v-if="authority.indexOf('Sales_Volume_Rank_Show')!=-1"></el-tab-pane>
<el-tab-pane
:label="$t('sm.companyrank')"
name="third"
v-if="authority.indexOf('Sales_Volume_Rank_Show') != -1"
></el-tab-pane>
<el-tab-pane :label="$t('sm.salerank')" name="four"></el-tab-pane>
</el-tabs>
<div class="query-box">
<el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 0px 0 0;">
<el-col :span="4" v-show="activeName!='four'">
<el-row style="padding: 15px 0px 0 0">
<el-col :span="4" v-show="activeName != 'four'">
<el-form-item :label="$t('system.table_company')">
<el-select filterable v-model="msg.RB_Branch_Id" @change="getDepartment" class>
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-select
filterable
v-model="msg.RB_Branch_Id"
@change="getDepartment"
class
>
<el-option
:value="-1"
:label="$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for="item in CompanyList"
:label="item.BName"
......@@ -22,10 +34,21 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-show="activeName!='third'&&activeName!='four'">
<el-col
:span="4"
v-show="activeName != 'third' && activeName != 'four'"
>
<el-form-item :label="$t('admin.admin_Department')">
<el-select filterable v-model="msg.RB_Department_Id" @change="getEmployee" class>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-select
filterable
v-model="msg.RB_Department_Id"
@change="getEmployee"
class
>
<el-option
:value="0"
:label="$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for="item in DepartmentList"
:label="item.DepartmentName"
......@@ -35,10 +58,13 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-show="activeName=='first'">
<el-col :span="4" v-show="activeName == 'first'">
<el-form-item :label="$t('salesModule.Personnel')">
<el-select filterable v-model="msg.EnterID" class>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option
:value="0"
:label="$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
......@@ -77,7 +103,9 @@
</el-form>
<ul class="clearfix">
<li class="hight_query">
<button class="hollowFixedBtn" @click="initData">{{$t('pub.searchBtn')}}</button>
<button class="hollowFixedBtn" @click="initData">
{{ $t("pub.searchBtn") }}
</button>
</li>
</ul>
</div>
......@@ -85,7 +113,7 @@
v-if="isReady"
is-horizontal-resize
column-width-drag
style="width:100%"
style="width: 100%"
:columns="columns"
:table-data="tableData"
:filter-method="filterMethod"
......@@ -101,67 +129,61 @@
</div>
</template>
<script>
import Vue from 'vue'
// 自定义列组件
Vue.component('table-operation',{
template:`<span>
<a href="" @click.stop.prevent="update(rowData,index)">编辑</a>&nbsp;
<a href="" @click.stop.prevent="deleteRow(rowData,index)">删除</a>
<span>{{content}}</span>
import Vue from "vue";
// 自定义列组件
Vue.component("table-operation", {
template: `<span>
<a href="" @click.stop.prevent="update(rowData,index)">
<span>{{content}}</span></a>
`,
props:{
rowData:{
type:Object
props: {
rowData: {
type: Object,
},
field:{
type:String
field: {
type: String,
},
index: {
type: Number,
},
index:{
type:Number
}
},
data() {
return {
content: ''
}
content: "",
};
},
mounted() {
console.log('field', this.field)
this.content = this.rowData["SumPreferPrice"].toFixed(2)
if(this.field === 'income') {
this.content = this.rowData["SumPreferPrice"]
} else if(this.field === 'income') {
this.content = this.rowData["income"]
console.log("field", this.field);
this.content = this.rowData["SumPreferPrice"].toFixed(2);
if (this.field === "income") {
this.content = this.rowData["SumPreferPrice"];
} else if (this.field === "income") {
this.content = this.rowData["income"];
} else {
this.content = this.rowData.notInCome.toFixed(
2
)
this.content = this.rowData.notInCome.toFixed(2);
}
},
methods:{
update(){
// 参数根据业务场景随意构造
let params = {type:'edit',index:this.index,rowData:this.rowData};
this.$emit('on-custom-comp',params);
methods: {
update(rowData, index) {
console.log("rowData", rowData);
this.$router.push({
path: "/salesVolumeRankEntryForm",
query: {
BranchId: rowData.BranchId,
EnterID: rowData.EnterID,
RB_Department_Id: rowData.RB_Department_Id,
},
deleteRow(){
// 参数根据业务场景随意构造
let params = {type:'delete',index:this.index};
this.$emit('on-custom-comp',params);
}
}
})
});
},
},
});
export default {
data() {
return {
pickerOptions: {
disabledDate(time) {
return time<new Date('2018-12-31');
}
return time < new Date("2018-12-31");
},
},
activeName: "first",
columns: [],
......@@ -180,12 +202,12 @@ export default {
tStartDates: [],
qStartDates: [],
GroupBy: "EnterID",
QueryType:0
QueryType: 0,
},
getCompanyMsg: {
// 公司
RB_Group_Id: "0",
Status: "0"
Status: "0",
},
getDepartmentMsg: {
// 部门
......@@ -193,7 +215,7 @@ export default {
RB_Branch_Id: "",
Status: 0,
ParentId: -1,
Tier: 0
Tier: 0,
},
employeeMsg: {
// 员工
......@@ -201,11 +223,11 @@ export default {
BranchId: -1,
DepartmentId: 0,
PostId: 0,
IsLeave: 0
IsLeave: 0,
},
CompanyList: [],
DepartmentList: [],
EmployeeList: []
EmployeeList: [],
};
},
created() {},
......@@ -224,37 +246,37 @@ export default {
this.isReady = false;
let that = this;
let no = {
title: this.$t('active.ad_xuhao'),
title: this.$t("active.ad_xuhao"),
width: 50,
titleAlign: "center",
columnAlign: "center",
formatter: function(rowData, rowIndex, pagingIndex, field) {
formatter: function (rowData, rowIndex, pagingIndex, field) {
return rowIndex + 1;
},
isResize: false
isResize: false,
};
let account = {
field: "name",
title: this.$t('system.query_airName'),
title: this.$t("system.query_airName"),
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: ""
result: "",
// filterMultiple: false,
// filters: [{}],
// type: "text"
};
let sumMoney = {
field: "SumPreferPrice",
title: this.$t('sm.salemoney'),
title: this.$t("sm.salemoney"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "desc",
// componentName:'table-operation',
formatter: function(rowData, rowIndex, pagingIndex, field) {
componentName: "table-operation",
formatter: function (rowData, rowIndex, pagingIndex, field) {
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i < rowData["income"].length; i++) {
......@@ -264,18 +286,18 @@ export default {
// } else {
return `${rowData["SumPreferPrice"].toFixed(2)}`;
//}
}
},
};
let moneyCount = {
field: "income",
title: this.$t('fnc.skjine'),
title: this.$t("fnc.skjine"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy:"",
// componentName:'table-operation',
formatter: function(rowData, rowIndex, pagingIndex, field) {
orderBy: "",
componentName: "table-operation",
formatter: function (rowData, rowIndex, pagingIndex, field) {
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i < rowData["income"].length; i++) {
......@@ -285,18 +307,18 @@ export default {
// } else {
return `${rowData["income"]}`;
//}
}
},
};
let notIncome = {
field: "notInCome",
title: this.$t('fnc.wsjine'),
title: this.$t("fnc.wsjine"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
// componentName:'table-operation',
formatter: function(rowData, rowIndex, pagingIndex, field) {
componentName: "table-operation",
formatter: function (rowData, rowIndex, pagingIndex, field) {
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i < rowData["income"].length; i++) {
......@@ -308,52 +330,52 @@ export default {
2
)}</span>`;
//}
}
},
};
let pCount = {
field: "peopleCount",
title: this.$t('sm.sks'),
title: this.$t("sm.sks"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: ""
orderBy: "",
};
let cCount = {
field: "CalcheCount",
title: this.$t('sm.exitsks'),
title: this.$t("sm.exitsks"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: ""
orderBy: "",
};
let avgPCount = {
field: "avgPeopleCount",
title: this.$t('sm.personsks'),
title: this.$t("sm.personsks"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: ""
orderBy: "",
};
let customerNum = {
field: "totalGuestNum",
title: '单项收客数',
title: "单项收客数",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80
width: 80,
};
let unitPrice = {
field: "avgPrice",
title: this.$t('sm.keprice'),
title: this.$t("sm.keprice"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
formatter: function (rowData, rowIndex, pagingIndex, field) {
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i < rowData["avgPrice"].length; i++) {
......@@ -363,15 +385,15 @@ export default {
// } else {
return rowData["avgPrice"].toFixed(2);
// }
}
},
};
let proportion = {
field: "zanBi",
title: this.$t('sm.xiaoshouzb'),
title: this.$t("sm.xiaoshouzb"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80
width: 80,
};
this.columns = [];
......@@ -382,8 +404,8 @@ export default {
this.columns.push(notIncome);
this.columns.push(pCount);
this.columns.push(cCount);
if (this.activeName != "first" && this.activeName!='four') {
unitPrice.title = this.$t('sm.renxiaoshou');
if (this.activeName != "first" && this.activeName != "four") {
unitPrice.title = this.$t("sm.renxiaoshou");
this.columns.push(avgPCount);
}
this.columns.push(customerNum);
......@@ -416,13 +438,13 @@ export default {
? this.msg.qStartDates[1]
: null,
GroupBy: this.msg.GroupBy,
QueryType: this.msg.QueryType
QueryType: this.msg.QueryType,
};
if (!param.QStartDate) {
param.QStartDate = "2019-01-01";
}
this.apipost("sellorder_get_sellvolumerankNew", param, r => {
r.data.data.forEach(x => {
this.apipost("sellorder_get_sellvolumerankNew", param, (r) => {
r.data.data.forEach((x) => {
x.incomeVal = parseFloat(x.income);
x.avgPrice = parseFloat(x.avgPrice);
});
......@@ -435,20 +457,20 @@ export default {
this.apipost(
"admin_get_BranchGetList",
this.getCompanyMsg,
res => {
(res) => {
if (res.data.resultCode == 1) {
this.CompanyList = res.data.data;
} else {
}
},
err => {}
(err) => {}
);
},
initAuthor() {
let msg = {
MenuUrl: "/salesVolumeRank"
MenuUrl: "/salesVolumeRank",
};
this.apipost("admin_get_GetActionCodeForUrlAndUser", msg, r => {
this.apipost("admin_get_GetActionCodeForUrlAndUser", msg, (r) => {
this.authority = r.data.data;
});
},
......@@ -463,12 +485,12 @@ export default {
this.apipost(
"admin_get_DepartmentGetList",
this.getDepartmentMsg,
res => {
(res) => {
if (res.data.resultCode == 1) {
this.DepartmentList = res.data.data;
}
},
err => {}
(err) => {}
);
}
},
......@@ -480,28 +502,28 @@ export default {
this.apipost(
"admin_get_EmployeeGetList",
this.employeeMsg,
res => {
(res) => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
},
err => {}
(err) => {}
);
},
handleClick(tab, event) {
this.msg.EnterID = 0;
this.msg.QueryType=0;
this.msg.QueryType = 0;
if (this.activeName == "first") this.msg.GroupBy = "EnterID";
else if (this.activeName == "second")
this.msg.GroupBy = "RB_Department_Id";
else if (this.activeName == "third"){
else if (this.activeName == "third") {
this.msg.GroupBy = "RB_Branch_Id";
this.msg.RB_Department_Id = 0;
} else {
this.msg.RB_Department_Id = 0;
this.msg.RB_Branch_Id = -1;
this.msg.GroupBy = "EnterID";
this.msg.QueryType=4;
this.msg.QueryType = 4;
}
this.initColumns();
this.initData();
......@@ -551,8 +573,8 @@ export default {
}
}
},
filterMethod(filters) {}
}
filterMethod(filters) {},
},
};
</script>
<style>
......
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