推合并解决冲突

attendance-performance-manager-ui/admin/src/components/SearchForm.vue

@@ -32,7 +32,7 @@
           v-model="form[item.name]"
           :filterable="item.filterable"
           :multiple="item.multiple"
-          clearable="true"
+          :clearable="true"
           @change="item.change"
           @clear="item.clear"
           v-if="item.type === 'select'"
@@ -79,7 +79,7 @@
           v-if="item.type === 'cascader'"
           v-model="selectedTreeID"
           :filterable="item.filterable"
-          clearable="true"
+          :clearable="true"
           change-on-select
           @change="treeSelecteds"
           :options="treeDatas"

attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue

@@ -355,6 +355,7 @@ export default {
   },
   data() {
     return {
+      isExport: false,
       config: {
         showType: "tableSelect",
         isshowTabPane: true,