diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 0aa442a..cdc2da4 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -2025,9 +2025,14 @@ '$route.query.inspectionNo': { handler (newVal) { if (newVal) { - // 将检验单号放入筛选条件的检验单号输入框中 + if (!this.searchData.site) { + this.searchData.site = this.$store.state.user.site + } + if (!this.searchData.userName) { + this.searchData.userName = this.$store.state.user.name + } this.searchData.inspectionNo = newVal - + // 自动执行查询 this.$nextTick(() => { this.getDataList() @@ -2049,44 +2054,49 @@ this.disposalMeasuresSearch() //this.orderTypeSearch() // 动态列 - this.getTableUserColumn(this.$route.meta.menuId+'table1',1) - this.getTableUserColumn(this.$route.meta.menuId+'table2',2) + // this.getTableUserColumn(this.$route.meta.menuId+'table1',1) + // this.getTableUserColumn(this.$route.meta.menuId+'table2',2) - - // 接收路由参数,如果有 inspectionNo 则设置为查询条件,并清空其他筛选条件 if (this.$route.query.inspectionNo) { - // 重置 searchData,只保留必要的字段和 inspectionNo - this.searchData = { - site: '', - userName: this.$store.state.user.name, - inspectionNo: this.$route.query.inspectionNo, - inspectionTypeNo: '105', - isQualified: '', - buNo: '', - startDate: '', - endDate: '', - startDate2: '', - endDate2: '', - partNo: '', - partDesc: '', - cinvSourceCode: '', - sku: '', - state: '', - inspectionResult: '', - supplierDesc: '', - disposalMeasures: '', - inspectorName: '', - page: 1, - limit: 10, - poOrderNo: '', - poItemNo: '', - orderType: '', - states: ['未开始', '待检验'], - submissionType: '', - invdefinetype: '' - } + this.searchData.inspectionNo= this.$route.query.inspectionNo + + } + // 接收路由参数,如果有 inspectionNo 则设置为查询条件,并清空其他筛选条件 + // if (this.$route.query.inspectionNo) { + // // 重置 searchData,只保留必要的字段和 inspectionNo + // this.searchData = { + // site: '', + // userName: this.$store.state.user.name, + // inspectionNo: this.$route.query.inspectionNo, + // inspectionTypeNo: '105', + // isQualified: '', + // buNo: '', + // startDate: '', + // endDate: '', + // startDate2: '', + // endDate2: '', + // partNo: '', + // partDesc: '', + // cinvSourceCode: '', + // sku: '', + // state: '', + // inspectionResult: '', + // supplierDesc: '', + // disposalMeasures: '', + // inspectorName: '', + // page: 1, + // limit: 10, + // poOrderNo: '', + // poItemNo: '', + // orderType: '', + // states: ['未开始', '待检验'], + // submissionType: '', + // invdefinetype: '' + // } + // } + if (!this.authSearch) { // 获取数据列表