diff --git a/src/utils/systemConfig.js b/src/utils/systemConfig.js index 418062d..f6e3a74 100644 --- a/src/utils/systemConfig.js +++ b/src/utils/systemConfig.js @@ -3,7 +3,6 @@ import {encryptWithSM4} from '@/utils/sm'; export async function getSystemConfigApi() { await getNoAuthConfig().then(res => { - console.log(res.data); sessionStorage.setItem('systemConfig', encryptWithSM4(JSON.stringify(res.data))); }).catch(error => { console.error('Failed to fetch config:', error); diff --git a/src/views/archivesManagement/archClass/archCatalogue/components/addTableData.vue b/src/views/archivesManagement/archClass/archCatalogue/components/addTableData.vue index 3f77dda..0470873 100644 --- a/src/views/archivesManagement/archClass/archCatalogue/components/addTableData.vue +++ b/src/views/archivesManagement/archClass/archCatalogue/components/addTableData.vue @@ -93,6 +93,12 @@ export default { { required: true, message: '请选择文件分类标记', trigger: 'change' } ], }, + errorObj: { + contentName: '文件题名', + term: '案卷期限', + unitName:'归档责任单位', + major:'所属专业', + }, }; }, created() { @@ -193,7 +199,7 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } else { editArchiveRightApi(params).then(res => { @@ -205,11 +211,22 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } } }); + }, + errorMsg(error) { + const errorMessage = error.message; + const errorArr = errorMessage.split('：'); + const errorObjData = errorArr.length > 1 ? JSON.parse(errorArr[1]) : ''; + if(errorObjData){ + return this.errorObj[errorObjData.paramName] + errorArr[0] + ':' + errorObjData.originalValue; + }else{ + return errorMessage; + } + } } }; diff --git a/src/views/archivesManagement/archClass/archCatalogue/components/addTreeData.vue b/src/views/archivesManagement/archClass/archCatalogue/components/addTreeData.vue index 7c96c8b..8f281f6 100644 --- a/src/views/archivesManagement/archClass/archCatalogue/components/addTreeData.vue +++ b/src/views/archivesManagement/archClass/archCatalogue/components/addTreeData.vue @@ -64,6 +64,10 @@ export default { { required: true, message: '分类号不能为空', trigger: 'blur' } ], }, + errorObj: { + contentName: '分类名称', + sort: '分类号', + }, }; }, computed: { @@ -104,14 +108,18 @@ export default { const isNonRootParent = this.form && this.form.parentId !== 0 && this.form.parentId !== undefined && this.form.parentId !== null; if (isNonRootParent) { if (field === 'contentName') { + this.errorObj.contentName = '案卷题名'; return '案卷题名'; } else if (field === 'sort') { + this.errorObj.sort = '案卷排序号'; return '案卷排序号'; } } if (field === 'contentName') { + this.errorObj.contentName = '分类名称'; return '分类名称'; } else if (field === 'sort') { + this.errorObj.sort = '分类号'; return '分类号'; } return ''; @@ -285,7 +293,7 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } else { editArchiveLeftApi(params).then(res => { @@ -297,11 +305,22 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } } }); + }, + errorMsg(error) { + const errorMessage = error.message; + const errorArr = errorMessage.split('：'); + const errorObjData = errorArr.length > 1 ? JSON.parse(errorArr[1]) : ''; + if(errorObjData){ + return this.errorObj[errorObjData.paramName] + errorArr[0] + ':' + errorObjData.originalValue; + }else{ + return errorMessage; + } + } } }; diff --git a/src/views/archivesManagement/archClass/archClassification/prop/fileDimensionForm.vue b/src/views/archivesManagement/archClass/archClassification/prop/fileDimensionForm.vue index 6969395..9dc8f10 100644 --- a/src/views/archivesManagement/archClass/archClassification/prop/fileDimensionForm.vue +++ b/src/views/archivesManagement/archClass/archClassification/prop/fileDimensionForm.vue @@ -179,7 +179,12 @@ export default { const errorMessage = error.message; const errorArr = errorMessage.split('：'); const errorObjData = errorArr.length > 1 ? JSON.parse(errorArr[1]) : ''; - return this.errorObj[errorObjData.paramName] + errorArr[0] + ':' + errorObjData.originalValue; + if(errorObjData){ + return this.errorObj[errorObjData.paramName] + errorArr[0] + ':' + errorObjData.originalValue; + }else{ + return errorMessage; + } + } } }; diff --git a/src/views/archivesManagement/archClass/archCustomClassification/prop/customizeForm.vue b/src/views/archivesManagement/archClass/archCustomClassification/prop/customizeForm.vue index 6c34084..30364a2 100644 --- a/src/views/archivesManagement/archClass/archCustomClassification/prop/customizeForm.vue +++ b/src/views/archivesManagement/archClass/archCustomClassification/prop/customizeForm.vue @@ -46,6 +46,10 @@ export default { { required: true, message: '自定义分类名称不能为空', trigger: 'blur' } ], }, + errorObj: { + customizeClassifyName: '自定义分类名称', + classifyDesc: '分类描述', + }, }; }, created() { @@ -122,7 +126,7 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } else { updateKyFilesCustomizeClassifyAPI(params).then(res => { @@ -134,11 +138,22 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } } }); + }, + errorMsg(error) { + const errorMessage = error.message; + const errorArr = errorMessage.split('：'); + const errorObjData = errorArr.length > 1 ? JSON.parse(errorArr[1]) : ''; + if(errorObjData){ + return this.errorObj[errorObjData.paramName] + errorArr[0] + ':' + errorObjData.originalValue; + }else{ + return errorMessage; + } + } } }; diff --git a/src/views/archivesManagement/archClass/fileClassificationNamingConvention/prop/classifyNameStandardForm.vue b/src/views/archivesManagement/archClass/fileClassificationNamingConvention/prop/classifyNameStandardForm.vue index 3590465..df3af25 100644 --- a/src/views/archivesManagement/archClass/fileClassificationNamingConvention/prop/classifyNameStandardForm.vue +++ b/src/views/archivesManagement/archClass/fileClassificationNamingConvention/prop/classifyNameStandardForm.vue @@ -57,6 +57,10 @@ export default { { required: true, message: '规范识别值不能为空', trigger: 'blur' } ], }, + errorObj: { + standardName: '规范识别值', + remark: '备注', + }, }; }, created() { @@ -135,7 +139,7 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } else { editClassifyNameStandardAPI(params).then(res => { @@ -147,11 +151,22 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } } }); + }, + errorMsg(error) { + const errorMessage = error.message; + const errorArr = errorMessage.split('：'); + const errorObjData = errorArr.length > 1 ? JSON.parse(errorArr[1]) : ''; + if(errorObjData){ + return this.errorObj[errorObjData.paramName] + errorArr[0] + ':' + errorObjData.originalValue; + }else{ + return errorMessage; + } + } } }; diff --git a/src/views/archivesManagement/archClass/fileClassificationTags/prop/classifiyMarkForm.vue b/src/views/archivesManagement/archClass/fileClassificationTags/prop/classifiyMarkForm.vue index e136888..11cc331 100644 --- a/src/views/archivesManagement/archClass/fileClassificationTags/prop/classifiyMarkForm.vue +++ b/src/views/archivesManagement/archClass/fileClassificationTags/prop/classifiyMarkForm.vue @@ -46,6 +46,10 @@ export default { { required: true, message: '文件分类标记名称不能为空', trigger: 'blur' } ], }, + errorObj: { + classifyMarkName: '文件分类标记名称', + remark: '备注', + }, }; }, created() { @@ -121,7 +125,7 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } else { editArchivalCatalogueAPI(params).then(res => { @@ -133,11 +137,22 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } } }); + }, + errorMsg(error) { + const errorMessage = error.message; + const errorArr = errorMessage.split('：'); + const errorObjData = errorArr.length > 1 ? JSON.parse(errorArr[1]) : ''; + if(errorObjData){ + return this.errorObj[errorObjData.paramName] + errorArr[0] + ':' + errorObjData.originalValue; + }else{ + return errorMessage; + } + } } }; diff --git a/src/views/archivesManagement/fileManager/components/addTreeData.vue b/src/views/archivesManagement/fileManager/components/addTreeData.vue index 44c560a..d504115 100644 --- a/src/views/archivesManagement/fileManager/components/addTreeData.vue +++ b/src/views/archivesManagement/fileManager/components/addTreeData.vue @@ -64,6 +64,10 @@ export default { { required: true, message: '分类号不能为空', trigger: 'blur' } ], }, + errorObj: { + contentName: '分类名称', + sort: '分类号', + }, }; }, computed: { @@ -104,14 +108,18 @@ export default { const isNonRootParent = this.form && this.form.parentId !== 0 && this.form.parentId !== undefined && this.form.parentId !== null; if (isNonRootParent) { if (field === 'contentName') { + this.errorObj.contentName = '案卷题名'; return '案卷题名'; } else if (field === 'sort') { + this.errorObj.sort = '案卷排序号'; return '案卷排序号'; } } if (field === 'contentName') { + this.errorObj.contentName = '分类名称'; return '分类名称'; } else if (field === 'sort') { + this.errorObj.sort = '分类号'; return '分类号'; } return ''; @@ -287,7 +295,7 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } else { updateFileManageLeftApi(params).then(res => { @@ -299,11 +307,22 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } } }); + }, + errorMsg(error) { + const errorMessage = error.message; + const errorArr = errorMessage.split('：'); + const errorObjData = errorArr.length > 1 ? JSON.parse(errorArr[1]) : ''; + if(errorObjData){ + return this.errorObj[errorObjData.paramName] + errorArr[0] + ':' + errorObjData.originalValue; + }else{ + return errorMessage; + } + } } }; diff --git a/src/views/data-collect/data-class-manage/prop/dataClassForm.vue b/src/views/data-collect/data-class-manage/prop/dataClassForm.vue index 7afa521..b42992c 100644 --- a/src/views/data-collect/data-class-manage/prop/dataClassForm.vue +++ b/src/views/data-collect/data-class-manage/prop/dataClassForm.vue @@ -57,6 +57,10 @@ export default { { required: true, message: '数据类型名称不能为空', trigger: 'blur' } ], }, + errorObj: { + dataTypeName: '数据类型名称', + remark: '备注', + }, }; }, created() { @@ -136,7 +140,7 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } else { @@ -149,11 +153,22 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } } }); + }, + errorMsg(error) { + const errorMessage = error.message; + const errorArr = errorMessage.split('：'); + const errorObjData = errorArr.length > 1 ? JSON.parse(errorArr[1]) : ''; + if(errorObjData){ + return this.errorObj[errorObjData.paramName] + errorArr[0] + ':' + errorObjData.originalValue; + }else{ + return errorMessage; + } + } } }; diff --git a/src/views/filesTransfer/apply/prop/applyForm.vue b/src/views/filesTransfer/apply/prop/applyForm.vue index 19f81cd..e2a4cbe 100644 --- a/src/views/filesTransfer/apply/prop/applyForm.vue +++ b/src/views/filesTransfer/apply/prop/applyForm.vue @@ -249,7 +249,7 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } else { editTransferApplyApi(params).then(res => { @@ -261,12 +261,23 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } } }); }, + errorMsg(error) { + const errorMessage = error.message; + const errorArr = errorMessage.split('：'); + const errorObjData = errorArr.length > 1 ? JSON.parse(errorArr[1]) : ''; + if(errorObjData){ + return this.errorObj[errorObjData.paramName] + errorArr[0] + ':' + errorObjData.originalValue; + }else{ + return errorMessage; + } + + }, // 树数据过滤 - 支持无限层级转换 convertToVueTree(data, level = 1) { if (!data || !Array.isArray(data)) { diff --git a/src/views/filesTransfer/detail-data.vue b/src/views/filesTransfer/detail-data.vue index 32af7d3..75b0d62 100644 --- a/src/views/filesTransfer/detail-data.vue +++ b/src/views/filesTransfer/detail-data.vue @@ -136,6 +136,9 @@ export default { isViewflag: false, row: {}, title: "", + errorObj: { + approvalComment: '审批意见', + }, } }, computed: { @@ -258,15 +261,37 @@ export default { }, // 审核 auditTransferApply(auditStatus) { + // 显示遮罩层 + this.loading = this.$loading({ + lock: true, + text: "数据提交中，请稍候...", + background: 'rgba(0,0,0,0.5)', + target: this.$el.querySelector('.el-dialog') || document.body + }) auditTransferApplyApi({ id: this.id, auditOpinion: this.approvalComment.trim(), auditStatus: auditStatus }).then(res => { + this.loading.close(); this.$message.success(res.msg || '审核成功'); this.handleClose(); + }).catch(error => { + this.loading.close(); + this.$modal.msgError(this.errorMsg(error)); }) + }, + errorMsg(error) { + const errorMessage = error.message; + const errorArr = errorMessage.split('：'); + const errorObjData = errorArr.length > 1 ? JSON.parse(errorArr[1]) : ''; + if(errorObjData){ + return this.errorObj[errorObjData.paramName] + errorArr[0] + ':' + errorObjData.originalValue; + }else{ + return errorMessage; + } + } } } diff --git a/src/views/filesTransfer/encryption/prop/encryptionForm.vue b/src/views/filesTransfer/encryption/prop/encryptionForm.vue index 893e7b4..78f127c 100644 --- a/src/views/filesTransfer/encryption/prop/encryptionForm.vue +++ b/src/views/filesTransfer/encryption/prop/encryptionForm.vue @@ -60,6 +60,10 @@ export default { { required: true, message: '档案加密参数不能为空', trigger: 'blur' } ], }, + errorObj: { + encryptName: '档案加密名称', + encryptParams: '档案加密参数', + }, }; }, created() { @@ -138,7 +142,7 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } else { updateEncryTypeAPI(params).then(res => { @@ -150,11 +154,22 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } } }); + }, + errorMsg(error) { + const errorMessage = error.message; + const errorArr = errorMessage.split('：'); + const errorObjData = errorArr.length > 1 ? JSON.parse(errorArr[1]) : ''; + if(errorObjData){ + return this.errorObj[errorObjData.paramName] + errorArr[0] + ':' + errorObjData.originalValue; + }else{ + return errorMessage; + } + } } }; diff --git a/src/views/filesTransfer/issue/prop/issueForm.vue b/src/views/filesTransfer/issue/prop/issueForm.vue index 1e879b3..4bd63be 100644 --- a/src/views/filesTransfer/issue/prop/issueForm.vue +++ b/src/views/filesTransfer/issue/prop/issueForm.vue @@ -80,6 +80,9 @@ export default { { required: true, message: '请选择移交时间', trigger: 'blur' } ], }, + errorObj: { + transferIssue: '移交问题', + }, }; }, @@ -192,7 +195,7 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } else { editTransferProblemApi(params).then(res => { @@ -204,7 +207,7 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } } @@ -242,6 +245,17 @@ export default { } return null; }, + errorMsg(error) { + const errorMessage = error.message; + const errorArr = errorMessage.split('：'); + const errorObjData = errorArr.length > 1 ? JSON.parse(errorArr[1]) : ''; + if(errorObjData){ + return this.errorObj[errorObjData.paramName] + errorArr[0] + ':' + errorObjData.originalValue; + }else{ + return errorMessage; + } + + } } }; diff --git a/src/views/system/setting/components/settingForm.vue b/src/views/system/setting/components/settingForm.vue index ff2d15d..d94e4af 100644 --- a/src/views/system/setting/components/settingForm.vue +++ b/src/views/system/setting/components/settingForm.vue @@ -54,6 +54,10 @@ export default { { required: true, message: '请输入参数编码', trigger: 'blur' } ], }, + errorObj: { + configName: '参数名称', + configCode: '参数编码', + }, }; }, created() { @@ -134,7 +138,7 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } else { editAPI(params).then(res => { @@ -146,11 +150,22 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } } }); + }, + errorMsg(error) { + const errorMessage = error.message; + const errorArr = errorMessage.split('：'); + const errorObjData = errorArr.length > 1 ? JSON.parse(errorArr[1]) : ''; + if(errorObjData){ + return this.errorObj[errorObjData.paramName] + errorArr[0] + ':' + errorObjData.originalValue; + }else{ + return errorMessage; + } + } } }; diff --git a/src/views/system/white/prop/whiteForm.vue b/src/views/system/white/prop/whiteForm.vue index 0de0a17..4a3d643 100644 --- a/src/views/system/white/prop/whiteForm.vue +++ b/src/views/system/white/prop/whiteForm.vue @@ -76,6 +76,11 @@ export default { { validator: (rule, value, callback) => this.validateIpRangeEndDes(value, callback), trigger: 'blur' } ], }, + errorObj: { + ipAddressDes: '单个IP地址', + ipRangeStartDes: 'IP网段起始地址', + ipRangeEndDes: 'IP网段结束地址', + }, }; }, created() { @@ -272,7 +277,7 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } else { updateWhiteAPI(params).then(res => { @@ -284,11 +289,22 @@ export default { } }).catch(error => { this.loading.close(); - // this.$modal.msgError('提交失败，请重试'); + this.$modal.msgError(this.errorMsg(error)); }); } } }); + }, + errorMsg(error) { + const errorMessage = error.message; + const errorArr = errorMessage.split('：'); + const errorObjData = errorArr.length > 1 ? JSON.parse(errorArr[1]) : ''; + if(errorObjData){ + return this.errorObj[errorObjData.paramName] + errorArr[0] + ':' + errorObjData.originalValue; + }else{ + return errorMessage; + } + } } };