|
@ -156,22 +156,24 @@ |
|
|
action: "in", |
|
|
action: "in", |
|
|
value: this.status |
|
|
value: this.status |
|
|
}) |
|
|
}) |
|
|
filters.push({ |
|
|
|
|
|
column: "countSplitType", |
|
|
|
|
|
action: "==", |
|
|
|
|
|
value: "locationCode" |
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
// filters.push({ |
|
|
// filters.push({ |
|
|
// column: "accept_user_id", |
|
|
// column: "countSplitType", |
|
|
// action: "==", |
|
|
// action: "==", |
|
|
// value: this.$store.state.user.id |
|
|
// value: "locationCode" |
|
|
// }) |
|
|
|
|
|
// filters.push({ |
|
|
|
|
|
// column: "accept_user_id", |
|
|
|
|
|
// action: "==", |
|
|
|
|
|
// value: this.$store.state.user.id |
|
|
|
|
|
// }) |
|
|
// }) |
|
|
|
|
|
|
|
|
|
|
|
filters.push({ |
|
|
|
|
|
column: "isOpenCount", |
|
|
|
|
|
action: "==", |
|
|
|
|
|
value: "TRUE" |
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
filters.push({ |
|
|
|
|
|
column: "accept_user_id", |
|
|
|
|
|
action: "==", |
|
|
|
|
|
value: this.$store.state.user.id |
|
|
|
|
|
}) |
|
|
var params = { |
|
|
var params = { |
|
|
filters: filters, |
|
|
filters: filters, |
|
|
pageNo: this.pageNo, |
|
|
pageNo: this.pageNo, |
|
@ -310,11 +312,18 @@ |
|
|
value: code |
|
|
value: code |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
// filters.push({ |
|
|
|
|
|
// column: "countSplitType", |
|
|
|
|
|
// action: "==", |
|
|
|
|
|
// value: "locationCode" |
|
|
|
|
|
// }) |
|
|
|
|
|
|
|
|
filters.push({ |
|
|
filters.push({ |
|
|
column: "countSplitType", |
|
|
column: "isOpenCount", |
|
|
action: "==", |
|
|
action: "==", |
|
|
value: "locationCode" |
|
|
value: "TRUE" |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
filters.push({ |
|
|
filters.push({ |
|
|
column: "accept_user_id", |
|
|
column: "accept_user_id", |
|
|
action: "==", |
|
|
action: "==", |
|
@ -362,11 +371,11 @@ |
|
|
value: '1,2' |
|
|
value: '1,2' |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
filters.push({ |
|
|
// filters.push({ |
|
|
column: "countSplitType", |
|
|
// column: "countSplitType", |
|
|
action: "==", |
|
|
// action: "==", |
|
|
value: "locationCode" |
|
|
// value: "locationCode" |
|
|
}) |
|
|
// }) |
|
|
|
|
|
|
|
|
filters.push({ |
|
|
filters.push({ |
|
|
column: "countSplitCode", |
|
|
column: "countSplitCode", |
|
|