diff --git a/src/views/modules/customer/customerGroupInformation.vue b/src/views/modules/customer/customerGroupInformation.vue index 913e892..6d59afb 100644 --- a/src/views/modules/customer/customerGroupInformation.vue +++ b/src/views/modules/customer/customerGroupInformation.vue @@ -14,6 +14,7 @@ + @@ -132,7 +133,9 @@ import { } from '@/api/customer/customerGroupInformation.js' import Chooselist from '@/views/modules/common/Chooselist' import customerGroupInformation from './customerGroupInformation' +import DictDataSelect from "../sys/dict-data-select.vue"; export default { + components: {DictDataSelect}, // components: { // Chooselist // }, diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index ec7b427..95228d6 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -2304,7 +2304,10 @@ export default { }) }, created() { - if (this.$route.params.type){ + + }, + activated() { + if (this.$route.params.type === 'tokenLogin'){ let params = { site: this.$route.params.site, proofingNo: this.$route.params.docNo, @@ -2336,17 +2339,14 @@ export default { } this.dataListLoading = false }) - }else { - this.getDataList(); - } - }, - activated() { - if (this.$route.params.proofingNo){ + }else if (this.$route.params.proofingNo){ this.searchData.proofingNo = this.$route.params.proofingNo this.getDataList(); setTimeout(()=>{ this.searchData.proofingNo = '' },200) + }else { + this.getDataList(); } }, methods: {