From 0947adf188a83eecf0a6a545cea25c97f7ce17f0 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 04 三月 2024 16:55:30 +0800
Subject: [PATCH] 修改了备忘录等内容
---
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 167 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 96 insertions(+), 71 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index cb2fbad..ee6f147 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -101,6 +101,7 @@
style="margin-left: 10px"
size="small"
type="success"
+ v-if="btn"
@click="picUpload"
>涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -126,7 +127,7 @@
multiple
list-type="picture-card"
ref="upload1"
-
+ :on-remove="handleRemoveFile"
:http-request="requestUpload1"
:file-list="fileListOther"
:on-change="handleChange1"
@@ -186,6 +187,7 @@
style="margin-left: 10px"
size="small"
type="success"
+ v-if="btn"
@click="fileUpload"
>涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header"> </h4>
@@ -236,7 +238,7 @@
people: undefined,
address: undefined,
remark: undefined,
- url: undefined,
+ url: "",
},
dialogImageUrl: '',
url1:undefined,
@@ -302,26 +304,27 @@
if(paths[i]!="") {
let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
-
+ // alert(pth)
if (_this.fot.includes(pth) === true)
{
if(paths[i][0]=="/")
- _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1)})
+ _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
else
- _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
}
else {
// alert(paths[i])
+ // alert()
let nms = paths[i].split("\/")
let nm = nms[nms.length - 1]
if(paths[i][0]=="/")
- _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1)})
+ _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
else
- _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
}
}
- _this.fileList1 = _this.fileList
+ // _this.fileList1 = _this.fileList
}
this.loading = false;
});
@@ -340,15 +343,10 @@
this.formData.url = ul+","+uls
this.$refs['elForm'].validate(valid => {
-
- console.log(this.formData)
if (valid) {
if (this.formData.id != undefined) {
- // alert(234)
updateFamilyevent(this.formData).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
- // this.open = false;
- // alert(98)
this.btn=false
});
} else {
@@ -375,46 +373,83 @@
})
},
handleRemoveFile(file) {
+ //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖
+ let res = false
for(let i = 0; i < this.fileListOther.length; i++)
{
if(this.fileListOther[i].url==file.url)
+ {
+ if(this.fileListOther[i].res==false)
+ res = true
+ else
+ {
+ this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
+ }
this.$delete(this.fileListOther,i);
- 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;
-
+
+ }
}
- updateFamilyevent(this.formData).then(response => {
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- // this.open = false;
- });
+ let ul = ""
+ this.fileList.map(function (elem){
+ if(elem.res==false)
+ ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ })
+ let uls = ""
+ this.fileListOther.map(function (elem){
+ if(elem.res==false)
+ uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ })
+ this.formData.url = ul+","+uls;
+ // alert(this.formData.url)
+ if(res==true){
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+
+ });
+ }
},
- handleRemove(file) {
+ handleRemove(file) {
+ //鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
+ let res = false
+ // alert(this.fileList.length)
for(let i = 0; i < this.fileList.length; i++)
{
if(this.fileList[i].url==file.url)
+ {
+ //鍘熸潵鍥惧儚鏍囪涓篺alse
+ //alert(this.fileList[i].res)
+ if(this.fileList[i].res==false)
+ res = true
+ else
+ {
+ // alert(this.uploadFileList.length)
+ // alert(87)
+ this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1))
+ // alert(this.uploadFileList.length)
+ }
this.$delete(this.fileList,i);
- 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;
- //alert(this.formData.url)
}
- updateFamilyevent(this.formData).then(response => {
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- // this.open = false;
-
- });
-
+ }
+ let ul = ""
+ this.fileList.map(function (elem){
+ if(elem.res==false)
+ ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ })
+ let uls = ""
+ this.fileListOther.map(function (elem){
+ if(elem.res==false)
+ uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ })
+ this.formData.url = ul+","+uls;
+ if(res==true){
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ });
+ }
+
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
@@ -459,15 +494,16 @@
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
- //console.log(file)
- // console.log(this.uploadFileList)
- // this.fileList = fileList
+ this.uploadFileList.push(file.raw);
+ this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther) {
+ handleChange1(file, fileListOther1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
// this.uploadFileList.push(file.raw);
+ this.uploadFileList1.push(file.raw);
+ this.fileListOther.push({name:file.name,url:file.url,res:true})
console.log("=========5555=========")
//console.log(file)
// console.log(this.uploadFileList)
@@ -475,10 +511,14 @@
},
fileUpload(){
// var file = params.file;
+
var formData = new FormData();
- this.$refs.upload1.submit();
+ //this.$refs.upload1.submit();
+ // alert(this.uploadFileList1.length)
// formData.append('uploadFile', file);
-
+ if(this.uploadFileList1.length==0){
+ this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+ return}
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
@@ -489,39 +529,24 @@
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.uploadFileList1 = []
_this.formData.url = _this.formData.url+","+response.fileNames
updateFamilyevent(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
-
});
})
},
picUpload()
{
+
var formData = new FormData();
- this.$refs.upload.submit();
-
+ //this.$refs.upload.submit();
+ //alert(this.uploadFileList.length)
+ if(this.uploadFileList.length==0){
+ this.$modal.msgSuccess("鍥惧儚涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+ return}
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
@@ -551,7 +576,7 @@
//console.log(_this.fileList)
// alert(response.fileNames)
_this.formData.url = _this.formData.url+","+response.fileNames
-
+ _this.uploadFileList = []
// alert(87)
updateFamilyevent(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
@@ -568,7 +593,7 @@
requestUpload(params)
{
// alert(124)
- this.uploadFileList.push(params.file);
+// this.uploadFileList.push(params.file);
//alert(34)
@@ -577,7 +602,7 @@
requestUpload1(params)
{
// alert(123)
- this.uploadFileList1.push(params.file);
+ // this.uploadFileList1.push(params.file);
// console.log("-----------")
//console.log(this.uploadFileList1)
},
--
Gitblit v1.9.1