From c0702fb50443fb03a4f5a7beb127294a17fc1dcd Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期六, 30 三月 2024 23:58:01 +0800
Subject: [PATCH] 修改了3月30这周的所有bug
---
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue | 133 ++++++++++++++++++++++++++-----------------
1 files changed, 80 insertions(+), 53 deletions(-)
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index eb9c5a8..887e067 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -93,11 +93,9 @@
action="#"
list-type="picture-card"
multiple
-
-
ref="upload"
:show-file-list="true"
- :http-request="requestUpload"
+ :http-request="requestUpload"
:file-list="fileList"
:on-change="handleChange"
:auto-upload="false"
@@ -159,7 +157,7 @@
:on-preview="handleFileCardPreview"
:on-remove="handleRemoveFile"
:show-file-list="true"
-
+
ref="upload1"
:http-request="requestUpload1"
:on-change="handleChange1"
@@ -252,15 +250,13 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-
+
fileList:[
],
fileList1:[],
uploadFileList:[],
uploadFileList1:[],
- fileListOther:[
-
- ],
+ fileListOther:[],
dsb:true,
btn:false,
isShow:true,
@@ -338,11 +334,11 @@
}],
},
typeOptions: [{
- value: '1',
+ value: '鏄�',
label: '鏄�',
},
{
- value: '0',
+ value: '鍚�',
label: '鍚�',
}],
typeOptions1: [{
@@ -380,7 +376,7 @@
this.loading = true;
getSelfEconomyInfo({id}).then((response) => {
this.formData = response.data;
- if(this.formData.status=="1")
+ if(this.formData.status==1)
this.formData.status = '鏄�'
else
this.formData.status = '鍚�'
@@ -388,9 +384,9 @@
for(let i = 0; i < paths.length; i++)
{
if(paths[i]!="") {
-
+
let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
- // alert(pth)
+ // alert(pth)
if (_this.fot.includes(pth) === true)
{
if(paths[i][0]=="/")
@@ -407,7 +403,7 @@
_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],res:false})
-
+
}
}
}
@@ -416,6 +412,8 @@
// this.getCateInfor()
}
+ console.log(_this.fileList,'666')
+ console.log(_this.fileListOther,'888')
},
mounted() {},
methods: {
@@ -431,20 +429,21 @@
// })
// },
submitForm() {
- 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
+ // 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
this.$refs['elForm'].validate(valid => {
- if(this.formData.status=="1")
- this.formData.status = 1
- else
- this.formData.status = 0
- //alert(this.formData.status)
+ if(this.formData.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
+
+ /// alert(this.formData.status)
if (valid) {
if (this.formData.id != undefined) {
updateSelfEconomy(this.formData).then(response => {
@@ -458,11 +457,12 @@
});
} else {
this.$modal.msgSuccess("淇敼澶辫触");
- if(this.formData.status==1)
- this.formData.status = '鏄�'
- else
- this.formData.status = '鍚�'
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
}
+
}
})
},
@@ -500,10 +500,10 @@
this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
}
this.$delete(this.fileListOther,i);
-
+
}
}
-
+
let ul = ""
this.fileList.map(function (elem){
if(elem.res==false)
@@ -517,10 +517,14 @@
this.formData.url = ul+","+uls;
// alert(this.formData.url)
if(res==true){
+ if(this.formData.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
updateSelfEconomy(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+
});
}
},
@@ -544,7 +548,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -559,6 +563,10 @@
})
this.formData.url = ul+","+uls;
if(res==true){
+ if(this.formData.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
updateSelfEconomy(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
@@ -600,11 +608,11 @@
this.btn = true
this.isShow=false
},
-
+
//鑷畾涔変笂浼犳柟娉�
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
this.uploadFileList.push(file.raw);
@@ -613,7 +621,7 @@
//鑷畾涔変笂浼犳柟娉�
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})
@@ -624,7 +632,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
//this.$refs.upload1.submit();
// alert(this.uploadFileList1.length)
@@ -632,14 +640,19 @@
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
console.log(this.uploadFileList1)
let _this = this
-
+
+ if(this.formData.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -647,27 +660,36 @@
updateSelfEconomy(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ if(this.formData.status== 1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
+
});
})
-
+ this.uploading = false;
},
picUpload()
{
-
+
var formData = new FormData();
//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)
-
+
})
+
let _this = this
-
-
+
+ if(this.formData.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -687,30 +709,35 @@
// return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
// }).join(",")
//console.log(_this.fileList)
- // alert(response.fileNames)
+ // alert(response.fileNames)
_this.formData.url = _this.formData.url+","+response.fileNames
_this.uploadFileList = []
// alert(87)
updateSelfEconomy(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
-
+ if(_this.formData.status==1)
+ _this.formData.status = '鏄�'
+ else
+ _this.formData.status = '鍚�'
});
+
// }
// else{
// _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
// }
});
+ this.uploading = false;
},
requestUpload(params)
{
// alert(124)
// this.uploadFileList.push(params.file);
-
+
//alert(34)
-
-
+
+
},
requestUpload1(params)
{
--
Gitblit v1.9.1