Merge branch 'v2.0_ch' into v2.0

src/views/business_manage/addBusiness.vue

@@ -116,7 +116,7 @@
             :isShowFoot="false"
             :PermissionList="PermissionList"
             :allCheckedList="allCheckedList"
-
+            :currentStep="currentStep"
             :isSearch=isPermissionSearch
              @getSearch="handleGetSearch"
             ref="permissionRef" />

src/views/business_manage/components/SetPermission.vue

@@ -5,6 +5,7 @@
             placeholder="分类名称"
             v-model="searchTxt"
             @Enter="changeSearchTxt"
+            @Blur="changeSearchTxt"
         >
           <template #prefixIcon><SearchIcon /></template>
         </t-input>
@@ -53,6 +54,11 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  currentStep: {                                     // 当前步骤
+    type: Number,
+    default: 1,
+  },
+
 });
 // emit事件
 const emit = defineEmits(['close', 'setPermission', 'getSearch']);
@@ -86,6 +92,15 @@ watch(
   },
   { immediate: true }
 );
+watch(
+  () => props.currentStep,
+  (newValue) => {
+    if (newValue === 3) {
+      emit('getSearch', searchTxt.value);
+    }
+  },
+  { immediate: true }
+);
 
 watch(
   () => props.showSetPermission,

src/views/etaMenu/etaMenuConfig.vue

@@ -105,7 +105,7 @@ const formatData = (data, level) => {
 // 处理修改菜单操作
 const handleModifyMenu = (type, data) => {
   if (type === 'addNext') {
-    formData.value = { ParentId: data.MenuId, treeLevel: data.treeLevel + 1, ...formData.value };
+    formData.value = { ParentId: data.MenuId, treeLevel: data.treeLevel + 1,};
   } else if (type === 'edit') {
     formData.value = { ...data };
   } else {