Merge remote-tracking branch 'origin/master'

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

@@ -16,9 +16,8 @@
     :height="height"
     style="width: 100%"
   >
-    <template v-for="column in columns">
     <el-table-column
-        v-if="column.show"
+      v-for="column in columns"
       :key="column.prop"
       :type="column.type"
       :index="handleIndexMethod"
@@ -46,7 +45,6 @@
         :formatter="sunColumn.formatter"
       />
     </el-table-column>
-    </template>
   </el-table>
 </template>
 

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

@@ -346,6 +346,7 @@ export default {
         this.tableData.staff.refreshDate,
         6
       );
+      this.$refs.layoutTable.showType = "tableSelect";
     },
   },
   data() {
@@ -367,6 +368,7 @@ export default {
         url: process.env.VUE_APP_API_BASE_URL + "/staff/importData",
       },
       config: {
+        showType: "tableSelect",
         search: [
           {
             name: "name",