From 4383ef853ef4027a81577fa8110938ddbce56410 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 09 四月 2024 13:05:02 +0800
Subject: [PATCH] 修改所有模块其他附件需要刷新的问题
---
ruoyi-ui/src/views/travel/travelInfo.vue | 140 ++++--
ruoyi-ui/src/views/economy/economyInfo.vue | 44 +
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue | 50 ++
ruoyi-ui/src/views/collection/collectionInfo.vue | 106 +++-
ruoyi-ui/src/views/secret/secretInfo.vue | 130 ++++-
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 41 +
ruoyi-ui/src/views/doctor/doctorInfo.vue | 110 +++-
ruoyi-ui/src/views/clean/cleanInfo.vue | 41 +
ruoyi-ui/src/views/contacts/contactsInfo.vue | 104 +++-
ruoyi-ui/src/views/pet/noteInfo.vue | 42 +
ruoyi-ui/src/views/wish/wishInfo.vue | 81 ++
ruoyi-ui/src/views/device/equipmentInfo.vue | 110 +++-
ruoyi-ui/src/views/note/propertyInfo.vue | 102 +++-
ruoyi-ui/src/views/healthy/healthyInfo.vue | 102 +++-
ruoyi-ui/src/views/honor/honorInfo.vue | 98 +++-
15 files changed, 975 insertions(+), 326 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 9263d10..d8c8d9b 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -225,6 +225,7 @@
fileListOther:[
],
+ fileListOther1:[],
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
dsb:true,
@@ -334,6 +335,42 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getFamilyeventInfo(id).then((response) => {
+ // console.log(response,'666666666')
+ this.formData = response.data;
+ let paths = this.formData.url.split(",");
+ 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)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+ }
+ },
submitForm() {
// let ul = this.fileList.map(function (elem){
@@ -500,7 +537,7 @@
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
// this.uploadFileList.push(file.raw);
@@ -536,6 +573,8 @@
updateFamilyevent(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
diff --git a/ruoyi-ui/src/views/clean/cleanInfo.vue b/ruoyi-ui/src/views/clean/cleanInfo.vue
index 92647bc..25cb049 100644
--- a/ruoyi-ui/src/views/clean/cleanInfo.vue
+++ b/ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -223,6 +223,7 @@
uploadFileList1:[],
fileListOther:[
],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -350,6 +351,42 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getCLeanInfo(id).then((response) => {
+ this.formData = response.data;
+ let paths = response.data.url.split(",");
+ 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)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+ this.getCateInfor()
+
+ }
+ },
getSrc1(type) {
if (type === 0) {
return '鍩洪噾'
@@ -551,7 +588,7 @@
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
// this.uploadFileList.push(file.raw);
@@ -587,6 +624,8 @@
updateClean(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index 64e55a3..1cdf1e5 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -86,7 +86,7 @@
multiple
:http-request="requestUpload"
:file-list="fileList"
-
+
:on-change="handleChange"
:auto-upload="false"
:disabled="!btn"
@@ -145,7 +145,7 @@
multiple
list-type="picture-card"
:on-preview="handleFileCardPreview"
-
+
:http-request="requestUpload1"
:show-file-list="true"
:on-change="handleChange1"
@@ -240,14 +240,15 @@
// 鏁版嵁鑼冨洿閫夐」
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:[
-
+
],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -353,7 +354,7 @@
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)
if (_this.fot.includes(pth) === true)
@@ -372,7 +373,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})
-
+
}
}
}
@@ -393,6 +394,49 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getCollection(id).then((response) => {
+ this.formData = response.data;
+ let paths = response.data.url.split(",");
+ 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)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+ listType(this.queryParams).then(response => {
+ this.typeList = response.data;
+ this.total = response.data.total;
+ // console.log( this.typeList )
+ // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
+ this.getTypeOptions();
+ this.loading = false;
+ }
+ );
+ }
+ },
//绫诲埆
addNewOption() {
const newOption = this.newOption.trim();
@@ -472,10 +516,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)
@@ -492,11 +536,11 @@
updateCollection(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+
});
}
},
- handleRemove(file) {
+ handleRemove(file) {
//鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
let res = false
// alert(this.fileList.length)
@@ -516,7 +560,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -535,7 +579,7 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
}
-
+
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
@@ -569,20 +613,20 @@
this.btn = true
this.isShow=false
},
-
+
//鑷畾涔変笂浼犳柟娉�
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
this.uploadFileList.push(file.raw);
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
this.uploadFileList1.push(file.raw);
this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -593,7 +637,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
//this.$refs.upload1.submit();
// alert(this.uploadFileList1.length)
@@ -601,14 +645,14 @@
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
console.log(this.uploadFileList1)
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -616,27 +660,29 @@
updateCollection(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
-
+
},
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
-
-
+
+
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -663,19 +709,19 @@
updateCollection(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
-
+
});
// }
// else{
// _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
// }
});
},
-
+
requestUpload(params)
{
-
+
},
requestUpload1(params)
{
diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue
index 524ff36..03a3f58 100644
--- a/ruoyi-ui/src/views/contacts/contactsInfo.vue
+++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -156,7 +156,7 @@
:disabled="!btn"
:class="{ hide: !btn }"
>
-
+
<i v-if="!uploading1" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
@@ -245,8 +245,9 @@
uploadFileList:[],
uploadFileList1:[],
fileListOther:[
-
+
],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -356,7 +357,7 @@
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)
if (_this.fot.includes(pth) === true)
@@ -375,7 +376,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})
-
+
}
}
}
@@ -387,8 +388,51 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getContactIdList(id).then((response) => {
+ this.formData = response.data;
+ if(this.formData.isAlways==0)
+ this.formData.isAlways='鍚�'
+ else
+ this.formData.isAlways = '鏄�'
+ let paths = response.data.url.split(",");
+ 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)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ // alert(paths[i])
+ // alert()
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+ this.getCateInfor()
+
+ }
+ },
+
submitForm() {
-
+
this.$refs['elForm'].validate(valid => {
if(this.formData.isAlways=='鍚�')
@@ -448,10 +492,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)
@@ -472,7 +516,7 @@
updateContact(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+
});
}
},
@@ -495,7 +539,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -518,7 +562,7 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
}
-
+
},
handleFileCardPreview(file){
@@ -554,20 +598,20 @@
this.btn = true
this.isShow=false
},
-
+
//鑷畾涔変笂浼犳柟娉�
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
this.uploadFileList.push(file.raw);
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
this.uploadFileList1.push(file.raw);
this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -578,7 +622,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
//this.$refs.upload1.submit();
// alert(this.uploadFileList1.length)
@@ -586,14 +630,14 @@
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
console.log(this.uploadFileList1)
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -605,27 +649,29 @@
updateContact(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
-
+
},
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
-
-
+
+
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -656,12 +702,12 @@
updateContact(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
-
+
});
// }
// else{
// _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
// }
});
},
@@ -669,10 +715,10 @@
{
// alert(124)
// this.uploadFileList.push(params.file);
-
+
//alert(34)
-
-
+
+
},
requestUpload1(params)
{
diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index a684bd7..fcc3ff6 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -70,7 +70,7 @@
:on-change="handleChange"
:auto-upload="false"
>
-
+
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
@@ -118,7 +118,7 @@
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
<el-upload
action=""
-
+
class="upload-demo"
multiple
list-type="picture-card"
@@ -221,8 +221,9 @@
uploadFileList:[],
uploadFileList1:[],
fileListOther:[
-
+
],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -332,7 +333,7 @@
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)
if (_this.fot.includes(pth) === true)
@@ -351,7 +352,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})
-
+
}
}
}
@@ -363,6 +364,45 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getEquipmentInfo(id).then((response) => {
+
+ this.formData = response.data;
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
+ let paths = response.data.url.split(",");
+ 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)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+ }
+ },
/** 鏌ヨ绫诲埆淇℃伅 */
// getCateInfor()
// {
@@ -375,7 +415,7 @@
// })
// },
submitForm() {
-
+
this.$refs['elForm'].validate(valid => {
if(this.formData.status=='鏄�')
@@ -434,10 +474,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)
@@ -454,12 +494,12 @@
this.formData.status = 1
else
this.formData.status = 0
-
+
if(res==true){
updateEquipment(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+
});
}
},
@@ -483,7 +523,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -501,13 +541,13 @@
this.formData.status = 1
else
this.formData.status = 0
-
+
if(res==true){
updateEquipment(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
}
-
+
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
@@ -552,20 +592,20 @@
this.$router.push("/familymodel/Device/memo/" + id );
},
-
+
//鑷畾涔変笂浼犳柟娉�
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
this.uploadFileList.push(file.raw);
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
this.uploadFileList1.push(file.raw);
this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -576,7 +616,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
//this.$refs.upload1.submit();
// alert(this.uploadFileList1.length)
@@ -584,14 +624,14 @@
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
console.log(this.uploadFileList1)
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -599,32 +639,34 @@
_this.formData.status = 1
else
_this.formData.status = 0
-
+
_this.formData.url = _this.formData.url+","+response.fileNames
updateEquipment(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
-
+
},
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
-
-
+
+
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -652,16 +694,16 @@
_this.formData.status = 1
else
_this.formData.status = 0
-
+
updateEquipment(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
-
+
});
// }
// else{
// _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
// }
});
},
@@ -669,10 +711,10 @@
{
// alert(124)
// this.uploadFileList.push(params.file);
-
+
//alert(34)
-
-
+
+
},
requestUpload1(params)
{
diff --git a/ruoyi-ui/src/views/doctor/doctorInfo.vue b/ruoyi-ui/src/views/doctor/doctorInfo.vue
index 265a676..8701848 100644
--- a/ruoyi-ui/src/views/doctor/doctorInfo.vue
+++ b/ruoyi-ui/src/views/doctor/doctorInfo.vue
@@ -94,7 +94,7 @@
:disabled="!btn"
:class="{ hide: !btn }"
>
-
+
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
@@ -150,8 +150,8 @@
:on-remove="handleRemoveFile"
:http-request="requestUpload1"
:show-file-list="true"
-
-
+
+
ref="upload1"
:on-change="handleChange1"
:auto-upload="false"
@@ -239,14 +239,15 @@
// 鏁版嵁鑼冨洿閫夐」
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:[
-
+
],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -352,7 +353,7 @@
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)
if (_this.fot.includes(pth) === true)
@@ -371,7 +372,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})
-
+
}
}
}
@@ -392,6 +393,49 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getDoctor(id).then((response) => {
+ this.formData = response.data;
+ let paths = response.data.url.split(",");
+ 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)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+ listType(this.queryParams).then(response => {
+ this.typeList = response.data;
+ this.total = response.data.total;
+ // console.log( this.typeList )
+ // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
+ this.getTypeOptions();
+ this.loading = false;
+ }
+ );
+ }
+ },
//绫诲埆
addNewOption() {
const newOption = this.newOption.trim();
@@ -418,7 +462,7 @@
},
submitForm() {
-
+
this.$refs['elForm'].validate(valid => {
@@ -467,10 +511,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)
@@ -487,7 +531,7 @@
updateDoctor(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+
});
}
},
@@ -511,7 +555,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -530,7 +574,7 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
}
-
+
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
@@ -565,20 +609,20 @@
this.btn = true
this.isShow=false
},
-
+
//鑷畾涔変笂浼犳柟娉�
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
this.uploadFileList.push(file.raw);
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
this.uploadFileList1.push(file.raw);
this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -589,7 +633,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
//this.$refs.upload1.submit();
// alert(this.uploadFileList1.length)
@@ -597,14 +641,14 @@
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
console.log(this.uploadFileList1)
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -612,27 +656,29 @@
updateDoctor(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
-
+
},
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
-
-
+
+
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -659,12 +705,12 @@
updateDoctor(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
-
+
});
// }
// else{
// _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
// }
});
},
@@ -672,10 +718,10 @@
{
// alert(124)
// this.uploadFileList.push(params.file);
-
+
//alert(34)
-
-
+
+
},
requestUpload1(params)
{
diff --git a/ruoyi-ui/src/views/economy/economyInfo.vue b/ruoyi-ui/src/views/economy/economyInfo.vue
index 2d20c79..a44dcf2 100644
--- a/ruoyi-ui/src/views/economy/economyInfo.vue
+++ b/ruoyi-ui/src/views/economy/economyInfo.vue
@@ -17,7 +17,7 @@
<el-form-item label="鍙拌处" prop="type">
<el-input v-model="formData.type" placeholder="璇疯緭鍏ュ彴璐﹀唴瀹�" clearable :style="{width: '100%'}" :disabled="dsb" >
</el-input>
-<!--
+<!--
<el-select v-model="formData.type" filterable clearable placeholder="璇疯緭鍏ュ彴璐﹀唴瀹�" clearable :style="{width: '100%'}" :disabled="dsb" >
</el-select> -->
</el-form-item>
@@ -220,6 +220,7 @@
fileListOther:[
],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -355,6 +356,43 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getEconomyInfo(id).then((response) => {
+ this.formData = response.data;
+ // console.log(this.formData)
+ //alert(this.formData.ownData)
+ let paths = response.data.url.split(",");
+ 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)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+ }
+ },
+
getSrc1(price) {
if (price === 鏀跺叆) {
return '鏀跺叆'
@@ -525,7 +563,7 @@
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
// this.uploadFileList.push(file.raw);
@@ -561,6 +599,8 @@
updateEconomy(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
diff --git a/ruoyi-ui/src/views/healthy/healthyInfo.vue b/ruoyi-ui/src/views/healthy/healthyInfo.vue
index 200b6b2..a21a72b 100644
--- a/ruoyi-ui/src/views/healthy/healthyInfo.vue
+++ b/ruoyi-ui/src/views/healthy/healthyInfo.vue
@@ -49,8 +49,8 @@
multiple
:http-request="requestUpload"
:file-list="fileList"
-
-
+
+
ref="upload"
:show-file-list="true"
:on-change="handleChange"
@@ -113,8 +113,8 @@
:on-remove="handleRemoveFile"
:http-request="requestUpload1"
:show-file-list="true"
-
-
+
+
ref="upload1"
:on-change="handleChange1"
:auto-upload="false"
@@ -208,9 +208,8 @@
fileList1:[],
uploadFileList:[],
uploadFileList1:[],
- fileListOther:[
-
- ],
+ fileListOther:[],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -298,7 +297,7 @@
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)
if (_this.fot.includes(pth) === true)
@@ -317,7 +316,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})
-
+
}
}
}
@@ -329,6 +328,45 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+
+ getHealthInfo({id}).then((response) => {
+ this.formData = response.data;
+ let paths = response.data.url.split(",");
+ 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)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ // alert(paths[i])
+ // alert()
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+
+ }
+ },
+
getSrc1(type) {
if (type === 0) {
return '鍩洪噾'
@@ -402,10 +440,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)
@@ -422,7 +460,7 @@
updateHealth(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+
});
}
},
@@ -446,7 +484,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -512,11 +550,11 @@
this.btn = true
this.isShow=false
},
-
+
//鑷畾涔変笂浼犳柟娉�
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
this.uploadFileList.push(file.raw);
@@ -525,7 +563,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})
@@ -536,7 +574,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
//this.$refs.upload1.submit();
// alert(this.uploadFileList1.length)
@@ -544,14 +582,14 @@
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
console.log(this.uploadFileList1)
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -559,27 +597,29 @@
updateHealth(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
-
+
},
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
-
-
+
+
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -606,12 +646,12 @@
updateHealth(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
-
+
});
// }
// else{
// _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
// }
});
},
@@ -619,10 +659,10 @@
{
// alert(124)
// this.uploadFileList.push(params.file);
-
+
//alert(34)
-
-
+
+
},
requestUpload1(params)
{
diff --git a/ruoyi-ui/src/views/honor/honorInfo.vue b/ruoyi-ui/src/views/honor/honorInfo.vue
index fd1bc88..fd04a1c 100644
--- a/ruoyi-ui/src/views/honor/honorInfo.vue
+++ b/ruoyi-ui/src/views/honor/honorInfo.vue
@@ -92,9 +92,9 @@
accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
list-type="picture-card"
multiple
-
+
:show-file-list="true"
- :http-request="requestUpload"
+ :http-request="requestUpload"
:file-list="fileList"
:on-change="handleChange"
:auto-upload="false"
@@ -154,8 +154,8 @@
:on-remove="handleRemoveFile"
:http-request="requestUpload1"
:show-file-list="true"
-
-
+
+
ref="upload1"
:on-change="handleChange1"
:auto-upload="false"
@@ -216,7 +216,7 @@
@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>
@@ -249,14 +249,13 @@
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
fileList:[],
-
-
+
+
fileList1:[],
uploadFileList:[],
uploadFileList1:[],
- fileListOther:[
-
- ],
+ fileListOther:[],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -381,7 +380,7 @@
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)
if (_this.fot.includes(pth) === true)
@@ -400,7 +399,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})
-
+
}
}
}
@@ -423,6 +422,55 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getHonor({id}).then((response) => {
+ this.formData = response.data;
+ // alert(this.formData.type)
+ let paths = response.data.url.split(",");
+ 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)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ // alert(paths[i])
+ // alert()
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+ listType(this.queryParams).then(response => {
+ this.typeList = response.data;
+ this.total = response.data.total;
+ // console.log( this.typeList )
+ // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
+ this.getTypeOptions();
+ this.loading = false;
+ }
+ );
+ this.fetchData()
+ // this.getCateInfor()
+
+ }
+ },
// 鑾峰彇鏁版嵁鏂规硶
fetchData(id) {
const url = 'https://47.93.189.255:8080/zHonor/id=${id}'; // 鎺ュ彛 URL'/zHonor/id='+query
@@ -549,10 +597,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)
@@ -569,7 +617,7 @@
updateHonor(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+
});
}
},
@@ -593,7 +641,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -612,7 +660,7 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
}
-
+
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
@@ -659,7 +707,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})
@@ -678,10 +726,10 @@
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
console.log(this.uploadFileList1)
let _this = this
@@ -693,6 +741,8 @@
updateHonor(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
@@ -709,11 +759,11 @@
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
-
+
})
let _this = this
-
+
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -755,8 +805,8 @@
// this.uploadFileList.push(params.file);
//alert(34)
-
-
+
+
},
requestUpload1(params)
{
diff --git a/ruoyi-ui/src/views/note/propertyInfo.vue b/ruoyi-ui/src/views/note/propertyInfo.vue
index fc5f8c4..12408e0 100644
--- a/ruoyi-ui/src/views/note/propertyInfo.vue
+++ b/ruoyi-ui/src/views/note/propertyInfo.vue
@@ -26,9 +26,9 @@
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
:disabled="item.disabled"></el-option>
</el-select>
-
-
-
+
+
+
</el-form-item>
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime" >
@@ -71,7 +71,7 @@
:disabled="!btn"
:class="{hide:!btn}"
>
-
+
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
@@ -134,7 +134,7 @@
>
-
+
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
@@ -220,8 +220,9 @@
uploadFileList:[],
uploadFileList1:[],
fileListOther:[
-
+
],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -304,7 +305,7 @@
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)
if (_this.fot.includes(pth) === true)
@@ -323,7 +324,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})
-
+
}
}
}
@@ -335,6 +336,41 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getPropertyInfo(id).then((response) => {
+ this.formData = response.data;
+ let paths = response.data.url.split(",");
+ for(let i = 0; i < paths.length; i++)
+ {
+ if(paths[i]!="") {
+
+ let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+ this.getCateInfor()
+
+ }
+ },
/** 鏌ヨ绫诲埆淇℃伅 */
getCateInfor()
{
@@ -411,10 +447,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)
@@ -431,7 +467,7 @@
updateProperty(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+
});
}
},
@@ -455,7 +491,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -474,7 +510,7 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
}
-
+
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
@@ -506,20 +542,20 @@
// const fid =2031
this.$router.push("/familymodel/property/memo/" + id );
},
-
+
//鑷畾涔変笂浼犳柟娉�
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
this.uploadFileList.push(file.raw);
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
this.uploadFileList1.push(file.raw);
this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -530,7 +566,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
//this.$refs.upload1.submit();
// alert(this.uploadFileList1.length)
@@ -538,14 +574,14 @@
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
console.log(this.uploadFileList1)
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -553,27 +589,29 @@
updateProperty(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
-
+
},
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
-
-
+
+
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -600,12 +638,12 @@
updateProperty(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
-
+
});
// }
// else{
// _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
// }
});
},
@@ -613,10 +651,10 @@
{
// alert(124)
// this.uploadFileList.push(params.file);
-
+
//alert(34)
-
-
+
+
},
requestUpload1(params)
{
diff --git a/ruoyi-ui/src/views/pet/noteInfo.vue b/ruoyi-ui/src/views/pet/noteInfo.vue
index 36114ef..079165a 100644
--- a/ruoyi-ui/src/views/pet/noteInfo.vue
+++ b/ruoyi-ui/src/views/pet/noteInfo.vue
@@ -191,6 +191,7 @@
fileListOther:[
],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -303,6 +304,43 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getPetnoteList(id).then((response) => {
+ this.formData = response.data;
+ let paths = response.data.url.split(",");
+ 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)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ // alert(paths[i])
+ // alert()
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+
+ }
+ },
submitForm() {
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
@@ -477,7 +515,7 @@
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
// this.uploadFileList.push(file.raw);
@@ -516,6 +554,8 @@
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
this.uploading = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
diff --git a/ruoyi-ui/src/views/secret/secretInfo.vue b/ruoyi-ui/src/views/secret/secretInfo.vue
index 204ac53..547c472 100644
--- a/ruoyi-ui/src/views/secret/secretInfo.vue
+++ b/ruoyi-ui/src/views/secret/secretInfo.vue
@@ -75,7 +75,7 @@
multiple
ref="upload"
:show-file-list="true"
- :http-request="requestUpload"
+ :http-request="requestUpload"
:file-list="fileList"
:on-change="handleChange"
:auto-upload="false"
@@ -134,10 +134,10 @@
multiple
list-type="picture-card"
:on-preview="handleFileCardPreview"
-
+
:show-file-list="true"
-
-
+
+
ref="upload1"
:on-remove="handleRemoveFile"
:http-request="requestUpload1"
@@ -233,9 +233,8 @@
fileList1:[],
uploadFileList:[],
uploadFileList1:[],
- fileListOther:[
-
- ],
+ fileListOther:[],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -372,7 +371,7 @@
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)
if (_this.fot.includes(pth) === true)
@@ -383,7 +382,7 @@
_this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
}
else {
-
+
// alert()
let nms = paths[i].split("\/")
let nm = nms[nms.length - 1]
@@ -391,7 +390,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})
-
+
}
}
}
@@ -404,15 +403,66 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getSecretInfo({id}).then((response) => {
+ _this.formData = response.data;
+ if(_this.formData.isFinger==1)
+ _this.formData.isFinger = '鏄�'
+ else
+ _this.formData.isFinger = '鍚�'
+ if(_this.formData.isFace==1)
+ _this.formData.isFace = '鏄�'
+ else
+ _this.formData.isFace = '鍚�'
+ if(_this.formData.isPrivate==0)
+ _this.formData.isPrivate = '鍏湁'
+ else
+ _this.formData.isPrivate = '绉佹湁'
+ let paths = response.data.url.split(",");
+ 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)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+
+ // alert()
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+ this.getCateInfo()
+
+ }
+ },
+
getCateInfo()
{
let _this = this
_this.typeOpt = []
-
+
getCategory().then(response=>{
console.log(response.data)
// alert(9801)
-
+
response.data.map(elem=>{
_this.typeOpt.push({"label":elem, "value":elem})
})
@@ -528,10 +578,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)
@@ -560,7 +610,7 @@
updateSecret(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+
});
}
},
@@ -584,7 +634,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -593,13 +643,13 @@
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){
if(this.formData.isFinger=='鏄�')
@@ -618,7 +668,7 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
}
-
+
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
@@ -656,11 +706,11 @@
// this.btn = true
this.isShow=false
},
-
+
//鑷畾涔変笂浼犳柟娉�
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
this.uploadFileList.push(file.raw);
@@ -669,7 +719,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})
@@ -680,7 +730,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
//this.$refs.upload1.submit();
// alert(this.uploadFileList1.length)
@@ -688,14 +738,14 @@
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
console.log(this.uploadFileList1)
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -715,27 +765,29 @@
updateSecret(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
-
+
},
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
-
-
+
+
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -774,12 +826,12 @@
updateSecret(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
-
+
});
// }
// else{
// _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
// }
});
},
@@ -787,10 +839,10 @@
{
// alert(124)
// this.uploadFileList.push(params.file);
-
+
//alert(34)
-
-
+
+
},
requestUpload1(params)
{
@@ -799,7 +851,7 @@
// console.log("-----------")
//console.log(this.uploadFileList1)
},
-
+
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index 887e067..669e207 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -257,6 +257,7 @@
uploadFileList:[],
uploadFileList1:[],
fileListOther:[],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -412,11 +413,52 @@
// this.getCateInfor()
}
- console.log(_this.fileList,'666')
- console.log(_this.fileListOther,'888')
+
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getSelfEconomyInfo({id}).then((response) => {
+ this.formData = response.data;
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
+ let paths = response.data.url.split(",");
+ 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)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ // alert(paths[i])
+ // alert()
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+ // this.getCateInfor()
+
+ }
+ },
/** 鏌ヨ绫诲埆淇℃伅 */
// getCateInfor()
// {
@@ -619,7 +661,7 @@
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
// this.uploadFileList.push(file.raw);
@@ -660,6 +702,8 @@
updateSelfEconomy(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
if(this.formData.status== 1)
this.formData.status = '鏄�'
else
diff --git a/ruoyi-ui/src/views/travel/travelInfo.vue b/ruoyi-ui/src/views/travel/travelInfo.vue
index b527f80..154b539 100644
--- a/ruoyi-ui/src/views/travel/travelInfo.vue
+++ b/ruoyi-ui/src/views/travel/travelInfo.vue
@@ -75,12 +75,12 @@
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"
@@ -140,15 +140,15 @@
multiple
list-type="picture-card"
:on-preview="handleFileCardPreview"
-
-
+
+
:show-file-list="true"
-
-
+
+
ref="upload1"
:on-remove="handleRemoveFile"
:http-request="requestUpload1"
-
+
:on-change="handleChange1"
:auto-upload="false"
:disabled="!btn"
@@ -236,15 +236,14 @@
// 鏁版嵁鑼冨洿閫夐」
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:[],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -329,7 +328,7 @@
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)
if (_this.fot.includes(pth) === true)
@@ -356,14 +355,14 @@
_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})
-
+
}
}
- }
-
-
-
-
+ }
+
+
+
+
}
this.loading = false;
});
@@ -371,6 +370,53 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getTravelBaseInfo(id).then((response) => {
+ this.formData = response.data;
+ let paths = response.data.url.split(",");
+ 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)
+ if (_this.fot.includes(pth) === true)
+ {
+ if(paths[i].includes("https"))
+ _this.fileList.push({name:paths[i],url: paths[i],res:false})
+ else
+ {
+ console.log()
+ }
+ }
+ else {
+ // alert(paths[i])
+ // alert()
+ if(paths[i].includes("https"))
+ _this.fileListOther.push({name:paths[i],url: paths[i],res:false})
+ else{
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+ }
+ },
+
submitForm() {
let ul = this.fileList.map(function (elem){
@@ -431,10 +477,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)
@@ -451,11 +497,11 @@
updateTravelBase(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+
});
}
},
- handleRemove(file) {
+ handleRemove(file) {
//鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
let res = false
// alert(this.fileList.length)
@@ -475,7 +521,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -494,7 +540,7 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
}
-
+
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
@@ -532,20 +578,20 @@
this.btn = true
this.isShow=false
},
-
+
//鑷畾涔変笂浼犳柟娉�
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
this.uploadFileList.push(file.raw);
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
this.uploadFileList1.push(file.raw);
this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -556,7 +602,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
//this.$refs.upload1.submit();
// alert(this.uploadFileList1.length)
@@ -564,14 +610,14 @@
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
console.log(this.uploadFileList1)
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -579,27 +625,29 @@
updateTravelBase(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
-
+
},
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
-
-
+
+
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -626,12 +674,12 @@
updateTravelBase(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
-
+
});
// }
// else{
// _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
// }
});
},
@@ -639,10 +687,10 @@
{
// alert(124)
// this.uploadFileList.push(params.file);
-
+
//alert(34)
-
-
+
+
},
requestUpload1(params)
{
@@ -651,7 +699,7 @@
// console.log("-----------")
//console.log(this.uploadFileList1)
},
-
+
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
diff --git a/ruoyi-ui/src/views/wish/wishInfo.vue b/ruoyi-ui/src/views/wish/wishInfo.vue
index 46dd6ae..a75689c 100644
--- a/ruoyi-ui/src/views/wish/wishInfo.vue
+++ b/ruoyi-ui/src/views/wish/wishInfo.vue
@@ -238,14 +238,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:[],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -348,7 +347,7 @@
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)
if (_this.fot.includes(pth) === true)
@@ -367,7 +366,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})
-
+
}
}
}
@@ -379,6 +378,44 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getWish({id}).then((response) => {
+ this.formData = response.data;
+ let paths = response.data.url.split(",");
+ 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)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ // alert(paths[i])
+ // alert()
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+ // this.getCateInfor()
+
+ }
+ },
submitForm() {
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
@@ -439,10 +476,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)
@@ -459,11 +496,11 @@
updateWish(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+
});
}
},
- handleRemove(file) {
+ handleRemove(file) {
//鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
let res = false
// alert(this.fileList.length)
@@ -483,7 +520,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -502,7 +539,7 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
}
-
+
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
@@ -537,7 +574,7 @@
this.btn = true
this.isShow=false
},
-
+
//鑷畾涔変笂浼犳柟娉�
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
@@ -548,9 +585,9 @@
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
this.uploadFileList1.push(file.raw);
this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -569,10 +606,10 @@
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
console.log(this.uploadFileList1)
let _this = this
@@ -584,6 +621,8 @@
updateWish(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
@@ -600,11 +639,11 @@
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
-
+
})
let _this = this
-
+
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -646,8 +685,8 @@
// this.uploadFileList.push(params.file);
//alert(34)
-
-
+
+
},
requestUpload1(params)
{
--
Gitblit v1.9.1