From 8c2744f87be2a2cbbec5adab51dd5895336ce135 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 8 Apr 2024 17:53:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?2024-04-08=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/upload_file.vue | 23 +++---- .../changeManagement/changeRequest.vue | 68 ++++++++++++++----- src/views/modules/common/uploadFileList.vue | 10 ++- src/views/modules/part/routingManagement.vue | 24 +++++-- 4 files changed, 87 insertions(+), 38 deletions(-) diff --git a/src/views/modules/base/upload_file.vue b/src/views/modules/base/upload_file.vue index 74df247..ddf5503 100644 --- a/src/views/modules/base/upload_file.vue +++ b/src/views/modules/base/upload_file.vue @@ -12,7 +12,7 @@ @@ -54,7 +54,8 @@ export default { createBy: '', dataNo: '', fileRemark: '', - folder: '' + folder: '', + file: '' }, } @@ -77,6 +78,10 @@ export default { this.fileList.push(file) }, + onRemove (file,fileList) { + this.fileList = fileList + }, + // 关闭modal closeDialog () { this.fileList = [] @@ -95,16 +100,10 @@ export default { this.$message.error("请先上传文件!") return false } - - // const formData = new FormData() - // //片接文件 - // formData.append("file", this.fileList[0].raw) - // formData.append("orderRef1", this.pageData.site) - // formData.append("orderRef2", this.pageData.dataNo) - // formData.append("fileRemark", this.pageData.fileRemark) - // formData.append("folder", this.pageData.folder) - - this.pageData.file = this.fileList[0].raw + for (let i = 0; i < this.fileList.length; i++) { + this.pageData.file[i] = this.fileList[i].raw + } + //this.pageData.file = this.fileList this.$emit('refreshPageTables', this.pageData) this.$message.success('操作成功!') this.closeDialog() diff --git a/src/views/modules/changeManagement/changeRequest.vue b/src/views/modules/changeManagement/changeRequest.vue index 6aaf360..1e2fb2a 100644 --- a/src/views/modules/changeManagement/changeRequest.vue +++ b/src/views/modules/changeManagement/changeRequest.vue @@ -775,6 +775,7 @@ + @@ -796,11 +797,14 @@ import { uploadFile // 文件上传 } from '@/api/oss/oss.js' + import {uploadFileList} from "../../../api/test/testInformation"; import DictDataSelect from '../sys/dict-data-select.vue' import changeUploadFile from "../base/upload_file.vue" import dayjs from "dayjs"; + import UploadFileList from "../common/uploadFileList.vue"; export default { components: { + UploadFileList, changeUploadFile, DictDataSelect, ChooseList @@ -808,6 +812,7 @@ data() { return { + uploadDialog: false, form: [], // 导出 exportData: [], @@ -945,6 +950,13 @@ itemDesc: '', codeNo: '' }, + fileData: { + file: [], + orderRef1: '', + orderRef2: '', + fileRemark: '', + folder: '' + }, // ======== 数据列表 ======== dataList: [], chooseDataList: [], @@ -1911,6 +1923,13 @@ createBy: this.$store.state.user.name, chooseCSItemList: [] } + this.fileData = { + file: [], + orderRef1: '', + orderRef2: '', + fileRemark: '', + folder: '' + } this.chooseItemList = [] this.chooseItemList2 = [] this.getDepartmentByUserName() @@ -2006,15 +2025,27 @@ } this.modalData.detailList = this.chooseDataList this.modalData.ecnTypeData = this.form + this.fileData.orderRef1 = this.modalData.site + this.fileData.orderRef2 = this.modalData.changeNo + this.fileData.fileRemark = this.$refs.changeRef.fileRemark + this.fileData.folder = 'change' + let tempData = new FormData() + for (let i in this.fileData) { + if (i === 'file') { + for (let j = 0; j < this.fileData.file.length; j++) { + tempData.append("file", this.fileData.file[j].raw) + } + continue + } + tempData.append(i, this.fileData[i]) + } changeRequestSave(this.modalData).then(({data}) => { if (data && data.code === 0) { - for (let i = 0; i { - if (data.code !== 0) { - this.$message.warning(data.msg) - } - }) - } + uploadFileList("/upload/test",tempData).then(({data}) => { + if (data.code !== 0) { + this.$message.warning(data.msg) + } + }) this.getDataList() this.basicInformationFlag = false this.$message({ @@ -2229,23 +2260,24 @@ dataNo: this.modalData.changeNo, fileRemark: '', folder: 'change', + file: [] } + this.uploadDialog = true //打开组件 去做新增业务 - this.$nextTick(() => { - this.$refs.changeUploadFile.init(currentData) - }) + // this.$nextTick(() => { + // this.$refs.changeUploadFile.init(currentData) + // }) }, // 得到保存的文件对象 getFileData (fData) { - const formData = new FormData() - // 片接文件 - formData.append("file", fData.file) - formData.append("orderRef1", fData.site) - formData.append("orderRef2", fData.dataNo) - formData.append("fileRemark", fData.fileRemark) - formData.append("folder", fData.folder) - this.fileList.push(formData) + this.fileData = { + file: fData.file, + orderRef1: fData.site, + orderRef2: fData.dataNo, + fileRemark: fData.fileRemark, + folder: fData.folder + } }, // 选择ECN种类模态框 diff --git a/src/views/modules/common/uploadFileList.vue b/src/views/modules/common/uploadFileList.vue index f7f6b89..2258874 100644 --- a/src/views/modules/common/uploadFileList.vue +++ b/src/views/modules/common/uploadFileList.vue @@ -8,6 +8,10 @@ export default { type:Boolean, default:false, }, + title:{ + type:String, + default:'测试文件', + }, label:{ type:String, default: '', @@ -40,9 +44,11 @@ export default { }, methods:{ closeFileUpdate(){ + this.$emit('update:uploadDialog',false) if (this.uploadStatus){ return } + this.fileRemark = ''; this.$refs.uploadFile.clearFiles(); this.$emit("update:fileList",[]) }, @@ -88,7 +94,7 @@ export default {