|
@@ -162,10 +162,12 @@ export default {
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
|
|
|
+ // 从通知链接跳转时(带no参数),不默认按本部门筛选,避免跨部门工单看不到
|
|
|
|
|
+ const hasNoParam = this.$route.query.no != null
|
|
|
return {
|
|
return {
|
|
|
// 查询参数
|
|
// 查询参数
|
|
|
queryParam: {
|
|
queryParam: {
|
|
|
- deptId: this.$store.getters.userInfo.deptId,
|
|
|
|
|
|
|
+ deptId: hasNoParam ? null : this.$store.getters.userInfo.deptId,
|
|
|
searchStartTime: null,
|
|
searchStartTime: null,
|
|
|
searchEndTime: null
|
|
searchEndTime: null
|
|
|
},
|
|
},
|
|
@@ -339,6 +341,8 @@ export default {
|
|
|
const no = this.$route.query.no
|
|
const no = this.$route.query.no
|
|
|
if (no != null) {
|
|
if (no != null) {
|
|
|
this.queryParam.no = no
|
|
this.queryParam.no = no
|
|
|
|
|
+ // 从通知跳转过来时,清除部门筛选,确保能看到该工单
|
|
|
|
|
+ this.queryParam.deptId = null
|
|
|
}
|
|
}
|
|
|
// 部门下拉数据
|
|
// 部门下拉数据
|
|
|
queryDept({}).then(res => {
|
|
queryDept({}).then(res => {
|
|
@@ -437,12 +441,16 @@ export default {
|
|
|
this.selectedRows = selectedRows
|
|
this.selectedRows = selectedRows
|
|
|
},
|
|
},
|
|
|
resetSearchForm() {
|
|
resetSearchForm() {
|
|
|
|
|
+ // 重置时:如果是从通知跳转(带no参数),则不恢复部门筛选
|
|
|
|
|
+ const no = this.$route.query.no
|
|
|
this.queryParam = {
|
|
this.queryParam = {
|
|
|
-
|
|
|
|
|
- deptId: this.$store.getters.userInfo.deptId,
|
|
|
|
|
|
|
+ deptId: no != null ? null : this.$store.getters.userInfo.deptId,
|
|
|
searchStartTime: null,
|
|
searchStartTime: null,
|
|
|
searchEndTime: null
|
|
searchEndTime: null
|
|
|
}
|
|
}
|
|
|
|
|
+ if (no != null) {
|
|
|
|
|
+ this.queryParam.no = no
|
|
|
|
|
+ }
|
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
|
},
|
|
},
|
|
|
doExport() {
|
|
doExport() {
|