diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index 5ede013..5988e02 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -651,8 +651,7 @@ sp: '', nodeId: '', documentSource: '', - menuId: this.queryOnly ? '103002' : this.$route.meta.menuId, - excludeStatusList: [] + menuId: this.$route.meta.menuId }, nodeOptions: [], pageIndex: 1, @@ -1115,9 +1114,9 @@ limit: this.pageSize, site: this.$store.state.user.site, userName: this.$store.state.user.name, - codeNo:this.$route.params.docNo, - excludeStatusList: this.buildExcludeStatusList() + codeNo:this.$route.params.docNo } + this.applyQueryOnlyFilter(inData) technicalSpecificationListSearch(inData).then(({data}) => { if (data.code == 0) { this.dataList1 = data.page.list @@ -1161,11 +1160,17 @@ }, methods: { buildExcludeStatusList () { - return this.queryOnly ? ['death', 'dead'] : [] + return this.queryOnly ? ['death', 'dead'] : null }, applyQueryOnlyFilter (target) { - target.excludeStatusList = this.buildExcludeStatusList() + if (this.queryOnly) { + target.excludeStatusList = this.buildExcludeStatusList() + target.menuId = '103002' + } else { + delete target.excludeStatusList + delete target.excludeStatusClause + } }, selectionChangeMainHandle(val) { @@ -1629,7 +1634,9 @@ }, fetchNodeOptions() { - getNodeList(this.searchData).then(({ data }) => { + const params = Object.assign({}, this.searchData) + this.applyQueryOnlyFilter(params) + getNodeList(params).then(({ data }) => { if (data && data.code === 0) { this.nodeOptions = data.rows.map(item => ({ id: item.nodeId, @@ -1653,7 +1660,7 @@ params.site = this.$store.state.user.site params.userName = this.$store.state.user.name params.userId = this.$store.state.user.id.toString() - params.excludeStatusList = this.buildExcludeStatusList() + this.applyQueryOnlyFilter(params) this.dataListLoading = true; technicalSpecificationListSearchByAnyField(params).then(({data})=>{ if (data && data.code === 0){