diff --git a/src/store/modules/user.js b/src/store/modules/user.js index baec5f6..dcf7039 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -16,6 +16,7 @@ const useUserStore = defineStore( userName: '', avatar: '', phoneNumber: '', + dataScopeDeptId: '', roles: [], permissions: [] }), @@ -50,13 +51,14 @@ const useUserStore = defineStore( this.permissions = res.permissions } else { this.roles = ['ROLE_DEFAULT'] - } + } this.id = user.userId this.name = user.realName // this.nickName = user.nickName this.userName = user.userName this.avatar = avatar this.phoneNumber = user.phonenumber + this.dataScopeDeptId = user.deptId /* 初始密码提示 */ if(res.isDefaultModifyPwd) { ElMessageBox.confirm('您的密码还是初始密码,请修改密码!', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { diff --git a/src/views/mediaLibrary/exportDialog.vue b/src/views/mediaLibrary/exportDialog.vue index a510c4d..8e15b57 100644 --- a/src/views/mediaLibrary/exportDialog.vue +++ b/src/views/mediaLibrary/exportDialog.vue @@ -1314,6 +1314,7 @@ const ckdxPriceFild = ref([ // 导出提交信息 const exportForm = ref({ ids: undefined, + dataScopeDeptId: undefined, exportBaseFields: undefined, mediaTypeExport: [], hasFiles: false @@ -1711,6 +1712,12 @@ const initExportExcel = (_mediaIds, _curDeptIds) => { exportForm.value.ids = _mediaIds curDeptIds.value = _curDeptIds + if (_curDeptIds && _curDeptIds.length == 2) exportForm.value.dataScopeDeptId = undefined + else { + console.log('走了这里?', _curDeptIds) + exportForm.value.dataScopeDeptId = _curDeptIds[0] + } + exportOpen.value = true getMediaExcelBaseField() getMediaExcelPriceField() diff --git a/src/views/mediaLibrary/index.vue b/src/views/mediaLibrary/index.vue index 48d0d55..5fbc13f 100644 --- a/src/views/mediaLibrary/index.vue +++ b/src/views/mediaLibrary/index.vue @@ -180,8 +180,8 @@ @@ -300,6 +300,7 @@ import { mediaPageList, deleteMedia } from "@/api/mediaLibrary" import { listDept } from "@/api/system/dept" import { pptTemplatePage } from "@/api/system/pptTemplate" import { busDownloadRecordPage } from "@/api/mediaDownRecord" +import useUserStore from '@/store/modules/user' // 注入组件 import mediaForm from "./mediaForm.vue"; import mediaDetail from "./mediaDetail.vue"; @@ -313,7 +314,7 @@ import exportPPTDialog from './exportPPTDialog.vue'; import importPrice from './importPrice.vue'; import downRecords from './downRecords.vue'; import { useBackgroundStore } from '@/store/modules/background' - +const userStore = useUserStore() const router = useRouter() const bgStore = useBackgroundStore() const { proxy } = getCurrentInstance() @@ -416,6 +417,8 @@ const tableRef = ref(null) // 添加一个标志位来区分是用户操作还是程序设置 const isSettingSelection = ref(false) +const uniqueDeptIds = ref([]) + // 加载图片(异步+并发控制) const loadMediaImage = (row) => { // 已加载/正在加载,直接返回 @@ -794,9 +797,10 @@ const handleExportExcel = () => { // proxy.$modal.msgWarning("请选择要导出的媒体!!!") // return false // } - const mediaIds = multipleChoseArr.value.map(item => item.id); - const uniqueDeptIds = [...new Set(multipleChoseArr.value.map(item => item.dataScopeDeptId))]; - exportDialogRef.value.initExportExcel(mediaIds, uniqueDeptIds) + const mediaIds = multipleChoseArr.value.map(item => item.id); + if (multipleChoseArr.value.length == 0) uniqueDeptIds.value = [userStore.dataScopeDeptId] + else uniqueDeptIds.value = [...new Set(multipleChoseArr.value.map(item => item.dataScopeDeptId))]; + exportDialogRef.value.initExportExcel(mediaIds, uniqueDeptIds.value) } /** 导出PPT按钮操作 */ const handleExportPPT = (tempId) => { @@ -827,7 +831,7 @@ onMounted(() => {