|
@@ -380,7 +380,11 @@ export default {
|
|
|
.filter(item => {
|
|
|
return (
|
|
|
(this.value1.length ? !!~this.value1.indexOf(item.type) : true) &&
|
|
|
- (this.input ? !!~item.name.indexOf(this.input) || !!~item.pname.indexOf(this.input) : true)
|
|
|
+ (this.input
|
|
|
+ ? !!~item.name.indexOf(this.input) ||
|
|
|
+ !!~item.pname.indexOf(this.input) ||
|
|
|
+ !!~item.websitNumber.indexOf(this.input)
|
|
|
+ : true)
|
|
|
)
|
|
|
})
|
|
|
.splice((this.currentPage - 1) * this.pageSize, this.pageSize)
|
|
@@ -389,7 +393,11 @@ export default {
|
|
|
return [...this.dataList].filter(item => {
|
|
|
return (
|
|
|
(this.value1.length ? !!~this.value1.indexOf(item.type) : true) &&
|
|
|
- (this.input ? !!~item.name.indexOf(this.input) || !!~item.pname.indexOf(this.input) : true)
|
|
|
+ (this.input
|
|
|
+ ? !!~item.name.indexOf(this.input) ||
|
|
|
+ !!~item.pname.indexOf(this.input) ||
|
|
|
+ !!~item.websitNumber.indexOf(this.input)
|
|
|
+ : true)
|
|
|
)
|
|
|
}).length
|
|
|
}
|
|
@@ -472,8 +480,8 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
getDepartmentList().then(res => {
|
|
|
- this.dataList2 = res.data
|
|
|
- dg(res.data)
|
|
|
+ this.dataList2 = res.data || []
|
|
|
+ dg(res.data || [])
|
|
|
this.dataList = list_
|
|
|
this.levels = levels
|
|
|
})
|