diff --git a/nx/request/index.js b/nx/request/index.js index d730b71..4839155 100644 --- a/nx/request/index.js +++ b/nx/request/index.js @@ -149,6 +149,7 @@ http.interceptors.response.use( if (companyDeptList.length === 1) { const item = companyDeptList[0] if (!config.header[COMPANY_DEPT_RETRY_HEADER]) { + $store('company-dept').showSelectDept = false applyCompanyDeptSelection(item, config) return http.request(config) } @@ -159,6 +160,7 @@ http.interceptors.response.use( }) return Promise.resolve(data) } else if (companyDeptList.length > 1) { + $store('company-dept').showSelectDept = true const groupedList = normalizeCompanyDeptList(companyDeptList) const companyDeptDialogStore = $store('company-dept') return new Promise(resolve => { diff --git a/nx/store/company-dept.js b/nx/store/company-dept.js index 619bd50..61395a1 100644 --- a/nx/store/company-dept.js +++ b/nx/store/company-dept.js @@ -8,7 +8,8 @@ const defaultState = () => ({ selectedCompanyId: null, selectedDeptId: null, onConfirm: null, - onCancel: null + onCancel: null, + showSelectDept: false }) const companyDeptStore = defineStore({ diff --git a/pages/index/me-popup.vue b/pages/index/me-popup.vue index dde5533..d6971d7 100644 --- a/pages/index/me-popup.vue +++ b/pages/index/me-popup.vue @@ -11,7 +11,13 @@ - + @@ -55,7 +61,7 @@ const emit = defineEmits(['update:show', 'open', 'close']) // 响应式数据 const modalShow = ref(false) const dialogStore = nx.$store('company-dept') -const { companyList, selectedCompanyId, selectedDeptId } = storeToRefs(dialogStore) +const { companyList, selectedCompanyId, selectedDeptId, showSelectDept } = storeToRefs(dialogStore) // 计算属性 const userInfo = computed(() => nx.$store('user').userInfo) const deptName = computed(() => {