Merge remote-tracking branch 'origin/master'

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

@@ -16,37 +16,35 @@
     :height="height"
     style="width: 100%"
   >
-    <template v-for="column in columns">
+    <el-table-column
+      v-for="column in columns"
+      :key="column.prop"
+      :type="column.type"
+      :index="handleIndexMethod"
+      :selectable="handleSelectableMethod"
+      :prop="column.prop"
+      :label="column.label"
+      :width="column.width"
+      :sortable="column.sortable"
+      :show-overflow-tooltip="column.tooltip"
+      :align="column.align || 'center'"
+      :formatter="column.formatter"
+      :reserve-selection="column.reserveSelection"
+      :subColumns="column.subColumns"
+      :fixed="column.fixed"
+    >
       <el-table-column
-        v-if="column.show"
-        :key="column.prop"
-        :type="column.type"
-        :index="handleIndexMethod"
-        :selectable="handleSelectableMethod"
-        :prop="column.prop"
-        :label="column.label"
-        :width="column.width"
-        :sortable="column.sortable"
-        :show-overflow-tooltip="column.tooltip"
-        :align="column.align || 'center'"
-        :formatter="column.formatter"
-        :reserve-selection="column.reserveSelection"
-        :subColumns="column.subColumns"
-        :fixed="column.fixed"
-      >
-        <el-table-column
-          v-for="sunColumn in column.subColumns"
-          :key="sunColumn.prop"
-          :type="sunColumn.type"
-          :prop="sunColumn.prop"
-          :label="sunColumn.label"
-          :width="sunColumn.width"
-          :sortable="sunColumn.sortable"
-          :align="sunColumn.align || 'center'"
-          :formatter="sunColumn.formatter"
-        />
-      </el-table-column>
-    </template>
+        v-for="sunColumn in column.subColumns"
+        :key="sunColumn.prop"
+        :type="sunColumn.type"
+        :prop="sunColumn.prop"
+        :label="sunColumn.label"
+        :width="sunColumn.width"
+        :sortable="sunColumn.sortable"
+        :align="sunColumn.align || 'center'"
+        :formatter="sunColumn.formatter"
+      />
+    </el-table-column>
   </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",