From f12d455df07804a803bdec27931cf0707c77049b Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 6 May 2022 11:54:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/UpdateLog/index.vue | 13 ++-- .../library/docDetail/index.vue | 18 ++++- .../virtualList/components/editModel.vue | 68 +++++++++++------ .../components/virtualListDetails.vue | 29 ++++--- .../components/circulationHistory.vue | 20 ++++- .../components/standardContentList.vue | 20 ++++- .../projectManagement/components/addModel.vue | 4 + .../components/historicalVersionList.vue | 15 ++-- .../components/listEditModel.vue | 75 +++++++++++++++---- .../components/listOfRegulations.vue | 29 +++++-- .../historicalVersion/index.vue | 20 ++++- 11 files changed, 228 insertions(+), 83 deletions(-) diff --git a/jero-web/src/components/UpdateLog/index.vue b/jero-web/src/components/UpdateLog/index.vue index aa9143d42..bed4a98e7 100644 --- a/jero-web/src/components/UpdateLog/index.vue +++ b/jero-web/src/components/UpdateLog/index.vue @@ -5,9 +5,12 @@ :visible="visible" :confirm-loading="confirmLoading" :maskClosable="false" - @ok="handleOk" - @cancel="handleCancel" > + + - + {{$t('See')}} @@ -351,6 +356,13 @@ getAction('document/bussDocumentLibraryEO/getFileInfos', { id: item.join(',') }).then((res) => { if (res.success) { this.dataSourceFile = res.result + this.dataSourceFile.forEach((val) => { + let fileName = val.fileName + let index1 = fileName.lastIndexOf('.') + let index2 = fileName.length + let fileSuffix = fileName.substring(index1, index2) + val.fileSuffix = fileSuffix + }) this.loading = false } else { this.dataSourceFile = [] diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 70a39c849..9401e5bb7 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -74,9 +74,9 @@ :title="$t('scopeOfApplication')">{{$t('scopeOfApplication')}} - - - + + + { this.formInline = item || {} this.formInline.technologyTerritory = this.formInline.technologyTerritory ? this.formInline.technologyTerritory.split(',') : [] - console.log(this.formInline.technologyTerritory) + this.$refs.ruleForm.clearValidate() }) }, clickButtonToUpload(item) { @@ -576,22 +598,26 @@ this.visible = false }, handleSubmit() { - let formInline = JSON.parse(JSON.stringify(this.formInline)) - Object.keys(formInline).forEach(res => { - if (formInline[res] && formInline[res] instanceof Array) { - formInline[res] = formInline[res].join(',') - } - }) - this.confirmLoading = true - postAction(this.url.editModel, formInline).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false - this.confirmLoading = false - this.$emit('editModelList') - } else { - this.$message.warning(this.$t('operationFailed')) - this.confirmLoading = false + this.$refs.ruleForm.validate(valid => { + if (valid) { + let formInline = JSON.parse(JSON.stringify(this.formInline)) + Object.keys(formInline).forEach(res => { + if (formInline[res] && formInline[res] instanceof Array) { + formInline[res] = formInline[res].join(',') + } + }) + this.confirmLoading = true + postAction(this.url.editModel, formInline).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.confirmLoading = false + this.$emit('editModelList') + } else { + this.$message.warning(this.$t('operationFailed')) + this.confirmLoading = false + } + }) } }) }, diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 78812a1f0..7dad3ea1a 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -184,9 +184,12 @@ :width="600" :visible="visibleFile" :maskClosable="false" - @ok="visibleFile = false" - @cancel="visibleFile = false" > + - + {{$t('See')}} @@ -336,8 +340,8 @@ title: 'WVTA ID', align: 'center', dataIndex: 'wvtaId', - width: 100, - ellipsis: true + width: 180, + scopedSlots: { customRender: 'titleName' } }, { title: this.$t('certificationType'), @@ -366,8 +370,8 @@ { title: this.$t('remarks'), align: 'center', - ellipsis: true, - dataIndex: 'remark' + dataIndex: 'remark', + scopedSlots: { customRender: 'titleName' } }, { @@ -568,7 +572,7 @@ }, //模板下载 handleModule() { - downloadFile(this.url.exportTemplate, this.$t('VirtualList')+this.$t('importTemplate')+'.xls', {}) + downloadFile(this.url.exportTemplate, this.$t('VirtualList') + this.$t('importTemplate') + '.xls', {}) }, //导出 handleExport() { @@ -579,7 +583,7 @@ ids: selectedRowKeys.join(','), dummyInventoryBaseId: this.$route.query.id } - downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualList')+'.zip', query, this.Deselect) + downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualList') + '.zip', query, this.Deselect) }, Deselect() { this.selectedRowKeys = [] @@ -737,6 +741,13 @@ getAction('sys/common/getFileInfos', { id: item }).then((res) => { if (res.success) { this.dataSourceFile = res.result + this.dataSourceFile.forEach((val) => { + let fileName = val.fileName + let index1 = fileName.lastIndexOf('.') + let index2 = fileName.length + let fileSuffix = fileName.substring(index1, index2) + val.fileSuffix = fileSuffix + }) this.loading = false } else { this.dataSourceFile = [] diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue index f15a2f721..3490a61d3 100644 --- a/jero-web/src/views/processCenter/components/circulationHistory.vue +++ b/jero-web/src/views/processCenter/components/circulationHistory.vue @@ -30,9 +30,12 @@ :width="600" :visible="visibleFile" :maskClosable="false" - @ok="visibleFile = false" - @cancel="visibleFile = false" > + - - {{ $t('See') }} + + {{$t('See')}} {{ $t('download') }} @@ -146,6 +151,13 @@ getAction('sys/common/getFileInfos', { id: item }).then((res) => { if (res.success) { this.dataSourceFile = res.result + this.dataSourceFile.forEach((val) => { + let fileName = val.fileName + let index1 = fileName.lastIndexOf('.') + let index2 = fileName.length + let fileSuffix = fileName.substring(index1, index2) + val.fileSuffix = fileSuffix + }) this.loading = false } else { this.dataSourceFile = [] diff --git a/jero-web/src/views/processCenter/components/standardContentList.vue b/jero-web/src/views/processCenter/components/standardContentList.vue index f8f464c60..81dedd976 100644 --- a/jero-web/src/views/processCenter/components/standardContentList.vue +++ b/jero-web/src/views/processCenter/components/standardContentList.vue @@ -44,9 +44,12 @@ :width="600" :visible="visibleFile" :maskClosable="false" - @ok="visibleFile = false" - @cancel="visibleFile = false" > + - - {{ $t('See') }} + + {{$t('See')}} {{ $t('download') }} @@ -232,6 +237,13 @@ getAction('sys/common/getFileInfos', { id: item }).then((res) => { if (res.success) { this.dataSourceFile = res.result + this.dataSourceFile.forEach((val) => { + let fileName = val.fileName + let index1 = fileName.lastIndexOf('.') + let index2 = fileName.length + let fileSuffix = fileName.substring(index1, index2) + val.fileSuffix = fileSuffix + }) this.loading = false } else { this.dataSourceFile = [] diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index c2238236c..36894abec 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -187,6 +187,7 @@