From 6378fa4ea01c8c6a92bd3bf710686f5deedf99dd Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期六, 06 四月 2024 17:45:29 +0800
Subject: [PATCH] 完善家庭会议模块
---
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue | 82 +++++++++++++++++++++++++++--------------
1 files changed, 54 insertions(+), 28 deletions(-)
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index 31ce44e..887e067 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -93,8 +93,6 @@
action="#"
list-type="picture-card"
multiple
-
-
ref="upload"
:show-file-list="true"
:http-request="requestUpload"
@@ -258,9 +256,7 @@
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: [{
@@ -390,7 +386,7 @@
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]=="/")
@@ -416,6 +412,8 @@
// this.getCateInfor()
}
+ console.log(_this.fileList,'666')
+ console.log(_this.fileListOther,'888')
},
mounted() {},
methods: {
@@ -431,21 +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=="鏄�")
- // this.formData.status = 1
- // else
- // this.formData.status = 0
+ if(this.formData.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
- alert(this.formData.status)
+ /// alert(this.formData.status)
if (valid) {
if (this.formData.id != undefined) {
updateSelfEconomy(this.formData).then(response => {
@@ -459,11 +457,12 @@
});
} else {
this.$modal.msgSuccess("淇敼澶辫触");
- if(this.formData.status=='鏄�')
- this.formData.status = 1
- else
- this.formData.status = 0
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
}
+
}
})
},
@@ -518,6 +517,10 @@
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;
@@ -560,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("鍒犻櫎鎴愬姛");
});
@@ -641,6 +648,11 @@
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 = []
@@ -648,9 +660,14 @@
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()
{
@@ -666,9 +683,13 @@
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)
@@ -688,21 +709,26 @@
// 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)
{
--
Gitblit v1.9.1