提交添加大厅和部门展示

src/components/SearchForm.vue

@@ -275,7 +275,9 @@ export default {
       this.$route.name == "window/owner/list" ||
       this.$route.name == "staff/perform/summary/list" ||
       this.$route.name == "attendance/record/list" ||
-      this.$route.name == "attendance/record/error/list"
+      this.$route.name == "attendance/record/error/list" ||
+      this.$route.name == "attendance/leave/record/list"||
+      this.$route.name == "attendance/vacation/balance/list"
     ) {
       this.getArr();
     }

src/views/attendance/leave/record/list.vue

@@ -84,10 +84,16 @@ export default {
             label: "电话号码",
             fuzzy: true,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
-            type: "select",
-            label: "全部部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -118,8 +124,18 @@ export default {
 
           // {label: "所属部门id", prop: "deptId", formatter: this.formatter},
 
-          { label: "所属部门", prop: "deptId", formatter: this.formatter },
-
+          {
+            label: "大厅",
+            prop: "salaName",
+            formatter: this.formatter,
+            show: true,
+          },
+          {
+            label: "部门",
+            prop: "deptName",
+            formatter: this.formatter,
+            show: true,
+          },
           { label: "电话号码", prop: "phoneNumber" },
 
           {

src/views/attendance/vacation/balance/list.vue

@@ -67,10 +67,17 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
-            type: "select",
-            label: "全部部门",
+            type: "selectDeptId",
+            label: "部门",
+            fuzzy: false,
           },
           {
             name: "staffName",
@@ -83,7 +90,18 @@ export default {
           { type: "selection", width: 60 },
           { type: "index", label: "序号", width: 50 },
           { label: "员工姓名", prop: "staffName" },
-          { label: "部门名称", prop: "deptName" },
+          {
+            label: "大厅",
+            prop: "salaName",
+            formatter: this.formatter,
+            show: true,
+          },
+          {
+            label: "部门",
+            prop: "deptName",
+            formatter: this.formatter,
+            show: true,
+          },
           {
             label: "入职时间",
             prop: "entryTime",