Skip to content

W
web
Commit 35d178d1 authored by 小费同学阿's avatar 小费同学阿 💬
Browse files
Options

Merge remote-tracking branch 'origin/developer/feijinlian' into develop

parents b1adda0e 519fd5cc
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
src/views/review/already/index.vue
View file @ 35d178d1
...@@ -263,7 +263,9 @@ export default { ...@@ -263,7 +263,9 @@ export default {
this.tableData = this.tableData1.filter(item => { this.tableData = this.tableData1.filter(item => {
let flag = true let flag = true
if (this.queryParams.deptName) { if (this.queryParams.deptName) {
flag &= item.sceneContent.indexOf(this.queryParams.deptName) > -1 flag &=
item.sceneContent.indexOf(this.queryParams.deptName) > -1 ||
item.reviewNo.indexOf(this.queryParams.deptName) > -1
} }
if (this.queryParams.configType) { if (this.queryParams.configType) {
flag &= flag &=
......
src/views/review/wait/index.vue
View file @ 35d178d1
...@@ -350,7 +350,9 @@ export default { ...@@ -350,7 +350,9 @@ export default {
this.tableData = this.tableData1.filter(item => { this.tableData = this.tableData1.filter(item => {
let flag = true let flag = true
if (this.queryParams.deptName) { if (this.queryParams.deptName) {
flag &= item.sceneContent.indexOf(this.queryParams.deptName) > -1 flag &=
item.sceneContent.indexOf(this.queryParams.deptName) > -1 ||
item.reviewNo.indexOf(this.queryParams.deptName) > -1
} }
if (this.queryParams.configType) { if (this.queryParams.configType) {
flag &= flag &=
......
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