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