From 13b0e307e62aa5f0479b8e640a7e1fc7623dbd59 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 24 二月 2024 11:36:47 +0800
Subject: [PATCH] 修改提交
---
ruoyi-ui/src/views/clean/index.vue | 65 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 6612526..05d0701 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -257,6 +257,7 @@
:on-change="handleChange"
:auto-upload="false"
ref="upload"
+
>
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{ file }">
@@ -287,26 +288,41 @@
</span>
</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=""
:file-list="fileListOther"
class="upload-demo"
multiple
-
+ ref="upload1"
+ :on-change="handleChange1"
+ :auto-upload="false"
+ list-type="picture-card"
:on-remove="handleRemoveFile"
:http-request="requestUpload1"
:show-file-list="true"
>
-
+<!--
<el-button type="primary">鐐瑰嚮涓婁紶</el-button>
- <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div> -->
<template #tip>
<div class="el-upload__tip">
</div>
</template>
</el-upload>
-
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ @click="fileUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
</el-form>
<h4 class="form-header"> </h4>
@@ -373,6 +389,9 @@
fileList:[
],
+ fileList1:[],
+ uploadFileList: [],
+ uploadFileList1: [],
fileListOther:[
],
@@ -388,7 +407,7 @@
location: undefined,
remark: undefined,
happenTime: undefined,
- url: undefined,
+ url: "",
},
// 鑿滃崟鍒楄〃
@@ -528,7 +547,11 @@
for(let i = 0; i < this.fileList.length; i++)
{
if(this.fileList[i].url==file.url)
- this.$delete(this.fileList,i);
+ {
+ this.$delete(this.fileList,i);
+ this.$delete(this.uploadFileList,i);
+ }
+
}
},
@@ -617,19 +640,18 @@
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);
+
+ }
}
},
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
- 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
+
this.$refs["elForm"].validate(valid => {
if (valid) {
@@ -658,6 +680,9 @@
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
+ this.uploadFileList.push(file.raw);
+ this.fileList.push({name:file.name,url:file.url})
+ //alert(fileList1.length)
//console.log(file)
// console.log(this.uploadFileList)
// this.fileList = fileList
@@ -667,6 +692,8 @@
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
+ this.uploadFileList1.push(file.raw);
+ this.fileListOther.push({name:file.name,url:file.url})
//console.log(file)
// console.log(this.uploadFileList)
// this.fileList = fileList
@@ -675,7 +702,7 @@
// var file = params.file;
var formData = new FormData();
- this.$refs.upload1.submit();
+ //this.$refs.upload1.submit();
// formData.append('uploadFile', file);
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!");
@@ -698,8 +725,11 @@
},
picUpload()
{
+ //alert(89)
var formData = new FormData();
- this.$refs.upload.submit();
+ //alert(this.uploadFileList.length)
+ console.log(this.uploadFileList)
+ //this.$refs.upload.submit();
if(this.uploadFileList.length==0){
this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
@@ -714,6 +744,7 @@
uploadPic(formData).then(response => {
// alert("dds")
_this.formDat.url = _this.formDat.url+","+response.fileNames
+ //alert( _this.formDat.url)
_this.uploadFileList = []
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
@@ -721,11 +752,11 @@
},
requestUpload(params) {
- this.uploadFileList.push(params.file);
+ // this.uploadFileList.push(params.file);
},
requestUpload1(params)
{
- this.uploadFileList1.push(params.file);
+ // this.uploadFileList1.push(params.file);
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
--
Gitblit v1.9.1