Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/layouts/Layouts.vue

@@ -4,8 +4,8 @@
     <a-layout-header class="header">
       <div class="flex aic">
         <router-link to="/" class="flex aic">
-          <img width="32" src="@/assets/img/logo.png" />
-          <h1 style="padding-left: 10px">{{ systemName }}</h1>
+          <!-- <img width="32" src="@/assets/img/logo.png" /> -->
+          <h1>{{ systemName }}</h1>
         </router-link>
         <HeaderSite class="ml20"></HeaderSite>
       </div>

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs1.vue

@@ -354,19 +354,17 @@ export default {
     onSelectLeftRow(record, selected) {
       if (selected && record.children && record.children.length) {
         record.children.forEach((v) => {
-          this.selectedLeftRowKeys.push(v.id);
-          this.deleteData.push(v);
+          this.selectedLeftRowKeys= [...new Set([...this.selectedLeftRowKeys,v.id])]
+          this.deleteData=[...new Set([...this.deleteData,v])];
         });
-      } else if (selected) {
-        this.selectedLeftRowKeys.push(record.id);
-        this.deleteData.push(record);
-      } else {
+      } else if (!selected) {
         this.selectedLeftRowKeys = this.selectedLeftRowKeys.filter(
           (v) => v != record.id
         );
         this.deleteData = this.deleteData.filter((v) => {
-          return this.selectedLeftRowKeys.some((val) => v.id == val);
+          return v.id !=record.id
         });
+      
       }
     },
     // 批量删除

base-manager-ui/admin/src/pages/basicset/dept/components/addWindowBusiness.vue

@@ -190,11 +190,11 @@ export default {
     },
     changePage() {},
     onSelectRow(record, selected) {
-      if (selected && record.children.length) {
+      if (selected && record.children && record.children.length) {
         record.children.forEach((v) => {
-          this.rowKeys.push(v.id);
+           this.rowKeys = [...new Set([...this.rowKeys,v.id])]
         });
-      } else {
+      } else if(!selected) {
         this.rowKeys = this.rowKeys.filter((v) => v != record.id);
       }
     },