Commit 14e1efc5 authored by 华国豪's avatar 华国豪 🙄

修改考核统计bug

parent 90487594
...@@ -175,11 +175,11 @@ ...@@ -175,11 +175,11 @@
x.bigShow = false x.bigShow = false
} }
} else if (x.Id === 48) { } else if (x.Id === 48) {
if (this.EmployeeId === 1725) { // if (this.EmployeeId === 1725) {
x.bigShow = true x.bigShow = true
} else { // } else {
x.bigShow = false // x.bigShow = false
} // }
} }
} else { } else {
x.bigShow = true x.bigShow = true
......
...@@ -558,7 +558,12 @@ ...@@ -558,7 +558,12 @@
Money: obj.LeaderGetPriceT, Money: obj.LeaderGetPriceT,
TCNUMS: obj.TCNUMS TCNUMS: obj.TCNUMS
} }
let id = [43, 48] let id = [];
if (obj.OutBranchId === 0) {
id = [43, 48]
} else {
id = [43, 53]
}
this.$router.push({ this.$router.push({
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
query: { query: {
......
...@@ -111,15 +111,15 @@ export default { ...@@ -111,15 +111,15 @@ export default {
data = data.filter(item => item.bName && item.bName.indexOf(filters.bName)!=-1); data = data.filter(item => item.bName && item.bName.indexOf(filters.bName)!=-1);
} }
if (filters.departmentName && filters.departmentName!=''){ if (filters.departmentName && filters.departmentName!=''){
data = data.filter(item => item.departmentName.indexOf(filters.departmentName)!=-1); data = data.filter(item => item.departmentName && item.departmentName.indexOf(filters.departmentName)!=-1);
} }
if (filters.emName && filters.emName!=''){ if (filters.emName && filters.emName!=''){
data = data.filter(item => item.emName.indexOf(filters.emName)!=-1); data = data.filter(item => item.emName.indexOf(filters.emName)!=-1);
} }
if (filters.periods && filters.periods!=''&& filters.periods!='__all__'){ if (filters.periods && filters.periods!='' && filters.periods!='__all__'){
this.msg.Periods = filters.periods this.msg.Periods = filters.periods
this.getList(); this.getList();
} else{ } else if (!filters.bName && filters.bName==='' && filters.bName==='__all__'){
this.msg.Periods = '' this.msg.Periods = ''
this.getList(); this.getList();
} }
...@@ -329,7 +329,7 @@ export default { ...@@ -329,7 +329,7 @@ export default {
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
width: 80, width: 80,
// orderBy: "", orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) { formatter: function(rowData, rowIndex, pagingIndex, field) {
return `<span>${rowData.appletOrderCount <= 0 ? '' : rowData.appletOrderCount}</span>` return `<span>${rowData.appletOrderCount <= 0 ? '' : rowData.appletOrderCount}</span>`
} }
...@@ -395,6 +395,7 @@ export default { ...@@ -395,6 +395,7 @@ export default {
this.msg.OrderBy='a.LllegalModifyRemarkCount '+param.lllegalModifyRemarkCount this.msg.OrderBy='a.LllegalModifyRemarkCount '+param.lllegalModifyRemarkCount
} }
if(param.appletOrderCount!=''){ if(param.appletOrderCount!=''){
this.msg.OrderBy='a.AppletOrderCount '+param.appletOrderCount this.msg.OrderBy='a.AppletOrderCount '+param.appletOrderCount
} }
//this.tableData = this.orderBy(d, ["incomeVal"], param.income).results; //this.tableData = this.orderBy(d, ["incomeVal"], param.income).results;
......
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