Merge remote-tracking branch 'origin/master'

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

@@ -12,7 +12,7 @@
     :row-class-name="tableRowClassName"
     :empty-text="emptytxt ? emptytxt : emptyText"
     border
-    :height="height"
+    :height="tableData.length >= 10 ? '680px' : ''"
     style="width: 100%"
   >
     <template v-for="column in columns">

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

@@ -255,6 +255,7 @@ export default {
     },
     beforeRender(row) {
       this.tableData.dict = row.dict;
+
       row.data.forEach((element) => {
         if (
           element.attendanceStaffStatEntities &&
@@ -321,6 +322,9 @@ export default {
           });
         }
       });
+      this.$nextTick(() => {
+        this.$refs.layoutTable.doLayout();
+      });
       return row;
     },
     /** 重写新增方法 */
@@ -401,7 +405,7 @@ export default {
       config: {
         showType: "tableSelect",
         isshowTabPane: true,
-        height: "680px",
+        height: "",
         search: [
           {
             name: "salaId",
@@ -456,15 +460,6 @@ export default {
             show: true,
           },
 
-          //{
-          //  label: "窗口类别",
-          //  prop: "windowCategory",
-          //  fixed: "left",
-          //width: 100,
-          //formatter: this.formatter,
-          //show: true,
-          //},
-
           {
             label: "员工姓名",
             prop: "staffName",