From 7c33a1164d3019feb3ad9e4844b3d364e5c6eb44 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 17 十一月 2024 11:31:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/economy/economyInfo.vue | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/views/economy/economyInfo.vue b/ruoyi-ui/src/views/economy/economyInfo.vue
index 4792616..fdc1d57 100644
--- a/ruoyi-ui/src/views/economy/economyInfo.vue
+++ b/ruoyi-ui/src/views/economy/economyInfo.vue
@@ -15,14 +15,17 @@
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
<el-form-item label="鍙拌处" prop="type">
- <el-input v-model="formData.type" placeholder="璇疯緭鍏ュ彴璐﹀唴瀹�" clearable :style="{width: '100%'}" :disabled="dsb" >
+ <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>
<el-form-item label="鏃堕棿" prop="createTime">
<el-input v-model="formData.createTime" placeholder="璇烽�夋嫨鏃堕棿" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
<el-form-item label="鏀跺叆/鏀嚭" prop="price">
- <el-select v-model="formData.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}" >
+ <el-select :disabled="dsb" v-model="formData.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
@@ -139,7 +142,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">
@@ -217,6 +220,7 @@
fileListOther:[
],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -302,7 +306,7 @@
this.btn= jd;
this.dsb = !jd;
this.isShow=true;
- this.$route.meta.title = "淇敼瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ this.$route.meta.title = "淇敼瀹跺涵鏀舵敮鍙拌处淇℃伅";//鍒楄〃鐨勫悕绉�
}
else{
this.$route.meta.title = "瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
@@ -325,12 +329,26 @@
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),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()
@@ -352,6 +370,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 '鏀跺叆'
@@ -522,7 +577,7 @@
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
// this.uploadFileList.push(file.raw);
@@ -558,6 +613,8 @@
updateEconomy(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
});
})
--
Gitblit v1.9.1