添加大厅和部门显示

src/components/SearchForm.vue

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

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

@@ -92,10 +92,17 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
-            type: "select",
+            type: "selectDeptId",
             label: "部门",
+            fuzzy: false,
           },
           // {
           //   name: "groupId",
@@ -146,7 +153,18 @@ export default {
           { type: "index", label: "序号", width: 50, fixed: "left" },
           { label: "员工姓名", prop: "staffName", fixed: "left", width: 100 },
           { label: "工号", prop: "workNum" },
-          { label: "部门", prop: "deptName" },
+          {
+            label: "大厅",
+            prop: "salaName",
+            formatter: this.formatter,
+            show: true,
+          },
+          {
+            label: "部门",
+            prop: "deptName",
+            formatter: this.formatter,
+            show: true,
+          },
           { label: "考勤组", prop: "attendanceGroupName" },
           /*  {label: "班次", prop: "shiftsName"},*/
           {

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

@@ -449,7 +449,18 @@ export default {
           { type: "index", label: "序号", width: 50 },
           { label: "员工姓名", prop: "staffName" },
           { label: "工号", prop: "workNum" },
-          { label: "部门", prop: "deptName" },
+          {
+            label: "大厅",
+            prop: "salaName",
+            formatter: this.formatter,
+            show: true,
+          },
+          {
+            label: "部门",
+            prop: "deptName",
+            formatter: this.formatter,
+            show: true,
+          },
           // {label: "考勤组", prop: "attendanceGroupName"},
           // {label: "职位", prop: "positionName"},
           // {label: "班次", prop: "shiftsName"},

src/views/attendance/record/list.vue

@@ -332,7 +332,7 @@ export default {
               {this.tableData.dict.goWorkResult[val]}
             </span>
           ) : (
-            <span style="color:red" >
+            <span style="color:red">
               {this.tableData.dict.goWorkResult[val]}
             </span>
           );
@@ -595,10 +595,16 @@ export default {
           //   label: "手机号",
           //   fuzzy: true,
           // },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -648,7 +654,18 @@ export default {
             prop: "attendanceGroupName",
             show: true,
           },
-          { label: "部门", prop: "deptName", show: true },
+          {
+            label: "大厅",
+            prop: "salaName",
+            formatter: this.formatter,
+            show: true,
+          },
+          {
+            label: "部门",
+            prop: "deptName",
+            formatter: this.formatter,
+            show: true,
+          },
           { label: "职位", prop: "positionName", show: true },
           {
             label: "班次",