From 016f890b89151f2edfee3ae792a9c5594460bf2b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 20 二月 2024 17:41:51 +0800
Subject: [PATCH] 提交新代码
---
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 257 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 172 insertions(+), 85 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 59ce0a7..d95bb8d 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -39,21 +39,25 @@
<!-- <el-form-item label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData">-->
<!-- <el-input v-model="formData.ownData=== 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>-->
<!-- </el-form-item>-->
-
+ <!-- :http-request="requestUpload" -->
<h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
list-type="picture-card"
multiple
- :http-request="requestUpload"
+ ref="upload"
+ :show-file-list="true"
+ :http-request="requestUpload"
:file-list="fileList"
:on-change="handleChange"
+ :auto-upload="false"
:disabled="!btn"
:class="{ hide: !btn }"
>
- <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+
+ <!-- <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div> -->
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
@@ -90,20 +94,49 @@
</div>
- </el-upload>
+
+ </el-upload>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ @click="picUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
+
+<!-- <el-upload
+ action="#"
+ list-type="picture-card"
+ multiple
+ ref="upload"
+
+ :http-request="requestUpload"
+ :file-list="fileList"
+ :on-change="handleChange"
+ :auto-upload="false"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
+
+ >
+ -->
+
<el-upload
action="#"
multiple
list-type="picture-card"
- :file-list="fileListOther"
+ ref="upload1"
+
:http-request="requestUpload1"
+ :file-list="fileListOther"
+ :on-change="handleChange1"
+ :auto-upload="false"
:disabled="!btn"
+
:class="{ hide: !btn }"
>
-
- <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+<!--
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div> -->
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
@@ -149,7 +182,13 @@
</el-upload>
-
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ @click="fileUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
+ <h4 class="form-header"> </h4>
<el-form-item size="large">
<el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
</el-form-item>
@@ -178,7 +217,9 @@
fileList:[
],
+ fileList1:[],
uploadFileList:[],
+ uploadFileList1:[],
fileListOther:[
],
@@ -271,6 +312,7 @@
_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
}
}
+ _this.fileList1 = _this.fileList
}
this.loading = false;
});
@@ -335,12 +377,13 @@
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
this.formData.url = ul+","+uls;
- updateFamilyevent(this.formData).then(response => {
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- // this.open = false;
-
- });
+
}
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+
+ });
},
handleRemove(file) {
for(let i = 0; i < this.fileList.length; i++)
@@ -354,13 +397,15 @@
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
this.formData.url = ul+","+uls;
- updateFamilyevent(this.formData).then(response => {
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- // this.open = false;
-
- });
-
+ //alert(this.formData.url)
+
}
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+
+ });
+
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
@@ -400,90 +445,132 @@
},
//鑷畾涔変笂浼犳柟娉�
- handleChange(file, fileList) {
+ handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
- this.uploadFileList.push(file.raw);
+ // this.uploadFileList.push(file.raw);
console.log("=========5555=========")
//console.log(file)
- console.log(this.uploadFileList)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
},
- async requestUpload(params)
- {
- // alert(124)
- var file = params.file;
+ //鑷畾涔変笂浼犳柟娉�
+ handleChange1(file, fileListOther) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+
+ // this.uploadFileList.push(file.raw);
+ console.log("=========5555=========")
+ //console.log(file)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
+ },
+ fileUpload(){
+ // var file = params.file;
+ var formData = new FormData();
+ this.$refs.upload1.submit();
+ // formData.append('uploadFile', file);
+
+
+ this.uploadFileList1.forEach((elem)=>{
+ formData.append("files", elem)
+
+ })
+ console.log(this.uploadFileList1)
+ let _this = this
- var formData = new FormData();
- formData.append('uploadFile', file);
- let _this = this
- //alert(34)
- this.uploading1 = true;
+ this.uploading = true;
+ uploadPic(formData).then(response => {
+ // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ // _this.uploading = false;
+ // // this.$modal.msgSuccess("涓婁紶鎴愬姛");
+ // if(_this.fot.includes(pth) === true)
+ // {
+ // _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+
+ // }
+
+ // else{
+ // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ // let ul = _this.fileList.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // let uls = _this.fileListOther.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // _this.formData.url = ul+","+uls
+ // console.log(_this.formData.url)
+ _this.formData.url = _this.formData.url+","+response.fileNames
+ updateFamilyevent(_this.formData).then(response => {
+ this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+ // this.open = false;
+
+ });
+ })
- await uploadPic(formData).then(response => {
- let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
- _this.uploading1= false;
- console.log(_this.fot.includes(pth))
- // debugger
- if(_this.fot.includes(pth) === true)
- {
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
- let ul = _this.fileList.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = _this.fileListOther.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- _this.formData.url = ul+","+uls
- console.log(_this.formData.url)
+ },
+ picUpload()
+ {
+ var formData = new FormData();
+ this.$refs.upload.submit();
+
+
+ this.uploadFileList.forEach((elem)=>{
+ formData.append("files", elem)
+
+ })
+ let _this = this
+
+
+ uploadPic(formData).then(response => {
+ // console.log(response.originalFilenames)
+ // console.log(response.urls)
+ // console.log(response.fileNames)
+ // console.log(response.newFileNames)
+ // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ // _this.uploading1= false;
+ // console.log(_this.fot.includes(pth))
+ // // debugger
+ // if(_this.fot.includes(pth) === true)
+ // {
+ // _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+ // let ul = _this.fileList.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // let uls = _this.fileListOther.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ //console.log(_this.fileList)
+
+ _this.formData.url = _this.formData.url+","+response.fileNames
+
// alert(87)
updateFamilyevent(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
});
- }
- else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ // }
+ // else{
+ // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
- }
- })
+ // }
+ });
+ },
+ requestUpload(params)
+ {
+ // alert(124)
+ this.uploadFileList.push(params.file);
+ //alert(34)
+
+
},
requestUpload1(params)
{
- var file = params.file;
- var formData = new FormData();
- formData.append('uploadFile', file);
- let _this = this
- this.uploading = true;
- uploadPic(formData).then(response => {
- let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
- _this.uploading = false;
- // this.$modal.msgSuccess("涓婁紶鎴愬姛");
- if(_this.fot.includes(pth) === true)
- {
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
- }
-
- else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
- let ul = _this.fileList.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = _this.fileListOther.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- _this.formData.url = ul+","+uls
- console.log(_this.formData.url)
- updateFamilyevent(_this.formData).then(response => {
- this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
- // this.open = false;
-
- });
- }
- })
-
+ // alert(123)
+ this.uploadFileList1.push(params.file);
+ // console.log("-----------")
+ //console.log(this.uploadFileList1)
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.1