From a24f5347bfd2331f8a4819b215f79555776534cd Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 25 四月 2024 09:16:57 +0800
Subject: [PATCH] 合并冲突
---
src/components/tool/value-table.vue | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index fb6ba2f..5c37a1e 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -892,6 +892,15 @@
}
}
this.addLoad = true
+ this.upHead.forEach((item,index)=>{
+ if(this.data.cascaderField&&this.data.cascaderField[item.label]){
+ if(this.upData[item.label]){
+ this.upData[item.label] = this.upData[item.label].join(',');
+ }else{
+ this.upData[item.label] = ''
+ }
+ }
+ })
this.$axios.post(this.addUrl, this.upData, {
headers: {
'Content-Type': 'application/json'
@@ -1050,7 +1059,7 @@
return count * 15 + 60 + 'px'
},
handleSuccessUp(response,label){
- if(label){
+ if(typeof label === 'string'){
if(response.code==200){
this.upData[label] = response.data.url;
}
@@ -1067,14 +1076,13 @@
// 鎵归噺鍒犻櫎
batchDelete(){
if(this.multipleSelection&&this.multipleSelection.length>0){
- // this.delUrl
this.$confirm('鏄惁鍒犻櫎閫変腑鐨勬暟鎹�?', "璀﹀憡", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning"
}).then(() => {
this.$axios.post(this.delUrl, {
- id: this.multipleSelection.map(item => item.id).join(',')
+ ids: JSON.stringify(this.multipleSelection.map(item => item.id))
}).then(res => {
if (res.code === 201) {
return
--
Gitblit v1.9.3