Skip to content

S
SuperMan
Commit 03fc63e8 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 3f725e1c 48e15149
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 454 additions and 493 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 03fc63e8
......@@ -2186,7 +2186,7 @@
this.Confirm(tipMsg, function () {
if (res.data.data && res.data.data > 0) {
let query = {
offerid: res.data.data,
BatchNum: res.data.data,
blank: "y",
tab: "报价单",
};
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 03fc63e8
......@@ -1579,7 +1579,7 @@
this.Confirm(tipMsg, function () {
if (res.data.data && res.data.data > 0) {
let query = {
offerid: res.data.data,
BatchNum: res.data.data,
blank: 'y',
tab: '报价单'
}
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 03fc63e8
......@@ -1310,7 +1310,7 @@
this.Confirm(tipMsg, function () {
if (res.data.data && res.data.data > 0) {
let query = {
offerid: res.data.data,
BatchNum: res.data.data,
blank: 'y',
tab: '报价单'
}
......
src/components/rank/dataCount.vue
View file @ 03fc63e8
......@@ -895,79 +895,82 @@ export default {
goUrl(type) {
let Time = [this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")),this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))]
let query
if(type<5){
if(type==1){
query = {
blank: "y",
}
}else if(type==2){
query = {
EnterTime: Time,
blank: "y",
}
}else if(type==3){
query = {
activation: 1,
blank: "y",
}
}else if(type==4){
query = {
activationTime: Time,
activation: 1,
blank: "y",
}
}
this.$router.push({
name: 'customerTransfer',
query
});
}
if(type>4&&type<9){
if(type==5){
query = {
CStartDate: this.parameters.dateRange[0],
CEndDate: this.parameters.dateRange[1],
BranchId: this.parameters.branchId,
RB_Department_Id:this.parameters.RB_Department_Id,
EmployeeId:this.parameters.empId,
isNormal: 1,
blank: "y",
}
}else if(type==6){
query = {
CStartDate: this.parameters.dateRange[0],
CEndDate: this.parameters.dateRange[1],
RB_Department_Id:this.parameters.RB_Department_Id,
EmployeeId:this.parameters.empId,
isNormal: 1,
blank: "y",
}
}else if(type==7){
query = {
CStartDate: this.parameters.dateRange[0],
CEndDate: this.parameters.dateRange[1],
RB_Department_Id:this.parameters.RB_Department_Id,
EmployeeId:this.parameters.empId,
isNormal: 1,
blank: "y",
}
}else if(type==8){
query = {
CStartDate: this.parameters.dateRange[0],
CEndDate: this.parameters.dateRange[1],
RB_Department_Id:this.parameters.RB_Department_Id,
EmployeeId:this.parameters.empId,
discount: 1,
isNormal: 1,
blank: "y",
}
}
this.$router.push({
name: 'enrollTotal',
query
});
}
// if(type<5){
// if(type==1){
// query = {
// blank: "y",
// }
// }else if(type==2){
// query = {
// EnterTime: Time,
// blank: "y",
// }
// }else if(type==3){
// query = {
// activation: 1,
// blank: "y",
// }
// }else if(type==4){
// query = {
// activationTime: Time,
// activation: 1,
// blank: "y",
// }
// }
// this.OpenNewPage('/customerTransfer',query)
// }
// if(type>4&&type<9){
// if(type==5){
// query = {
// CStartDate: this.parameters.dateRange[0],
// CEndDate: this.parameters.dateRange[1],
// BranchId: this.parameters.branchId,
// RB_Department_Id:this.parameters.RB_Department_Id,
// EmployeeId:this.parameters.empId,
// isNormal: 1,
// blank: "y",
// }
// }else if(type==6){
// query = {
// CStartDate: this.parameters.dateRange[0],
// CEndDate: this.parameters.dateRange[1],
// RB_Department_Id:this.parameters.RB_Department_Id,
// EmployeeId:this.parameters.empId,
// isNormal: 1,
// blank: "y",
// }
// }else if(type==7){
// query = {
// CStartDate: this.parameters.dateRange[0],
// CEndDate: this.parameters.dateRange[1],
// RB_Department_Id:this.parameters.RB_Department_Id,
// EmployeeId:this.parameters.empId,
// isNormal: 1,
// blank: "y",
// }
// }else if(type==8){
// query = {
// CStartDate: this.parameters.dateRange[0],
// CEndDate: this.parameters.dateRange[1],
// RB_Department_Id:this.parameters.RB_Department_Id,
// EmployeeId:this.parameters.empId,
// discount: 1,
// isNormal: 1,
// blank: "y",
// }
// }
// this.OpenNewPage('/salesVolumeRank',query)
// }
query = {
CStartDate: this.parameters.dateRange[0],
CEndDate: this.parameters.dateRange[1],
BranchId: this.parameters.branchId,
RB_Department_Id:this.parameters.RB_Department_Id,
EmployeeId:this.parameters.empId,
blank: "y",
}
this.OpenNewPage('/salesVolumeRank',query)
},
changeDepart(node, instanceId){
this.parameters.RB_Department_Id=node.DepartmentId;
......
src/components/rank/salesVolumeRank.vue
View file @ 03fc63e8
This diff is collapsed.
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