diff --git a/admin/src/api/sysdicttype.js b/admin/src/api/sysdicttype.js index 31c3d11..f004849 100644 --- a/admin/src/api/sysdicttype.js +++ b/admin/src/api/sysdicttype.js @@ -62,3 +62,16 @@ export function sysdicttypeListApi(params) { }) } +/** + * sysdicttype详情 + * @param pram + */ +export function sysdicttypeTypesApi(types) { + return request({ + url: `autogencode/sysdicttype/types`, + method: 'GET', + params: { + types, + } + }) +} \ No newline at end of file diff --git a/admin/src/components/DictData/index.js b/admin/src/components/DictData/index.js index 8faffbd..35862d4 100644 --- a/admin/src/components/DictData/index.js +++ b/admin/src/components/DictData/index.js @@ -1,7 +1,7 @@ import Vue from 'vue' import store from '@/store' import DataDict from '@/utils/dict' -import { getDicts as getDicts, getBatchDicts } from '@/api/system/dict/data' +import { sysdicttypeTypesApi } from '@/api/system/dict/data' function searchDictByKey(dict, key) { if (key == null && key == "") { @@ -48,7 +48,7 @@ function install() { timer = null; isRequesting = true; // 批量获取字典 - getBatchDicts(requesting.map(item => item.type)).then(res => { + sysdicttypeTypesApi(requesting.map(item => item.type)).then(res => { const datas = res.data || {}; requesting.forEach(item => { store.dispatch('dict/setDict', { key: item.type, value: datas[item.type] || [] }); diff --git a/admin/src/components/FileUploadVO/index.vue b/admin/src/components/FileUploadVO/index.vue index df3480f..e94038d 100644 --- a/admin/src/components/FileUploadVO/index.vue +++ b/admin/src/components/FileUploadVO/index.vue @@ -237,7 +237,6 @@ export default { // SystemAttachment需要的字段 // 确保attId和fileId是独立的字段,不会相互覆盖 attId: fileInfo.attId || fileInfo.id || '', // 优先使用attId,fallback到id - fileId: fileInfo.fileId || fileInfo.id || '', // 优先使用fileId,fallback到id // 记录详细信息用于调试 debugInfo: { originalFileInfo: JSON.parse(JSON.stringify(fileInfo)), @@ -250,7 +249,7 @@ export default { attachFileUrl: fileInfo.url || fileInfo.path || '', remark: _this.uploadParame.remark || '', // 额外添加SystemAttachment需要的字段 - attSize: param.file.size ? param.file.size.toString() : '', // 附件大小 + attSize: param.file.size, // 附件大小 attType: param.file.name ? param.file.name.split('.').pop().toLowerCase() : '' // 附件类型 }; _this.uploadList.push(newFile); diff --git a/admin/src/views/cm/cust/qualify/file/cmcustqualifyfile-add-and-update.vue b/admin/src/views/cm/cust/qualify/file/cmcustqualifyfile-add-and-update.vue index 9aa168f..982600d 100644 --- a/admin/src/views/cm/cust/qualify/file/cmcustqualifyfile-add-and-update.vue +++ b/admin/src/views/cm/cust/qualify/file/cmcustqualifyfile-add-and-update.vue @@ -354,13 +354,11 @@ export default { } // 确保大数值ID以字符串形式传递 - const attId = file.id || file.fileId || '' - const fileId = file.id || file.fileId || '' + const attId = file.attId || ''; return { // 兼容SystemAttachment的字段名称 - attId: attId.toString(), // 确保转换为字符串 - fileId: fileId.toString(), // 确保转换为字符串 + attId: attId, // 确保转换为字符串 name: file.name || file.fileName || '', oldName: file.name || file.fileName || '', attachFileUrl: attachFileUrl, @@ -398,13 +396,11 @@ export default { } // 确保大数值ID以字符串形式传递,避免Integer溢出问题 - const attId = file.id || file.fileId || '' - const fileId = file.id || file.fileId || '' + const attId = file.id || file.attId || '' return { // 严格按照SystemAttachment的字段要求设置 - attId: attId.toString(), // 确保转换为字符串 - fileId: fileId.toString(), // 附件id,确保转换为字符串 + attId: attId, // 确保转换为字符串 name: file.name || file.oldName || '', // 附件名称 attDir: attDir, // 附件路径 attSize: file.attSize || '', // 附件大小