From 6c432ddfa5ad1e3642dac3dd0d7f15a10f7c0b6b Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 22 Feb 2022 15:13:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/libraryAddForm/index.vue | 17 +- jero-web/src/components/tableDate/index.vue | 16 +- jero-web/src/components/uploadFile/file.vue | 2 - .../library/docDetail/index.vue | 397 +++++++----------- 4 files changed, 176 insertions(+), 256 deletions(-) diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 1f204c05c..b9e359c48 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -293,16 +293,25 @@ // moment(date).format('YYYY-MM-DD') }, clickButtonToUpload(current) { + this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true this.uploadName = current + getAction('sys/common/getFileInfos', { connectId: this.formInline[current] }).then((res) => { + if (res.success) { + this.$refs.uploadFile.perentHandleFunc(res.result) + } else { + this.$refs.uploadFile.perentHandleFunc() + } + }) }, /** 上传文件的回调 */ uploadSuccess(data) { - console.log(data) let attIdList = [] - data.map(item => { - attIdList.push(item.id || data.name) - }) + if (data && data.length > 0) { + data.map(item => { + attIdList.push(item.id || data.name) + }) + } /** 赋值给当前对应的表单文件 */ this.formInline[this.uploadName] = attIdList.join(',') this.formInline = { ...this.formInline } diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue index 36eb70d66..057fa8b6f 100644 --- a/jero-web/src/components/tableDate/index.vue +++ b/jero-web/src/components/tableDate/index.vue @@ -66,8 +66,8 @@ columns: [], selectedRowKeys: [], dataSource: [], - pageNo: '1', - pageSize: '10', + pageNo: 1, + pageSize: 10, total: 0, searchParmes: {}, loading: false @@ -102,7 +102,7 @@ }) }) let width - if (this.OperationList.length > 0){ + if (this.OperationList.length > 0) { width = this.OperationList.length * 55 } if (this.showAction) { @@ -118,10 +118,12 @@ }) }, getTableList() { + let pageNo = JSON.parse(JSON.stringify(this.pageNo)) + let pageSize = JSON.parse(JSON.stringify(this.pageSize)) let params = { ...this.searchParmes, - pageNo: this.pageNo, - pageSize: this.pageSize + pageNo: pageNo + '', + pageSize: pageSize + '' } this.loading = true postAction(this.url.tableList, params).then((res) => { @@ -133,11 +135,11 @@ }) }, onChange(page, pageSize) { - this.pageNo = page+'' + this.pageNo = page this.getTableList() }, SizeChange(page, pageSize) { - this.pageSize = pageSize+'' + this.pageSize = pageSize this.getTableList() }, onSelectChange() { diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index 244a8532a..b7c84c3ea 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -50,7 +50,6 @@ methods:{ perentHandleFunc(data){ this.myfileList = data - this.fileList = data if (data && data.length > 0){ this.myfileList.forEach((res)=>{ res.name = res.fileName @@ -58,7 +57,6 @@ }) }else { this.myfileList = [] - this.fileList = [] } }, beforeUpload(file) { diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index 9e741e9a5..d587e0c70 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -1,279 +1,190 @@