From 5a643d05479504adca94d23abbbbbfccf2283f0c Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期日, 30 七月 2023 17:11:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/contacts/index.vue | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 7d31396..aeab921 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -184,6 +184,7 @@
<el-table-column label="鐢靛瓙鍚嶇墖" prop="url" width="160" align="center">
<template slot-scope="scope" >
+ <div @click="handleCheck(scope.row)">
<img
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceLis.png"
@@ -192,14 +193,14 @@
fit="cover"
v-if="scope.row.url !== ','"
>
- <img
+ <img
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceA.png"
alt=""
style="width: 35px; height: 35px;"
fit="cover"
v-if="scope.row.url === ','"
- >
+ ></div>
</template>
</el-table-column>
@@ -330,7 +331,7 @@
class="upload-demo"
multiple
- :on-remove="handleRemove"
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
@@ -577,8 +578,19 @@
// })
// },
+ handleRemoveFile(file) {
+ for(let i = 0; i < this.fileListOther.length; i++)
+ {
+ if(this.fileListOther[i].url==file.url)
+ this.$delete(this.fileListOther,i);
+ }
+ },
handleRemove(file) {
- alert(323)
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ this.$delete(this.fileList,i);
+ }
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -689,6 +701,12 @@
});
}
});
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ this.handleRemove(this.fileList[0]);
+ this.handleRemoveFile(this.fileListOther[0]);
},
requestUpload(params)
{
--
Gitblit v1.9.1