diff --git a/src/api/common.js b/src/api/common.js index 5e5244c..740e874 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -155,4 +155,15 @@ export function getDicAssetTreeList() { url: '/sedirectory/getList', method: 'get' }) +} +export function rebutFn(params) { + return api({ + url: '/flow/bohui', + method: 'post', + data: params, + paramsSerializer: function(data) { + console.log(require('qs').stringify(data, { indices: false }), 8888888888888) + return require('qs').stringify(data, { indices: false }) + } + }) } diff --git a/src/components/Notice/message.vue b/src/components/Notice/message.vue index a5dedc5..1631b14 100644 --- a/src/components/Notice/message.vue +++ b/src/components/Notice/message.vue @@ -129,7 +129,9 @@ export default { readListQuery: { pageNum: 1, pageRow: 20, - searchReadMessage: {} + searchReadMessage: {}, + content: '', + title: '' }, readMultipleSelection: [], recycleMessage: [], diff --git a/src/views/archive/archive_scan.vue b/src/views/archive/archive_scan.vue index 98043db..c12ac99 100644 --- a/src/views/archive/archive_scan.vue +++ b/src/views/archive/archive_scan.vue @@ -161,7 +161,7 @@ export default { this.archive.archiveCount = this.paramList.length this.server({ - url: '/archive/archive/addNew', + url: '/archive', method: 'post', data: { archive: this.archive, diff --git a/src/views/bggl/components/original_db_list.vue b/src/views/bggl/components/original_db_list.vue index 46c7282..4b3b651 100644 --- a/src/views/bggl/components/original_db_list.vue +++ b/src/views/bggl/components/original_db_list.vue @@ -285,6 +285,16 @@ + + + + + 多张图片可合成一份pdf文件进行上传 { + this.AllFlowUser = res + console.log(this.AllFlowUser) + }) + }, onRemove(file) { const array = file.url.split('/') if (array.length > 0) { @@ -563,7 +584,7 @@ export default { } } this.list = data.list - this.totalCount = data.totalCount + this.totalCount = data.total this.common.switchInspection(this.list) const messagePush = this.$store.getters.messageCount for (let i = 0; i < messagePush.length; i++) { @@ -678,18 +699,16 @@ export default { this.$message('请在列表选择要驳回的数据。') return false } - this.ysjlId = '' + this.ysjlId = [] + const arr = [] for (let i = 0; i < this.multipleSelection.length; i++) { if (this.multipleSelection[i].flowstatus !== 1) { - if (i === 0) { - this.ysjlId = this.multipleSelection[i].id - } else { - this.ysjlId = this.ysjlId + ',' + this.multipleSelection[i].id - } + arr.push(this.multipleSelection[i].id) } else { this.$message('存在未流转报告。') } } + this.ysjlId = arr if (this.ysjlId !== '') { this.dialogBohuiVisible = true } @@ -700,16 +719,13 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { + console.log(this.ysjlId) this.$refs['bohuiForm'].validate(valid => { if (valid) { - this.api({ - url: '/flow/bohui', - method: 'post', - params: { - ids: this.ysjlId, - infonotes: this.bohuiForm.infoNotes, - fileName: this.bohuiForm.fileName - } + rebutFn({ + ysjlIds: this.ysjlId, + infonotes: this.bohuiForm.infoNotes, + flowstatus: this.bohuiForm.flowstatus }).then(data => { // 根据结果反馈信息 this.$message({ diff --git a/src/views/monitor/log_info.vue b/src/views/monitor/log_info.vue index 8db86e9..d9b0b20 100644 --- a/src/views/monitor/log_info.vue +++ b/src/views/monitor/log_info.vue @@ -3,9 +3,30 @@
- - - + + + - + 查询 @@ -23,11 +49,26 @@
- + - - + + + + + - + + + + + + {{ row.api }} + + + {{ row.uri }} + + + {{ row.requestMethod }} + + + {{ row.requestParams }} + + + {{ row.method }} + + + {{ row.module }} + + + {{ row.requestIp }} + + + + @@ -56,11 +155,24 @@ export default { return { totalCount: 0, list: [], + row: {}, + dialogFormVisible: false, + formLabelWidth: '150px', listQuery: { pageNum: 1, pageSize: 20, orderBy: 'id desc', - logType: true + logType: true, + address: '', + api: '', + apiOperation: '', + businessType: '', + contentType: '', + requestMethod: '', + requestParams: '', + time: '', + updateBy: '', + uri: '' }, value1: [] } @@ -74,11 +186,15 @@ export default { url: '/log/list', method: 'get', params: this.listQuery - }).then(data => { + }).then((data) => { this.list = data.list this.totalCount = data.total }) }, + checkDetail(row) { + this.dialogFormVisible = true + this.row = row + }, handleFilter() { this.listQuery.pageNum = 1 this.listQuery.createTimeStart = this.value1[0]