From 39c0ad120acd120b62cb69dc92b6fe63e8edf902 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 17 四月 2024 16:01:28 +0800
Subject: [PATCH] 修改了备忘录图片
---
ruoyi-ui/src/views/travel/index.vue | 265 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 219 insertions(+), 46 deletions(-)
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 2bbe8ac..b6a91de 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -110,7 +110,7 @@
<el-table-column label="闂ㄧエ" prop="entrance" sortable width="70px" />
<el-table-column label="鍏跺畠璐圭敤" prop="otherCost" sortable width="120px" />
<el-table-column label="澶囨敞" prop="backInfo" sortable width="120px" />
-
+
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
<template slot-scope="scope" >
<img
@@ -119,7 +119,7 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="!scope.row.url "
+ v-if="scope.row.url"
>
<img
class="el-upload-list__item-thumbnail"
@@ -127,7 +127,7 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url "
+ v-if="!scope.row.url"
>
</template>
</el-table-column>
@@ -180,7 +180,7 @@
<el-table-column label="浜ら��" prop="travelTotal" sortable width="70px" />
<el-table-column label="闂ㄧエ" prop="entranceTotal" sortable width="70px" />
<el-table-column label="鍥㈣垂" prop="groupTotal" sortable width="70px" />
-
+
<el-table-column label="鎿嶄綔" align="center" sortable width="180" >
@@ -370,9 +370,11 @@
<el-upload
action="#"
list-type="picture-card"
- multiple
- :http-request="requestUpload"
- :file-list="fileList"
+ multiple
+ :http-request="requestUpload"
+ :file-list="fileList"
+ :on-change="handleChange"
+ :auto-upload="false"
>
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
@@ -404,6 +406,13 @@
</div>
</el-upload>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+
+ @click="picUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
<el-upload
action=""
@@ -412,16 +421,63 @@
multiple
:on-remove="handleRemove"
- :http-request="requestUpload"
:show-file-list="true"
- >
- <el-button type="primary">涓婁紶</el-button>
- <template #tip>
- <div class="el-upload__tip">
- </div>
- </template>
- </el-upload>
+
+ ref="upload1"
+ :on-change="handleChange1"
+ :auto-upload="false"
+ list-type="picture-card"
+ :http-request="requestUpload1"
+
+ >
+
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+ <video
+ v-if="file.url.includes('.mp4')"
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ style="width: 147px; height: 147px"
+ fit="cover"
+ ></video>
+ <img v-else
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ alt=""
+ style="width: 100%; height: 100%"
+ fit="cover"></img>
+
+ <span class="el-upload-list__item-actions">
+ <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
+
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+
+ </div>
+
+ </el-upload>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ @click="fileUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
+ </el-form>
+ <h4 class="form-header"> </h4>
</el-form>
<el-form ref="elForm" :model="formDat" :rules="rules1" size="medium" label-width="100px">
<h4 class="form-header">璐圭敤鏄庣粏 </h4>
@@ -527,9 +583,10 @@
fileList:[
],
- fileListOther:[
-
- ],
+ fileList1:[],
+ uploadFileList: [],
+ uploadFileList1: [],
+ fileListOther:[],
dsb:true,
btn:false,
formDat: {
@@ -543,7 +600,7 @@
self: undefined,
remark: undefined,
groupTotal:undefined,
- url: undefined,
+ url: "",
otherCost: undefined,
backInfo: undefined
},
@@ -770,6 +827,7 @@
listTravelPrice(this.queryParams).then(response => {
this.travelpriceList = response.data.data;
+ //alert(this.travelpriceList.url)
console.log("0000")
console.log(this.travelpriceList)
this.total = response.data.total;
@@ -781,6 +839,7 @@
const promises = [];
for (const item of this.travelpriceList) {
const promise = listTravelBase({ cid: item.id }).then(result => {
+ console.log(result.data)
travelBaseMap[item.id] = result.data;
});
promises.push(promise);
@@ -882,13 +941,13 @@
const id = this.row.id
this.formDat.cid = id;
- 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.formDat.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.formDat.url = ul+","+uls
console.log(this.formDat)
this.$refs["elForm"].validate(valid => {
if (valid) {
@@ -896,15 +955,40 @@
addTravelBase(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.centerDialogVisible = false;
+ this.open = false;
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ for(let i = 0; i <= this.fileList.length; i++)
+ {
+ this.handleRemove(this.fileList[0]);
+ }
+ for(let i = 0; i < this.fileListOther.length; i++){
+ this.handleRemoveFile(this.fileListOther[0]);
+ }
this.getList();
+
+
});
}
});
+ // Object.keys(this.formDat).forEach(key => {
+ // this.formDat[key] = '';
+ // });
+ // this.handleRemove(this.fileList[0]);
+ // this.handleRemoveFile(this.fileListOther[0]);
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
});
- this.handleRemove(this.fileList[0]);
- this.handleRemoveFile(this.fileListOther[0]);
+ for(let i = 0; i <= this.fileList.length; i++)
+ {
+ this.handleRemove(this.fileList[0]);
+ }
+ for(let i = 0; i < this.fileListOther.length; i++){
+ this.handleRemoveFile(this.fileListOther[0]);
+ }
},
// 寮圭獥
handleShow(row){
@@ -957,11 +1041,42 @@
});
},
-
+ handleRemove(file) {
+ //alert(98)
+ //alert(this.fileList.length)
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ {
+ this.$delete(this.fileList,i);
+ this.$delete(this.uploadFileList,i);
+ }
+ }
+ // let ul = this.fileList.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // alert(this.fileListOther.length)
+ // let uls = this.fileListOther.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // this.formDat.url = ul+","+uls;
+ },
+ handleRemoveFile(file) {
+ for(let i = 0; i < this.fileListOther.length; i++)
+ {
+ if(this.fileListOther[i].url==file.url)
+ {
+ this.$delete(this.fileListOther,i);
+ this.$delete(this.uploadFileList1,i);
+ }
+ }
+ },
handlePictureCardPreview(file) {
+ //alert(123)
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
+
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
@@ -984,29 +1099,87 @@
this.handleRemove(this.fileList[0]);
this.handleRemoveFile(this.fileListOther[0]);
},
- requestUpload(params)
- {
- var file = params.file;
- var formData = new FormData();
- formData.append('uploadFile', file);
- let _this = this
+ handleChange(file, fileList1) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
- uploadPic(formData).then(response => {
- let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ // this.uploadFileList.push(file.raw);
+ console.log("=========5555=========")
+ console.log(file)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
+ //alert(file)
+ this.uploadFileList.push(file.raw);
+ this.fileList.push({name:file.name,url:file.url})
+ //alert(fileList1.length)
+ },
+ handleChange1(file, fileOtherList1) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+ this.uploadFileList1.push(file.raw);
+ this.fileListOther.push({name:file.name,url:file.url})
+ // this.uploadFileList.push(file.raw);
+ console.log("=========5555=========")
+ //console.log(file)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
+ },
+ fileUpload(){
+ // var file = params.file;
- if(_this.fot.includes(pth) === true)
- {
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+ var formData = new FormData();
+ this.$refs.upload1.submit();
+ // formData.append('uploadFile', file);
+ if(this.uploadFileList1.length==0){
+ this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!");
+ return
+ }
+ this.uploadFileList1.forEach((elem)=>{
+ formData.append("files", elem)
- }
+ })
- else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ let _this = this
- }
- })
+ this.uploading = true;
+ uploadPic(formData).then(response => {
+ _this.uploadFileList1 = []
+ _this.formDat.url = _this.formDat.url+","+response.fileNames
+ alert(_this.formDat.url)
+ _this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
+ })
- },
+ },
+ picUpload()
+ {
+ var formData = new FormData();
+ //alert(976)
+ //this.$refs.upload.submit();
+ //alert(8)
+ //alert(this.uploadFileList.length)
+ if(this.uploadFileList.length==0){
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+ return}
+ //console.log(this.uploadFileList)
+ this.uploadFileList.forEach((elem)=>{
+ formData.append("files", elem)
+
+ })
+ //alert(90)
+ let _this = this
+ //alert(9)
+ uploadPic(formData).then(response => {
+ // alert("dds")
+ _this.formDat.url = _this.formDat.url+","+response.fileNames
+ // alert(_this.formDat.url)
+ _this.uploadFileList = []
+ _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+
+ });
+ },
+ requestUpload(params) {
+ //alert(98)
+ // this.uploadFileList.push(params.file);
+ },
+
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const Ids = row.id || this.ids;
--
Gitblit v1.9.1