Merge remote-tracking branch 'origin/master'

ui/smarttrade-platform/src/components/addMarketing.vue

@@ -1184,8 +1184,12 @@
         })
     }
 
-    const deleteCustomer = (data) => {
-        customerList.value = customerList.value.filter(item => item.id !== data.id)
+    const deleteCustomer = (data, type) => {
+        if(type == 'all') {
+            customerList.value = []
+        }else{
+            customerList.value = customerList.value.filter(item => item.id !== data.id)
+        }
         ElMessage.success('删除成功')
         getSource()
     }
@@ -1199,14 +1203,13 @@
                     t.id === item.id
                 ))
             })
-            ElMessage.success('添加成功')
-            return
-        }
-        if(customerList.value.find(item => item.id === data.id)) {
-            ElMessage.warning('客户已存在')
-            return
+        }else{
+            if(customerList.value.find(item => item.id === data.id)) {
+                ElMessage.warning('客户已存在')
+                return
+            }
+            customerList.value.push(data)
         }
-        customerList.value.push(data)
         getSource()
         ElMessage.success('添加成功')
     }

ui/smarttrade-platform/src/components/marketing/customerDetail.vue

@@ -104,6 +104,9 @@
                             <button class="btn btn-primary" @click="allAddCustomer" v-if="modalType == 'add'">
                                 <el-icon><Plus /></el-icon>全部添加
                             </button>
+                            <button class="btn btn-primary" @click="allDeleteCustomer" v-if="modalType == 'detail'">
+                                <el-icon><Delete /></el-icon>全部删除
+                            </button>
                         </div>
                     </template>
                     <div v-else class="empty-state">暂无客户数据</div>
@@ -239,6 +242,14 @@
         emits('add', customers.value, 'all')
     }
 
+    const allDeleteCustomer = () => {
+        emits('delete', filterData.value, 'all')
+        filterData.value = []
+        customers.value = []
+        allData.value = []
+        total.value = 0
+    }
+
     defineExpose({
         open
     })