From 0bed59a7c83975e466e31aa2fa14d8ee15473813 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期四, 16 一月 2025 11:20:35 +0800
Subject: [PATCH] 修改了对应的bug
---
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue | 165 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 124 insertions(+), 41 deletions(-)
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index b15a352..7add9d9 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -54,7 +54,7 @@
</el-form-item>
</el-cow>
<el-cow >
- <el-form-item label="鍙樻洿/娉ㄩ攢" prop="isChange" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-form-item label="鍙樻洿/娉ㄩ攢/璐拱" prop="isChange" label-width="120px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-select v-model="formData.isChange" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}" :disabled="dsb" >
<el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value"
></el-option>
@@ -83,7 +83,7 @@
</el-cow>
<el-cow >
<el-form-item label="澶囨敞" prop="remark" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb" type="textarea"></el-input>
</el-form-item>
</el-cow>
</el-row>
@@ -93,8 +93,6 @@
action="#"
list-type="picture-card"
multiple
-
-
ref="upload"
:show-file-list="true"
:http-request="requestUpload"
@@ -180,7 +178,7 @@
></video>
<img v-else
class="el-upload-list__item-thumbnail"
- src="../../assets/401_images/401.gif"
+ src="../../assets/images/deviceLis.png"
alt=""
style="width: 147px; height: 147px"
fit="cover">
@@ -258,9 +256,8 @@
fileList1:[],
uploadFileList:[],
uploadFileList1:[],
- fileListOther:[
-
- ],
+ fileListOther:[],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -302,7 +299,7 @@
}],
isChange: [{
required: true,
- message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢',
+ message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢/璐拱',
trigger: 'blur'
}],
price: [{
@@ -338,21 +335,26 @@
}],
},
typeOptions: [{
- value: '1',
+ value: '鏄�',
label: '鏄�',
},
{
- value: '0',
+ value: '鍚�',
label: '鍚�',
}],
typeOptions1: [{
value: '鍙樻洿',
label: '鍙樻洿',
},
- {
- value: '娉ㄩ攢',
- label: '娉ㄩ攢',
- }],
+ {
+ value: '娉ㄩ攢',
+ label: '娉ㄩ攢',
+ },
+ {
+ value: '璐拱',
+ label: '璐拱',
+ },
+ ],
}
},
computed: {},
@@ -379,6 +381,7 @@
if (id) {
this.loading = true;
getSelfEconomyInfo({id}).then((response) => {
+ console.log(response.data,'123123123')
this.formData = response.data;
if(this.formData.status==1)
this.formData.status = '鏄�'
@@ -390,14 +393,28 @@
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]=="/")
- _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],res:false})
- }
+ // {
+ // if(paths[i][0]=="/")
+ // _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],res:false})
+ // }
+ {
+ if(paths[i].includes(process.env.VUE_APP_BASE_TRUE_API)){
+ if(paths[i][0]=="/")
+ _this.fileList.push({name:paths[i],url: paths[i].substr(1),res:false})
+ else
+ _this.fileList.push({name:paths[i],url: paths[i],res:false})
+ }else{
+ if(paths[i][0]=="/")
+ _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],res:false})
+ }
+
+ }
else {
// alert(paths[i])
// alert()
@@ -416,9 +433,52 @@
// this.getCateInfor()
}
+
},
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()
// {
@@ -431,19 +491,19 @@
// })
// },
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)
if (valid) {
@@ -459,11 +519,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 = '鍚�'
}
+
}
})
},
@@ -525,7 +586,10 @@
updateSelfEconomy(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
});
}
},
@@ -570,6 +634,10 @@
this.formData.status = 0
updateSelfEconomy(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
});
}
},
@@ -620,7 +688,7 @@
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
// this.uploadFileList.push(file.raw);
@@ -649,6 +717,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 = []
@@ -656,9 +729,16 @@
updateSelfEconomy(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
+ if(this.formData.status== 1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
+
});
})
-
+ this.uploading = false;
},
picUpload()
{
@@ -674,6 +754,7 @@
formData.append("files", elem)
})
+
let _this = this
if(this.formData.status=='鏄�')
@@ -699,7 +780,7 @@
// 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)
@@ -711,12 +792,14 @@
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