diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 937d655fd..5de197f99 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1190,4 +1190,5 @@ module.exports = { selectDirectorylocation: 'Please select the directory location to add the folder', Fileuploaded:'File uploaded, please wait', uploadedbyyourself:'You can only delete files and data uploaded by yourself', + Fileuploaded:'File uploading, please wait', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index d03b7b2da..13d263c5a 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1193,4 +1193,5 @@ module.exports = { Checkthepermissions:'查看权限', onlyFilesUploaded:'只能上传.docx、.doc文件', uploadedbyyourself:'只能删除自己上传的文件数据', + Fileuploaded:'文件上传中,请稍后', } \ No newline at end of file diff --git a/jero-web/src/views/externalReports/components/addModel.vue b/jero-web/src/views/externalReports/components/addModel.vue index 0e95682ca..d45561f2a 100644 --- a/jero-web/src/views/externalReports/components/addModel.vue +++ b/jero-web/src/views/externalReports/components/addModel.vue @@ -20,11 +20,11 @@ {{$t('fileName')}} - + - {{ (formInline.sourceFileId === 'null' || formInline.sourceFileId === '' || - formInline.sourceFileId == null) ? $t('clickUpload') : $t('viewUploadedFiles') + @click="clickButtonToUpload('fileKey')"> + {{ (formInline.fileKey === 'null' || formInline.fileKey === '' || + formInline.fileKey == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} @@ -38,12 +38,12 @@ {{$t('fileDeclaration')}} - + + v-model="formInline.fileDescription"/> @@ -86,17 +86,18 @@ export default { formInline: {}, confirmLoading: false, spinning: false, + menuId:'', visible: false, url: { - add: 'params/template/add', - edit: 'params/template/edit', + add: 'com.jero.modules.extRepo/extRepoData/add', + edit: 'com.jero.modules.extRepo/extRepoData/edit', }, rules: { - description:[ + fileDescription:[ // { required: true, message: this.$t('PleaseEnter')+this.$t('fileDeclaration'), trigger: 'blur' }, { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, ], - sourceFileId: [ + fileKey: [ { required: true, message: this.$t('fileName') + this.$t('cannotEmpty'), @@ -122,9 +123,10 @@ export default { } }) }, - addModel() { + addModel(menuId) { this.visible = true this.title = this.$t('UploadFile') + this.menuId = menuId this.formInline = {} this.$nextTick(() => { this.$refs['ruleForm'].clearValidate() @@ -147,9 +149,6 @@ export default { } }, handleSubmit() { - if(this.formInline.paramsTemplateName !== undefined) { - this.formInline.paramsTemplateName = this.formInline.paramsTemplateName.trim() - } this.$refs.ruleForm.validate(valid => { if (valid) { this.spinning = true @@ -162,21 +161,23 @@ export default { url = this.url.add Action = postAction } + this.formInline.supFolder = this.menuId let query = JSON.parse(JSON.stringify(this.formInline)) Object.keys(query).forEach(res => { if (query[res] && query[res] instanceof Array) { query[res] = query[res].join(',') } }) - postAction(url, query).then((res) => { + Action(url, query).then((res) => { if (res.success) { this.spinning = false - this.$message.success(this.$t('OperationSuccessful')) + // this.$message.success(this.$t('OperationSuccessful')) + this.$message.success(res.message) this.visible = false this.$emit('addModelList') } else { this.spinning = false - this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) this.confirmLoading = false } }) diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 95b590d0a..6087204b7 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -43,16 +43,16 @@