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 | 560 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 445 insertions(+), 115 deletions(-)
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index f9f874c..7add9d9 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -1,13 +1,18 @@
<template>
- <div class="app-container">
- <div class="form-header mt">
+ <div class="app-container" id="printable-content">
+ <div class="form-header mt" >
<h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
<span>涓汉璐骇淇℃伅璇︽儏</span>
<div style="display: flex; align-items: center;">
- <el-button size="mini" type="text" @click="checkNote()" v-hasPermi="['person:information:memo']">
+ <el-button size="mini" type="text" @click="checkNote" v-hasPermi="['person:information:memo']">
<div class="form" ><el-icon style="padding-right:110px;"></el-icon>
<span class="text" style="width: 69px;height: 26px;font-size: 16px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">澶囧繕鏈�</span></div>
+ </el-button>
+ <el-button size="mini" type="text" v-print="'#printable-content'" v-hasPermi="['person:information:memo']">
+ <div class="form" ><el-icon style="padding-right:110px;"></el-icon>
+ <span class="text" style="width: 69px;height: 26px;font-size: 16px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鎵撳嵃</span></div>
</el-button>
</div>
</h1>
@@ -31,8 +36,8 @@
</el-cow>
<el-cow >
- <el-form-item label="鑾峰緱鏂瑰紡" prop="incomeName" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.incomeName" placeholder="璇疯緭鍏ユ敹鏀悕绉�" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-form-item label="璐骇鍚嶇О" prop="incomeName" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.incomeName" placeholder="璇疯緭鍏ヨ储浜у悕绉�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-cow>
@@ -49,9 +54,11 @@
</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-input v-model="formData.isChange" placeholder="璇疯緭鍏ュ彉鏇�/娉ㄩ攢" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
+ <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>
+ </el-select>
</el-form-item>
</el-cow>
<el-cow >
@@ -68,7 +75,7 @@
</el-cow>
<el-cow >
<el-form-item label="鏄惁娉ㄩ攢" prop="status" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-select v-model="formData.status" placeholder="璇烽�夋嫨鏄惁娉ㄩ攢" clearable :style="{width: '100%'}" :disabled="dsb" >
+ <el-select v-model="formData.status" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}" :disabled="dsb" >
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
@@ -76,20 +83,27 @@
</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>
</el-container>
- <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+ <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
list-type="picture-card"
multiple
- :http-request="requestUpload"
- :file-list="fileList"
+ ref="upload"
+ :show-file-list="true"
+ :http-request="requestUpload"
+ :file-list="fileList"
+ :on-change="handleChange"
+ :auto-upload="false"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -101,14 +115,14 @@
>
<span class="el-upload-list__item-actions" >
<span
- v-if="isShow"
+
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
@@ -126,27 +140,13 @@
</div>
</el-upload>
-
- <!--<h4 class="form-header">鍏朵粬闄勪欢 </h4>
- <el-upload
- action=""
- :file-list="fileListOther"
- class="upload-demo"
- multiple
- :on-preview="handlePreview"
-
- :on-remove="handleRemove"
- :http-request="requestUpload"
- :show-file-list="true"
- >
- <el-button v-if="isShow" type="primary" >鐐瑰嚮涓婁紶</el-button>
- <template #tip>
- <div class="el-upload__tip">
- </div>
- </template>
-
-
- </el-upload>-->
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ v-if="btn"
+ @click="picUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
<el-upload
action=""
@@ -156,33 +156,48 @@
list-type="picture-card"
:on-preview="handleFileCardPreview"
:on-remove="handleRemoveFile"
- :http-request="requestUpload"
:show-file-list="true"
- >
- <i slot="default" class="el-icon-plus"></i>
+ ref="upload1"
+ :http-request="requestUpload1"
+ :on-change="handleChange1"
+ :auto-upload="false"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
+ >
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
- <img
+ <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+ <video
+ v-if="file.url.includes('.mp4')"
class="el-upload-list__item-thumbnail"
- src="../../assets/401_images/401.gif"
- alt=""
+ :src="file.url"
style="width: 147px; height: 147px"
fit="cover"
- >
+ ></video>
+ <img v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 147px; height: 147px"
+ fit="cover">
+
<span class="el-upload-list__item-actions">
- <span v-if="isShow"
- class="el-upload-list__item-preview"
- @click="handleFileCardPreview(file)"
+ <span class="el-upload-list__item-name">{{ file.name }}</span>
+ <span
+ class="el-upload-list__item-preview"
+ @click="handleFileCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
- <i class="el-icon-download"></i>
- </span>
+ <i class="el-icon-download"></i>
+ </span>
<span
v-if="isShow"
class="el-upload-list__item-delete"
@@ -190,14 +205,20 @@
>
<i class="el-icon-delete"></i>
</span>
- </span>
-
+ </span>
</div>
</el-upload>
-
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ v-if="btn"
+ @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>
@@ -205,7 +226,7 @@
</div>
<el-dialog :visible.sync="dialogVisible">
- <img w-full :src="dialogImageUrl" style="width: 700px; height: 700px" alt="Preview Image" />
+ <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" />
</el-dialog>
@@ -226,16 +247,21 @@
return {
cdi:"涓汉璐骇璇︾粏淇℃伅",
udi:"涓汉璐骇淇℃伅璇︽儏",
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
- fileListOther:[
-
- ],
+ fileList1:[],
+ uploadFileList:[],
+ uploadFileList1:[],
+ fileListOther:[],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
-
+ uploading: false,
selfeconomyList: [],
formData: {
@@ -250,7 +276,7 @@
propertyRight:undefined,
location:undefined,
remark:undefined,
- url: undefined,
+ url: '',
},
dialogImageUrl: '',
dialogVisible: false,
@@ -267,13 +293,13 @@
trigger: 'blur'
}],
status: [{
- // required: true,
+ required: true,
message: '璇疯緭鍏ユ槸鍚︽敞閿�',
trigger: 'blur'
}],
isChange: [{
required: true,
- message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢',
+ message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢/璐拱',
trigger: 'blur'
}],
price: [{
@@ -309,13 +335,26 @@
}],
},
typeOptions: [{
- value: '1',
+ value: '鏄�',
label: '鏄�',
},
{
- value: '0',
+ value: '鍚�',
label: '鍚�',
}],
+ typeOptions1: [{
+ value: '鍙樻洿',
+ label: '鍙樻洿',
+ },
+ {
+ value: '娉ㄩ攢',
+ label: '娉ㄩ攢',
+ },
+ {
+ value: '璐拱',
+ label: '璐拱',
+ },
+ ],
}
},
computed: {},
@@ -328,45 +367,118 @@
jd = this.$route.query.detail
this.btn= jd
this.dsb = !jd
- document.title = "淇敼涓汉璐骇璇︾粏淇℃伅";
+ // document.title = "淇敼涓汉璐骇璇︾粏淇℃伅";
this.$route.meta.title = "淇敼涓汉璐骇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "涓汉璐骇璇︾粏淇℃伅";
+ // document.title = "涓汉璐骇璇︾粏淇℃伅";
this.$route.meta.title = "涓汉璐骇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
- this.isShow=true
+ this.btn = false;
+ this.isShow=false
}
let _this = this
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 = '鏄�'
+ 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)
+ 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].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})
+ }
- if (_this.fot.includes(pth) === true)
- _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
- else {
- // alert(paths[i])
- let nms = paths[i].split("\/")
- let nm = nms[nms.length - 1]
- _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ }
+ else {
+ // alert(paths[i])
+ // alert()
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _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;
});
// 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()
// {
@@ -379,28 +491,40 @@
// })
// },
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
-
+ /// alert(this.formData.status)
if (valid) {
if (this.formData.id != undefined) {
updateSelfEconomy(this.formData).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
// this.open = false;
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
this.btn=false
});
} else {
this.$modal.msgSuccess("淇敼澶辫触");
-
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
}
+
}
})
},
@@ -425,24 +549,110 @@
})
},
handleRemoveFile(file) {
- for(let i = 0; i < this.fileListOther.length; i++)
- {
- if(this.fileListOther[i].url==file.url)
- this.$delete(this.fileListOther,i);
- }
+ //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖
+ let res = false
+ for(let i = 0; i < this.fileListOther.length; i++)
+ {
+ if(this.fileListOther[i].url==file.url)
+ {
+ if(this.fileListOther[i].res==false)
+ res = true
+ else
+ {
+ 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)
+ 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;
+ // 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;
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
+ });
+ }
},
handleRemove(file) {
- for(let i = 0; i < this.fileList.length; i++)
- {
- if(this.fileList[i].url==file.url)
- this.$delete(this.fileList,i);
- }
+ //鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
+ let res = false
+ // alert(this.fileList.length)
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ {
+ //鍘熸潵鍥惧儚鏍囪涓篺alse
+ //alert(this.fileList[i].res)
+ if(this.fileList[i].res==false)
+ res = true
+ else
+ {
+ // alert(this.uploadFileList.length)
+ // alert(87)
+ this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1))
+ // alert(this.uploadFileList.length)
+ }
+ this.$delete(this.fileList,i);
+
+ }
+ }
+ let ul = ""
+ this.fileList.map(function (elem){
+ if(elem.res==false)
+ 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.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
+ updateSelfEconomy(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
+ });
+ }
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
+ // alert(file.url)
+ // this.dialogFileUrl = 'https://www.bendudu.com:8080/profile/upload/2023/10/18/20231018214647A011.doc'
+ // this.dialogFileUrl = 'https://47.93.189.255:8080/profile/upload/2023/03/19/test7_20230319222030A007.jpg'
+ if(this.dialogFileUrl.includes("47.93.189.255")==true)
+ this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
+ //alert(this.dialogFileUrl)
const Base64 = require('js-base64').Base64
- this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
- myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+
+ this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+ let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
@@ -464,32 +674,149 @@
handleEdit()
{
this.dsb = false
- // this.btn = true
+ this.btn = true
this.isShow=false
},
- requestUpload(params)
- {
- var file = params.file;
- var formData = new FormData();
- formData.append('uploadFile', file);
- let _this = this
- uploadPic(formData).then(response => {
- let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ //鑷畾涔変笂浼犳柟娉�
+ handleChange(file, fileList1) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
- if(_this.fot.includes(pth) === true)
- {
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+ // 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, fileListOther12) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
- }
+ // this.uploadFileList.push(file.raw);
+ this.uploadFileList1.push(file.raw);
+ this.fileListOther.push({name:file.name,url:file.url,res:true})
+ console.log("=========5555=========")
+ //console.log(file)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
+ },
+ fileUpload(){
+ // var file = params.file;
- else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ var formData = new FormData();
+ //this.$refs.upload1.submit();
+ // alert(this.uploadFileList1.length)
+ // formData.append('uploadFile', file);
+ 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 = []
+ _this.formData.url = _this.formData.url+","+response.fileNames
+ 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()
+ {
+
+ 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)
+ // console.log(response.fileNames)
+ // console.log(response.newFileNames)
+ // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ // _this.uploading1= false;
+ // console.log(_this.fot.includes(pth))
+ // // debugger
+ // if(_this.fot.includes(pth) === true)
+ // {
+ // _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+ // 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(",")
+ //console.log(_this.fileList)
+ // 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)
+ {
+ // alert(123)
+ // this.uploadFileList1.push(params.file);
+ // console.log("-----------")
+ //console.log(this.uploadFileList1)
+ },
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -531,6 +858,9 @@
.form{
background:center/11% no-repeat url('../../assets/icons/form.png') ;
}
+.hide /deep/ .el-upload--picture-card {
+ display: none;
+}
.form_item{
font-size: 12px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
--
Gitblit v1.9.1