diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 110a19f..1ca1ef5 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -314,7 +314,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 110a19f..1ca1ef5 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -314,7 +314,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index 6f5bb18..91107a7 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -289,7 +289,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 110a19f..1ca1ef5 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -314,7 +314,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index 6f5bb18..91107a7 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -289,7 +289,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue index 1e53ddd..95a3b17 100644 --- a/src/views/tested/device/certificate/index.vue +++ b/src/views/tested/device/certificate/index.vue @@ -10,7 +10,9 @@ import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { getPhotoUrl } from '@/api/system/tool' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any +const userStore = useUserStore() const listQuery = reactive({ certificateValidEnd: '', certificateValidStart: '', @@ -190,7 +192,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 110a19f..1ca1ef5 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -314,7 +314,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index 6f5bb18..91107a7 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -289,7 +289,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue index 1e53ddd..95a3b17 100644 --- a/src/views/tested/device/certificate/index.vue +++ b/src/views/tested/device/certificate/index.vue @@ -10,7 +10,9 @@ import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { getPhotoUrl } from '@/api/system/tool' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any +const userStore = useUserStore() const listQuery = reactive({ certificateValidEnd: '', certificateValidStart: '', @@ -190,7 +192,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue index 0f99db7..3a9705b 100644 --- a/src/views/tested/device/group/components/list.vue +++ b/src/views/tested/device/group/components/list.vue @@ -179,7 +179,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 110a19f..1ca1ef5 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -314,7 +314,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index 6f5bb18..91107a7 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -289,7 +289,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue index 1e53ddd..95a3b17 100644 --- a/src/views/tested/device/certificate/index.vue +++ b/src/views/tested/device/certificate/index.vue @@ -10,7 +10,9 @@ import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { getPhotoUrl } from '@/api/system/tool' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any +const userStore = useUserStore() const listQuery = reactive({ certificateValidEnd: '', certificateValidStart: '', @@ -190,7 +192,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue index 0f99db7..3a9705b 100644 --- a/src/views/tested/device/group/components/list.vue +++ b/src/views/tested/device/group/components/list.vue @@ -179,7 +179,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue index 376b26e..05e5093 100644 --- a/src/views/tested/device/group/components/selectDevice.vue +++ b/src/views/tested/device/group/components/selectDevice.vue @@ -357,7 +357,7 @@ usePositionList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 110a19f..1ca1ef5 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -314,7 +314,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index 6f5bb18..91107a7 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -289,7 +289,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue index 1e53ddd..95a3b17 100644 --- a/src/views/tested/device/certificate/index.vue +++ b/src/views/tested/device/certificate/index.vue @@ -10,7 +10,9 @@ import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { getPhotoUrl } from '@/api/system/tool' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any +const userStore = useUserStore() const listQuery = reactive({ certificateValidEnd: '', certificateValidStart: '', @@ -190,7 +192,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue index 0f99db7..3a9705b 100644 --- a/src/views/tested/device/group/components/list.vue +++ b/src/views/tested/device/group/components/list.vue @@ -179,7 +179,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue index 376b26e..05e5093 100644 --- a/src/views/tested/device/group/components/selectDevice.vue +++ b/src/views/tested/device/group/components/selectDevice.vue @@ -357,7 +357,7 @@ usePositionList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 3c598de..79014c5 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -442,7 +442,7 @@ const fetchDept = () => { getUserDept().then((res) => { console.log(res.data, '新建') - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { // if ($route.params.type === 'create') { // ruleForm.value.companyId = '' // ruleForm.value.companyName = '' diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 110a19f..1ca1ef5 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -314,7 +314,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index 6f5bb18..91107a7 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -289,7 +289,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue index 1e53ddd..95a3b17 100644 --- a/src/views/tested/device/certificate/index.vue +++ b/src/views/tested/device/certificate/index.vue @@ -10,7 +10,9 @@ import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { getPhotoUrl } from '@/api/system/tool' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any +const userStore = useUserStore() const listQuery = reactive({ certificateValidEnd: '', certificateValidStart: '', @@ -190,7 +192,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue index 0f99db7..3a9705b 100644 --- a/src/views/tested/device/group/components/list.vue +++ b/src/views/tested/device/group/components/list.vue @@ -179,7 +179,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue index 376b26e..05e5093 100644 --- a/src/views/tested/device/group/components/selectDevice.vue +++ b/src/views/tested/device/group/components/selectDevice.vue @@ -357,7 +357,7 @@ usePositionList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 3c598de..79014c5 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -442,7 +442,7 @@ const fetchDept = () => { getUserDept().then((res) => { console.log(res.data, '新建') - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { // if ($route.params.type === 'create') { // ruleForm.value.companyId = '' // ruleForm.value.companyName = '' diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index 1097172..eaf2581 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -414,7 +414,7 @@ // }) getUserDept().then((res) => { companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 110a19f..1ca1ef5 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -314,7 +314,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index 6f5bb18..91107a7 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -289,7 +289,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue index 1e53ddd..95a3b17 100644 --- a/src/views/tested/device/certificate/index.vue +++ b/src/views/tested/device/certificate/index.vue @@ -10,7 +10,9 @@ import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { getPhotoUrl } from '@/api/system/tool' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any +const userStore = useUserStore() const listQuery = reactive({ certificateValidEnd: '', certificateValidStart: '', @@ -190,7 +192,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue index 0f99db7..3a9705b 100644 --- a/src/views/tested/device/group/components/list.vue +++ b/src/views/tested/device/group/components/list.vue @@ -179,7 +179,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue index 376b26e..05e5093 100644 --- a/src/views/tested/device/group/components/selectDevice.vue +++ b/src/views/tested/device/group/components/selectDevice.vue @@ -357,7 +357,7 @@ usePositionList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 3c598de..79014c5 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -442,7 +442,7 @@ const fetchDept = () => { getUserDept().then((res) => { console.log(res.data, '新建') - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { // if ($route.params.type === 'create') { // ruleForm.value.companyId = '' // ruleForm.value.companyName = '' diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index 1097172..eaf2581 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -414,7 +414,7 @@ // }) getUserDept().then((res) => { companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/borrow/components/edit.vue b/src/views/tested/status/borrow/components/edit.vue index 61f4b21..628760c 100644 --- a/src/views/tested/status/borrow/components/edit.vue +++ b/src/views/tested/status/borrow/components/edit.vue @@ -81,7 +81,7 @@ ruleFormRef.value?.resetFields() const fetchDept = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 110a19f..1ca1ef5 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -314,7 +314,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index 6f5bb18..91107a7 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -289,7 +289,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue index 1e53ddd..95a3b17 100644 --- a/src/views/tested/device/certificate/index.vue +++ b/src/views/tested/device/certificate/index.vue @@ -10,7 +10,9 @@ import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { getPhotoUrl } from '@/api/system/tool' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any +const userStore = useUserStore() const listQuery = reactive({ certificateValidEnd: '', certificateValidStart: '', @@ -190,7 +192,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue index 0f99db7..3a9705b 100644 --- a/src/views/tested/device/group/components/list.vue +++ b/src/views/tested/device/group/components/list.vue @@ -179,7 +179,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue index 376b26e..05e5093 100644 --- a/src/views/tested/device/group/components/selectDevice.vue +++ b/src/views/tested/device/group/components/selectDevice.vue @@ -357,7 +357,7 @@ usePositionList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 3c598de..79014c5 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -442,7 +442,7 @@ const fetchDept = () => { getUserDept().then((res) => { console.log(res.data, '新建') - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { // if ($route.params.type === 'create') { // ruleForm.value.companyId = '' // ruleForm.value.companyName = '' diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index 1097172..eaf2581 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -414,7 +414,7 @@ // }) getUserDept().then((res) => { companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/borrow/components/edit.vue b/src/views/tested/status/borrow/components/edit.vue index 61f4b21..628760c 100644 --- a/src/views/tested/status/borrow/components/edit.vue +++ b/src/views/tested/status/borrow/components/edit.vue @@ -81,7 +81,7 @@ ruleFormRef.value?.resetFields() const fetchDept = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/status/borrow/components/list.vue b/src/views/tested/status/borrow/components/list.vue index d50d3d8..50b634e 100644 --- a/src/views/tested/status/borrow/components/list.vue +++ b/src/views/tested/status/borrow/components/list.vue @@ -10,6 +10,7 @@ import { toTreeList } from '@/utils/structure' import { getDeptTreeList } from '@/api/system/dept' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -28,6 +29,7 @@ onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, 'DeviceBorrow') }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const listQuery = reactive({ approvalNo: '', @@ -253,7 +255,7 @@ const fetchDict = () => { // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 110a19f..1ca1ef5 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -314,7 +314,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index 6f5bb18..91107a7 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -289,7 +289,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue index 1e53ddd..95a3b17 100644 --- a/src/views/tested/device/certificate/index.vue +++ b/src/views/tested/device/certificate/index.vue @@ -10,7 +10,9 @@ import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { getPhotoUrl } from '@/api/system/tool' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any +const userStore = useUserStore() const listQuery = reactive({ certificateValidEnd: '', certificateValidStart: '', @@ -190,7 +192,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue index 0f99db7..3a9705b 100644 --- a/src/views/tested/device/group/components/list.vue +++ b/src/views/tested/device/group/components/list.vue @@ -179,7 +179,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue index 376b26e..05e5093 100644 --- a/src/views/tested/device/group/components/selectDevice.vue +++ b/src/views/tested/device/group/components/selectDevice.vue @@ -357,7 +357,7 @@ usePositionList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 3c598de..79014c5 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -442,7 +442,7 @@ const fetchDept = () => { getUserDept().then((res) => { console.log(res.data, '新建') - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { // if ($route.params.type === 'create') { // ruleForm.value.companyId = '' // ruleForm.value.companyName = '' diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index 1097172..eaf2581 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -414,7 +414,7 @@ // }) getUserDept().then((res) => { companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/borrow/components/edit.vue b/src/views/tested/status/borrow/components/edit.vue index 61f4b21..628760c 100644 --- a/src/views/tested/status/borrow/components/edit.vue +++ b/src/views/tested/status/borrow/components/edit.vue @@ -81,7 +81,7 @@ ruleFormRef.value?.resetFields() const fetchDept = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/status/borrow/components/list.vue b/src/views/tested/status/borrow/components/list.vue index d50d3d8..50b634e 100644 --- a/src/views/tested/status/borrow/components/list.vue +++ b/src/views/tested/status/borrow/components/list.vue @@ -10,6 +10,7 @@ import { toTreeList } from '@/utils/structure' import { getDeptTreeList } from '@/api/system/dept' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -28,6 +29,7 @@ onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, 'DeviceBorrow') }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const listQuery = reactive({ approvalNo: '', @@ -253,7 +255,7 @@ const fetchDict = () => { // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/delay/components/delay.vue b/src/views/tested/status/delay/components/delay.vue index 5fdcfea..3568865 100644 --- a/src/views/tested/status/delay/components/delay.vue +++ b/src/views/tested/status/delay/components/delay.vue @@ -11,6 +11,7 @@ import { toTreeList, underlineToHump } from '@/utils/structure' import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -31,6 +32,7 @@ 未通过: '5', 已取消: '6', }) +const userStore = useUserStore() const statusDict = ref<{ [key: string]: string }>({ 1: 'sealpage', // 封存 2: 'unsealpage', // 启封 @@ -302,7 +304,7 @@ }) // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 110a19f..1ca1ef5 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -314,7 +314,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index 6f5bb18..91107a7 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -289,7 +289,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue index 1e53ddd..95a3b17 100644 --- a/src/views/tested/device/certificate/index.vue +++ b/src/views/tested/device/certificate/index.vue @@ -10,7 +10,9 @@ import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { getPhotoUrl } from '@/api/system/tool' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any +const userStore = useUserStore() const listQuery = reactive({ certificateValidEnd: '', certificateValidStart: '', @@ -190,7 +192,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue index 0f99db7..3a9705b 100644 --- a/src/views/tested/device/group/components/list.vue +++ b/src/views/tested/device/group/components/list.vue @@ -179,7 +179,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue index 376b26e..05e5093 100644 --- a/src/views/tested/device/group/components/selectDevice.vue +++ b/src/views/tested/device/group/components/selectDevice.vue @@ -357,7 +357,7 @@ usePositionList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 3c598de..79014c5 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -442,7 +442,7 @@ const fetchDept = () => { getUserDept().then((res) => { console.log(res.data, '新建') - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { // if ($route.params.type === 'create') { // ruleForm.value.companyId = '' // ruleForm.value.companyName = '' diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index 1097172..eaf2581 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -414,7 +414,7 @@ // }) getUserDept().then((res) => { companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/borrow/components/edit.vue b/src/views/tested/status/borrow/components/edit.vue index 61f4b21..628760c 100644 --- a/src/views/tested/status/borrow/components/edit.vue +++ b/src/views/tested/status/borrow/components/edit.vue @@ -81,7 +81,7 @@ ruleFormRef.value?.resetFields() const fetchDept = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/status/borrow/components/list.vue b/src/views/tested/status/borrow/components/list.vue index d50d3d8..50b634e 100644 --- a/src/views/tested/status/borrow/components/list.vue +++ b/src/views/tested/status/borrow/components/list.vue @@ -10,6 +10,7 @@ import { toTreeList } from '@/utils/structure' import { getDeptTreeList } from '@/api/system/dept' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -28,6 +29,7 @@ onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, 'DeviceBorrow') }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const listQuery = reactive({ approvalNo: '', @@ -253,7 +255,7 @@ const fetchDict = () => { // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/delay/components/delay.vue b/src/views/tested/status/delay/components/delay.vue index 5fdcfea..3568865 100644 --- a/src/views/tested/status/delay/components/delay.vue +++ b/src/views/tested/status/delay/components/delay.vue @@ -11,6 +11,7 @@ import { toTreeList, underlineToHump } from '@/utils/structure' import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -31,6 +32,7 @@ 未通过: '5', 已取消: '6', }) +const userStore = useUserStore() const statusDict = ref<{ [key: string]: string }>({ 1: 'sealpage', // 封存 2: 'unsealpage', // 启封 @@ -302,7 +304,7 @@ }) // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue index 994937b..bafeef2 100644 --- a/src/views/tested/status/delay/components/list.vue +++ b/src/views/tested/status/delay/components/list.vue @@ -12,6 +12,7 @@ import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -31,6 +32,7 @@ 4: 'ScrapPage', 5: 'DelayPage', } +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, stsusDictAlive[$props.statusType]) }) @@ -332,7 +334,7 @@ }) // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 110a19f..1ca1ef5 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -314,7 +314,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index 6f5bb18..91107a7 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -289,7 +289,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue index 1e53ddd..95a3b17 100644 --- a/src/views/tested/device/certificate/index.vue +++ b/src/views/tested/device/certificate/index.vue @@ -10,7 +10,9 @@ import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { getPhotoUrl } from '@/api/system/tool' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any +const userStore = useUserStore() const listQuery = reactive({ certificateValidEnd: '', certificateValidStart: '', @@ -190,7 +192,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue index 0f99db7..3a9705b 100644 --- a/src/views/tested/device/group/components/list.vue +++ b/src/views/tested/device/group/components/list.vue @@ -179,7 +179,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue index 376b26e..05e5093 100644 --- a/src/views/tested/device/group/components/selectDevice.vue +++ b/src/views/tested/device/group/components/selectDevice.vue @@ -357,7 +357,7 @@ usePositionList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 3c598de..79014c5 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -442,7 +442,7 @@ const fetchDept = () => { getUserDept().then((res) => { console.log(res.data, '新建') - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { // if ($route.params.type === 'create') { // ruleForm.value.companyId = '' // ruleForm.value.companyName = '' diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index 1097172..eaf2581 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -414,7 +414,7 @@ // }) getUserDept().then((res) => { companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/borrow/components/edit.vue b/src/views/tested/status/borrow/components/edit.vue index 61f4b21..628760c 100644 --- a/src/views/tested/status/borrow/components/edit.vue +++ b/src/views/tested/status/borrow/components/edit.vue @@ -81,7 +81,7 @@ ruleFormRef.value?.resetFields() const fetchDept = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/status/borrow/components/list.vue b/src/views/tested/status/borrow/components/list.vue index d50d3d8..50b634e 100644 --- a/src/views/tested/status/borrow/components/list.vue +++ b/src/views/tested/status/borrow/components/list.vue @@ -10,6 +10,7 @@ import { toTreeList } from '@/utils/structure' import { getDeptTreeList } from '@/api/system/dept' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -28,6 +29,7 @@ onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, 'DeviceBorrow') }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const listQuery = reactive({ approvalNo: '', @@ -253,7 +255,7 @@ const fetchDict = () => { // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/delay/components/delay.vue b/src/views/tested/status/delay/components/delay.vue index 5fdcfea..3568865 100644 --- a/src/views/tested/status/delay/components/delay.vue +++ b/src/views/tested/status/delay/components/delay.vue @@ -11,6 +11,7 @@ import { toTreeList, underlineToHump } from '@/utils/structure' import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -31,6 +32,7 @@ 未通过: '5', 已取消: '6', }) +const userStore = useUserStore() const statusDict = ref<{ [key: string]: string }>({ 1: 'sealpage', // 封存 2: 'unsealpage', // 启封 @@ -302,7 +304,7 @@ }) // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue index 994937b..bafeef2 100644 --- a/src/views/tested/status/delay/components/list.vue +++ b/src/views/tested/status/delay/components/list.vue @@ -12,6 +12,7 @@ import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -31,6 +32,7 @@ 4: 'ScrapPage', 5: 'DelayPage', } +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, stsusDictAlive[$props.statusType]) }) @@ -332,7 +334,7 @@ }) // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/maintain/index.vue b/src/views/tested/status/maintain/index.vue index 3952bc2..8525a02 100644 --- a/src/views/tested/status/maintain/index.vue +++ b/src/views/tested/status/maintain/index.vue @@ -8,6 +8,7 @@ import { toTreeList } from '@/utils/structure' import { getDeptTreeList } from '@/api/system/dept' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any const $router = useRouter() // 查询条件 @@ -27,6 +28,7 @@ onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, 'DeviceMainList') }) +const userStore = useUserStore() // 申请开始结束时间 const datetimerange = ref() watch(() => datetimerange.value, (newVal) => { @@ -192,7 +194,7 @@ }) // 单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 110a19f..1ca1ef5 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -314,7 +314,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index 6f5bb18..91107a7 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -289,7 +289,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue index 1e53ddd..95a3b17 100644 --- a/src/views/tested/device/certificate/index.vue +++ b/src/views/tested/device/certificate/index.vue @@ -10,7 +10,9 @@ import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { getPhotoUrl } from '@/api/system/tool' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any +const userStore = useUserStore() const listQuery = reactive({ certificateValidEnd: '', certificateValidStart: '', @@ -190,7 +192,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue index 0f99db7..3a9705b 100644 --- a/src/views/tested/device/group/components/list.vue +++ b/src/views/tested/device/group/components/list.vue @@ -179,7 +179,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue index 376b26e..05e5093 100644 --- a/src/views/tested/device/group/components/selectDevice.vue +++ b/src/views/tested/device/group/components/selectDevice.vue @@ -357,7 +357,7 @@ usePositionList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 3c598de..79014c5 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -442,7 +442,7 @@ const fetchDept = () => { getUserDept().then((res) => { console.log(res.data, '新建') - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { // if ($route.params.type === 'create') { // ruleForm.value.companyId = '' // ruleForm.value.companyName = '' diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index 1097172..eaf2581 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -414,7 +414,7 @@ // }) getUserDept().then((res) => { companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/borrow/components/edit.vue b/src/views/tested/status/borrow/components/edit.vue index 61f4b21..628760c 100644 --- a/src/views/tested/status/borrow/components/edit.vue +++ b/src/views/tested/status/borrow/components/edit.vue @@ -81,7 +81,7 @@ ruleFormRef.value?.resetFields() const fetchDept = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/status/borrow/components/list.vue b/src/views/tested/status/borrow/components/list.vue index d50d3d8..50b634e 100644 --- a/src/views/tested/status/borrow/components/list.vue +++ b/src/views/tested/status/borrow/components/list.vue @@ -10,6 +10,7 @@ import { toTreeList } from '@/utils/structure' import { getDeptTreeList } from '@/api/system/dept' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -28,6 +29,7 @@ onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, 'DeviceBorrow') }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const listQuery = reactive({ approvalNo: '', @@ -253,7 +255,7 @@ const fetchDict = () => { // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/delay/components/delay.vue b/src/views/tested/status/delay/components/delay.vue index 5fdcfea..3568865 100644 --- a/src/views/tested/status/delay/components/delay.vue +++ b/src/views/tested/status/delay/components/delay.vue @@ -11,6 +11,7 @@ import { toTreeList, underlineToHump } from '@/utils/structure' import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -31,6 +32,7 @@ 未通过: '5', 已取消: '6', }) +const userStore = useUserStore() const statusDict = ref<{ [key: string]: string }>({ 1: 'sealpage', // 封存 2: 'unsealpage', // 启封 @@ -302,7 +304,7 @@ }) // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue index 994937b..bafeef2 100644 --- a/src/views/tested/status/delay/components/list.vue +++ b/src/views/tested/status/delay/components/list.vue @@ -12,6 +12,7 @@ import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -31,6 +32,7 @@ 4: 'ScrapPage', 5: 'DelayPage', } +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, stsusDictAlive[$props.statusType]) }) @@ -332,7 +334,7 @@ }) // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/maintain/index.vue b/src/views/tested/status/maintain/index.vue index 3952bc2..8525a02 100644 --- a/src/views/tested/status/maintain/index.vue +++ b/src/views/tested/status/maintain/index.vue @@ -8,6 +8,7 @@ import { toTreeList } from '@/utils/structure' import { getDeptTreeList } from '@/api/system/dept' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any const $router = useRouter() // 查询条件 @@ -27,6 +28,7 @@ onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, 'DeviceMainList') }) +const userStore = useUserStore() // 申请开始结束时间 const datetimerange = ref() watch(() => datetimerange.value, (newVal) => { @@ -192,7 +194,7 @@ }) // 单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/subpackage/certificate/components/orderDialog.vue b/src/views/tested/subpackage/certificate/components/orderDialog.vue index 38c14b1..fc24dee 100644 --- a/src/views/tested/subpackage/certificate/components/orderDialog.vue +++ b/src/views/tested/subpackage/certificate/components/orderDialog.vue @@ -10,6 +10,7 @@ import { toTreeList } from '@/utils/structure' import { keepSearchParams } from '@/utils/keepQuery' import { getDictByCode } from '@/api/system/dict' +import useUserStore from '@/store/modules/user' const emits = defineEmits(['confirm']) const dialogFormVisible = ref(false) const singleChecked = ref(-1) @@ -82,7 +83,7 @@ const list = ref([]) const total = ref(0) const listLoading = ref(true) - +const userStore = useUserStore() // 获取列表数据 const fetchData = (isNowPage = true) => { list.value = [] @@ -152,7 +153,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 110a19f..1ca1ef5 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -314,7 +314,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index 6f5bb18..91107a7 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -289,7 +289,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue index 1e53ddd..95a3b17 100644 --- a/src/views/tested/device/certificate/index.vue +++ b/src/views/tested/device/certificate/index.vue @@ -10,7 +10,9 @@ import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { getPhotoUrl } from '@/api/system/tool' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any +const userStore = useUserStore() const listQuery = reactive({ certificateValidEnd: '', certificateValidStart: '', @@ -190,7 +192,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue index 0f99db7..3a9705b 100644 --- a/src/views/tested/device/group/components/list.vue +++ b/src/views/tested/device/group/components/list.vue @@ -179,7 +179,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue index 376b26e..05e5093 100644 --- a/src/views/tested/device/group/components/selectDevice.vue +++ b/src/views/tested/device/group/components/selectDevice.vue @@ -357,7 +357,7 @@ usePositionList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 3c598de..79014c5 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -442,7 +442,7 @@ const fetchDept = () => { getUserDept().then((res) => { console.log(res.data, '新建') - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { // if ($route.params.type === 'create') { // ruleForm.value.companyId = '' // ruleForm.value.companyName = '' diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index 1097172..eaf2581 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -414,7 +414,7 @@ // }) getUserDept().then((res) => { companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/borrow/components/edit.vue b/src/views/tested/status/borrow/components/edit.vue index 61f4b21..628760c 100644 --- a/src/views/tested/status/borrow/components/edit.vue +++ b/src/views/tested/status/borrow/components/edit.vue @@ -81,7 +81,7 @@ ruleFormRef.value?.resetFields() const fetchDept = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/status/borrow/components/list.vue b/src/views/tested/status/borrow/components/list.vue index d50d3d8..50b634e 100644 --- a/src/views/tested/status/borrow/components/list.vue +++ b/src/views/tested/status/borrow/components/list.vue @@ -10,6 +10,7 @@ import { toTreeList } from '@/utils/structure' import { getDeptTreeList } from '@/api/system/dept' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -28,6 +29,7 @@ onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, 'DeviceBorrow') }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const listQuery = reactive({ approvalNo: '', @@ -253,7 +255,7 @@ const fetchDict = () => { // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/delay/components/delay.vue b/src/views/tested/status/delay/components/delay.vue index 5fdcfea..3568865 100644 --- a/src/views/tested/status/delay/components/delay.vue +++ b/src/views/tested/status/delay/components/delay.vue @@ -11,6 +11,7 @@ import { toTreeList, underlineToHump } from '@/utils/structure' import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -31,6 +32,7 @@ 未通过: '5', 已取消: '6', }) +const userStore = useUserStore() const statusDict = ref<{ [key: string]: string }>({ 1: 'sealpage', // 封存 2: 'unsealpage', // 启封 @@ -302,7 +304,7 @@ }) // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue index 994937b..bafeef2 100644 --- a/src/views/tested/status/delay/components/list.vue +++ b/src/views/tested/status/delay/components/list.vue @@ -12,6 +12,7 @@ import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -31,6 +32,7 @@ 4: 'ScrapPage', 5: 'DelayPage', } +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, stsusDictAlive[$props.statusType]) }) @@ -332,7 +334,7 @@ }) // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/maintain/index.vue b/src/views/tested/status/maintain/index.vue index 3952bc2..8525a02 100644 --- a/src/views/tested/status/maintain/index.vue +++ b/src/views/tested/status/maintain/index.vue @@ -8,6 +8,7 @@ import { toTreeList } from '@/utils/structure' import { getDeptTreeList } from '@/api/system/dept' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any const $router = useRouter() // 查询条件 @@ -27,6 +28,7 @@ onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, 'DeviceMainList') }) +const userStore = useUserStore() // 申请开始结束时间 const datetimerange = ref() watch(() => datetimerange.value, (newVal) => { @@ -192,7 +194,7 @@ }) // 单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/subpackage/certificate/components/orderDialog.vue b/src/views/tested/subpackage/certificate/components/orderDialog.vue index 38c14b1..fc24dee 100644 --- a/src/views/tested/subpackage/certificate/components/orderDialog.vue +++ b/src/views/tested/subpackage/certificate/components/orderDialog.vue @@ -10,6 +10,7 @@ import { toTreeList } from '@/utils/structure' import { keepSearchParams } from '@/utils/keepQuery' import { getDictByCode } from '@/api/system/dict' +import useUserStore from '@/store/modules/user' const emits = defineEmits(['confirm']) const dialogFormVisible = ref(false) const singleChecked = ref(-1) @@ -82,7 +83,7 @@ const list = ref([]) const total = ref(0) const listLoading = ref(true) - +const userStore = useUserStore() // 获取列表数据 const fetchData = (isNowPage = true) => { list.value = [] @@ -152,7 +153,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/subpackage/task/components/edit.vue b/src/views/tested/subpackage/task/components/edit.vue index 2f6cf00..faa080e 100644 --- a/src/views/tested/subpackage/task/components/edit.vue +++ b/src/views/tested/subpackage/task/components/edit.vue @@ -89,7 +89,7 @@ ruleFormRef.value?.resetFields() getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 982ccdb..f5ff88b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -30,6 +30,7 @@ btns: [] as Menu.menu[], // 按钮权限 isLogout: 0, // 是否被退出登录 lab: localStorage.lab || '', // 所属实验室 + dataSopeType: '', }), getters: { isLogin: (state) => { @@ -137,6 +138,7 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips + this.dataSopeType = res.data.scopeType localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue index 128d9dc..32f99c0 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/list.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue @@ -10,12 +10,14 @@ import { getDictByCode } from '@/api/system/dict' import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, default: '', }, }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const applyDict = ref<{ [key: string]: string }>({ 审批: '', @@ -258,7 +260,7 @@ // 获取字典 const fetchDict = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 6ed540c..fa1ce30 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -95,7 +95,7 @@ // 获取当前用户所在单位 getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 8091d84..27173d2 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 申请类型(字典值,提前/延迟) approvalType: { @@ -24,6 +25,7 @@ required: true, }, }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, $props.approvalType === '0' ? 'EarlyApplication' : 'DelayApplication') }) @@ -361,7 +363,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index 9a186dd..a2f766d 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -80,7 +80,7 @@ flag.value = true // 获取单位 const res = await getUserDept() - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index 06667ee..878a980 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -61,7 +61,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index 9a4ab8f..ebf7665 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -360,7 +360,7 @@ // usageStatusList.value = res.data // }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue index c90483d..512e0a6 100644 --- a/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue +++ b/src/views/tested/MeasurementPlan/plan/components/summaryDialog.vue @@ -60,7 +60,7 @@ rules.value.commpanyId = undefined } } - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { commpanyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) isAdmin.value = true diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue index 5668315..4c96b15 100644 --- a/src/views/tested/MeasurementPlan/task/components/edit.vue +++ b/src/views/tested/MeasurementPlan/task/components/edit.vue @@ -98,7 +98,7 @@ getUserDept().then((res) => { console.log(res.data, '用户所在单位') // fullName - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 110a19f..1ca1ef5 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -314,7 +314,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index 6f5bb18..91107a7 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -289,7 +289,7 @@ useStatusList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue index 1e53ddd..95a3b17 100644 --- a/src/views/tested/device/certificate/index.vue +++ b/src/views/tested/device/certificate/index.vue @@ -10,7 +10,9 @@ import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' import { getPhotoUrl } from '@/api/system/tool' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any +const userStore = useUserStore() const listQuery = reactive({ certificateValidEnd: '', certificateValidStart: '', @@ -190,7 +192,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue index 0f99db7..3a9705b 100644 --- a/src/views/tested/device/group/components/list.vue +++ b/src/views/tested/device/group/components/list.vue @@ -179,7 +179,7 @@ // }) getUserDept().then((res) => { // companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue index 376b26e..05e5093 100644 --- a/src/views/tested/device/group/components/selectDevice.vue +++ b/src/views/tested/device/group/components/selectDevice.vue @@ -357,7 +357,7 @@ usePositionList.value = res.data }) getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 3c598de..79014c5 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -442,7 +442,7 @@ const fetchDept = () => { getUserDept().then((res) => { console.log(res.data, '新建') - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { // if ($route.params.type === 'create') { // ruleForm.value.companyId = '' // ruleForm.value.companyName = '' diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index 1097172..eaf2581 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -414,7 +414,7 @@ // }) getUserDept().then((res) => { companyInfo.value = res.data - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/borrow/components/edit.vue b/src/views/tested/status/borrow/components/edit.vue index 61f4b21..628760c 100644 --- a/src/views/tested/status/borrow/components/edit.vue +++ b/src/views/tested/status/borrow/components/edit.vue @@ -81,7 +81,7 @@ ruleFormRef.value?.resetFields() const fetchDept = () => { getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/status/borrow/components/list.vue b/src/views/tested/status/borrow/components/list.vue index d50d3d8..50b634e 100644 --- a/src/views/tested/status/borrow/components/list.vue +++ b/src/views/tested/status/borrow/components/list.vue @@ -10,6 +10,7 @@ import { toTreeList } from '@/utils/structure' import { getDeptTreeList } from '@/api/system/dept' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -28,6 +29,7 @@ onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, 'DeviceBorrow') }) +const userStore = useUserStore() const { proxy } = getCurrentInstance() as any const listQuery = reactive({ approvalNo: '', @@ -253,7 +255,7 @@ const fetchDict = () => { // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/delay/components/delay.vue b/src/views/tested/status/delay/components/delay.vue index 5fdcfea..3568865 100644 --- a/src/views/tested/status/delay/components/delay.vue +++ b/src/views/tested/status/delay/components/delay.vue @@ -11,6 +11,7 @@ import { toTreeList, underlineToHump } from '@/utils/structure' import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept' import { getPostList } from '@/api/system/post' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -31,6 +32,7 @@ 未通过: '5', 已取消: '6', }) +const userStore = useUserStore() const statusDict = ref<{ [key: string]: string }>({ 1: 'sealpage', // 封存 2: 'unsealpage', // 启封 @@ -302,7 +304,7 @@ }) // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue index 994937b..bafeef2 100644 --- a/src/views/tested/status/delay/components/list.vue +++ b/src/views/tested/status/delay/components/list.vue @@ -12,6 +12,7 @@ import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept' import { getPostList } from '@/api/system/post' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const $props = defineProps({ // 审批状态 全部 审批等 statusName: { @@ -31,6 +32,7 @@ 4: 'ScrapPage', 5: 'DelayPage', } +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, stsusDictAlive[$props.statusType]) }) @@ -332,7 +334,7 @@ }) // companyId getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/status/maintain/index.vue b/src/views/tested/status/maintain/index.vue index 3952bc2..8525a02 100644 --- a/src/views/tested/status/maintain/index.vue +++ b/src/views/tested/status/maintain/index.vue @@ -8,6 +8,7 @@ import { toTreeList } from '@/utils/structure' import { getDeptTreeList } from '@/api/system/dept' import { keepSearchParams } from '@/utils/keepQuery' +import useUserStore from '@/store/modules/user' const { proxy } = getCurrentInstance() as any const $router = useRouter() // 查询条件 @@ -27,6 +28,7 @@ onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, 'DeviceMainList') }) +const userStore = useUserStore() // 申请开始结束时间 const datetimerange = ref() watch(() => datetimerange.value, (newVal) => { @@ -192,7 +194,7 @@ }) // 单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/subpackage/certificate/components/orderDialog.vue b/src/views/tested/subpackage/certificate/components/orderDialog.vue index 38c14b1..fc24dee 100644 --- a/src/views/tested/subpackage/certificate/components/orderDialog.vue +++ b/src/views/tested/subpackage/certificate/components/orderDialog.vue @@ -10,6 +10,7 @@ import { toTreeList } from '@/utils/structure' import { keepSearchParams } from '@/utils/keepQuery' import { getDictByCode } from '@/api/system/dict' +import useUserStore from '@/store/modules/user' const emits = defineEmits(['confirm']) const dialogFormVisible = ref(false) const singleChecked = ref(-1) @@ -82,7 +83,7 @@ const list = ref([]) const total = ref(0) const listLoading = ref(true) - +const userStore = useUserStore() // 获取列表数据 const fetchData = (isNowPage = true) => { list.value = [] @@ -152,7 +153,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) }) diff --git a/src/views/tested/subpackage/task/components/edit.vue b/src/views/tested/subpackage/task/components/edit.vue index 2f6cf00..faa080e 100644 --- a/src/views/tested/subpackage/task/components/edit.vue +++ b/src/views/tested/subpackage/task/components/edit.vue @@ -89,7 +89,7 @@ ruleFormRef.value?.resetFields() getUserDept().then((res) => { flag.value = true - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { isAdmin.value = true getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) diff --git a/src/views/tested/subpackage/task/components/list.vue b/src/views/tested/subpackage/task/components/list.vue index 0d6c0af..368f830 100644 --- a/src/views/tested/subpackage/task/components/list.vue +++ b/src/views/tested/subpackage/task/components/list.vue @@ -12,6 +12,7 @@ import { toTreeList } from '@/utils/structure' import { keepSearchParams } from '@/utils/keepQuery' import { getDictByCode } from '@/api/system/dict' +import useUserStore from '@/store/modules/user' const $props = defineProps({ statusName: { type: String, @@ -26,6 +27,7 @@ 未通过: '5', 已取消: '6', }) +const userStore = useUserStore() onBeforeRouteLeave((to: any) => { keepSearchParams(to.path, 'SubpackageReview') }) @@ -299,7 +301,7 @@ const fetchCommpany = () => { // 获取单位 getUserDept().then((res) => { - if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) { + if ((res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) && userStore.dataSopeType === '1') { getAdminDept({}).then((res) => { companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName })) })