From 984b0dc2b1df6335f86e44a8f2fd1f997789fa02 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 23 Dec 2021 09:35:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A5=E5=8E=86=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standCalendar/index.vue | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue index 108d53c8d..06d16e9c9 100644 --- a/src/pages/localTool/standCalendar/index.vue +++ b/src/pages/localTool/standCalendar/index.vue @@ -41,10 +41,10 @@ - + @@ -81,8 +81,8 @@
会议附件 : {{ '-' }} -
- +
+ {{ res.name.slice(0, 30) + '...' }} {{ ';' }} @@ -508,7 +508,7 @@ export default { this.editMeetForm.contents this.editMeetForm.contents = [] if (this.editMeetForm.content !== '') { - this.editMeetForm.content.split(';').forEach(item => { + this.editMeetForm.content.split(';').forEach(item => { this.editMeetForm.contents.push({ meetingTheme: item }) @@ -713,13 +713,13 @@ export default { let contentData = [] if (this.editMeetForm.contents.length > 0) { this.editMeetForm.contents.forEach(item => { - if (item.meetingTheme.length > 0){ + if (item.meetingTheme.length > 0) { contentData.push(item.meetingTheme) } }) } let editForm = { - attend: JSON.stringify( this.editMeetForm.attend), + attend: JSON.stringify(this.editMeetForm.attend), content: contentData.join(';'), id: this.editMeetForm.id, date: this.editMeetForm.date, @@ -729,7 +729,7 @@ export default { place: this.editMeetForm.place } this.loading = true - updateMeet(editForm).then(res=>{ + updateMeet(editForm).then(res => { if (true) { this.$message.success("编辑成功"); this.meetFlag = false From 13813bae99bedf9bc6b611ade43347306f14f2a9 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 23 Dec 2021 09:57:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=9A=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/process.js | 1 + .../pages/creatProcess/bzhHd-rh/step1.vue | 17 ++++++- .../pages/creatProcess/bzhHh-hh/step1.vue | 48 ++++++++++++++++++- .../pages/creatProcess/wfhxzg/step4.vue | 17 ++++++- 4 files changed, 80 insertions(+), 3 deletions(-) diff --git a/src/api/process.js b/src/api/process.js index 6bb77e017..d0084423b 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -731,6 +731,7 @@ export function updateMeet(data) { }) } +// 上传接口 export function upFile(data) { return axios({ url: '/api/att/attFile/upload', diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 9e1878abd..c20d0296d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -375,6 +375,7 @@ drag :file-list="rh_pageData.infoSources" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" + :http-request="httpRequest" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" @@ -426,7 +427,7 @@ import { startProcess, saveTaskFirst, completeTask, queryTaskFirst, taskDel, workGroup, processBack, - getBusStandFileByAttId + getBusStandFileByAttId,upFile } from '@/api/process.js' export default { @@ -620,6 +621,20 @@ export default { } }) }, + httpRequest(params) { + const file = params.file + // 根据后台需求数据格式 + const form = new FormData() + // 文件对象 + form.append("file", file) + upFile(form).then(res=>{ + if (res.ok) { + this.handleOnsuccess(res) + } else { + this.$message.warning('上传失败') + } + }) + }, // 文件上传成功 handleOnsuccess(res, file, fileList) { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue index 321baa576..01a2d8b5b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue @@ -128,6 +128,7 @@ name="file" :file-list="upOtherData" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" + :http-request="httpRequestOther" :before-upload="beforeUploadOther" :before-remove="beforeRemoveOther" :on-success="onsuccessOther" @@ -203,6 +204,7 @@ name="file" :file-list="reData" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" + :http-request="httpRequest" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" @@ -224,6 +226,7 @@ name="file" :file-list="themeData" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" + :http-request="httpRequestTheme" :before-upload="beforeUploadTheme" :before-remove="beforeRemoveTheme" :on-success="onsuccessTheme" @@ -239,7 +242,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { saveTaskFirst, completeTask, inboundLiaisonDetail} from '@/api/process.js' +import { saveTaskFirst, completeTask, inboundLiaisonDetail,upFile} from '@/api/process.js' export default { components: { @@ -386,6 +389,20 @@ export default { this.reData = this.fileListData.material this.upDialog = true }, + httpRequest(params) { + const file = params.file + // 根据后台需求数据格式 + const form = new FormData() + // 文件对象 + form.append("file", file) + upFile(form).then(res=>{ + if (res.ok) { + this.handleOnsuccess(res) + } else { + this.$message.warning('上传失败') + } + }) + }, // 文件上传成功 handleOnsuccess(res, file, fileList) { if (res.ok) { @@ -460,6 +477,20 @@ export default { this.upThemeDialog = true }, + httpRequestTheme(params) { + const file = params.file + // 根据后台需求数据格式 + const form = new FormData() + // 文件对象 + form.append("file", file) + upFile(form).then(res=>{ + if (res.ok) { + this.onsuccessTheme(res) + } else { + this.$message.warning('上传失败') + } + }) + }, // 文件上传成功 onsuccessTheme(res, file, fileList) { if (res.ok) { @@ -521,6 +552,21 @@ export default { }, /** 其他资料上传 */ + + httpRequestOther(params) { + const file = params.file + // 根据后台需求数据格式 + const form = new FormData() + // 文件对象 + form.append("file", file) + upFile(form).then(res=>{ + if (res.ok) { + this.onsuccessOther(res) + } else { + this.$message.warning('上传失败') + } + }) + }, // 文件上传成功 onsuccessOther(res, file, fileList) { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 179d194a0..49403e042 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -51,6 +51,7 @@ name="file" :file-list="fileTextList" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + :http-request="httpRequest" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-remove="handleONRemove" @@ -178,7 +179,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {inboundLiaisonDetail, completeTask, saveTaskForPub, changeAssigneeNew,execTask} from "@/api/process" +import {inboundLiaisonDetail, completeTask, saveTaskForPub, changeAssigneeNew,execTask,upFile} from "@/api/process" export default { name: "wfhxzgStep4", @@ -298,6 +299,20 @@ export default { uploadFile (val) { this.fileListData = val }, + httpRequest(params) { + const file = params.file + // 根据后台需求数据格式 + const form = new FormData() + // 文件对象 + form.append("file", file) + upFile(form).then(res=>{ + if (res.ok) { + this.handleOnsuccess(res) + } else { + this.$message.warning('上传失败') + } + }) + }, // 文件上传成功 handleOnsuccess(res, file, fileList) { if (res.ok) {