Merge remote-tracking branch 'origin/master'

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

@@ -50,6 +50,44 @@
             :key="value"
           ></el-option>
         </el-select>
+        <el-select
+          v-model="form[item.name]"
+          :filterable="item.filterable"
+          :multiple="item.multiple"
+          :clearable="true"
+          @change="salaChange"
+          @clear="item.clear && item.clear"
+          v-if="item.type === 'selectSalaId'"
+          :placeholder="'请选择' + item.label"
+        >
+          <el-option
+            :label="label.deptName"
+            :value="label.id"
+            v-for="(label, value) in salaArr"
+            :key="value"
+          ></el-option>
+        </el-select>
+        <el-select
+          v-model="form[item.name]"
+          :filterable="item.filterable"
+          :multiple="item.multiple"
+          :clearable="true"
+          @clear="item.clear && item.clear"
+          v-if="item.type === 'selectDeptId'"
+          :placeholder="'请选择' + item.label"
+        >
+          <!-- <el-option
+            label=""
+            value=""
+            v-if="!item.multiple && !item.notShowAll"
+          ></el-option> -->
+          <el-option
+            :label="label.deptName"
+            :value="label.id"
+            v-for="(label, value) in deptArr"
+            :key="value"
+          ></el-option>
+        </el-select>
 
         <el-select
           v-model="form[item.name]"
@@ -214,9 +252,41 @@ export default {
     this.$route.name == "attendance/stat/list"
       ? (this.visible = true)
       : (this.visible = false);
+    this.$route.name == "attendance/stat/list" ? this.getArr() : "";
     this.initForm(this.$route.query);
   },
   methods: {
+    salaChange() {
+      this.$get("/dept/getDeptBySalaId", { salaId: this.form.salaId })
+        .then((res) => {
+          if (res.code == 1) {
+            this.deptArr = res.data.data;
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
+        });
+    },
+    getArr() {
+      this.$get("/dept/getSalaList")
+        .then((res) => {
+          if (res.code == 1) {
+            this.salaArr = res.data.data;
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
+        });
+      this.$get("/dept/getDeptBySalaId")
+        .then((res) => {
+          if (res.code == 1) {
+            this.deptArr = res.data.data;
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
+        });
+    },
     resetTable() {
       let { path, query } = this.$route;
       if (this.form.attendanceDateStart && this.form.attendanceDateEnd) {
@@ -541,12 +611,14 @@ export default {
   computed: {},
   data() {
     return {
-      downloadUrl:false,
+      downloadUrl: false,
       form: {
         // groupList: [],
       },
       remoteOptions: {},
       visible: false,
+      salaArr: [],
+      deptArr: [],
     };
   },
 };

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

@@ -375,10 +375,16 @@ export default {
         showType: "tableSelect",
         isshowTabPane: true,
         search: [
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
-            type: "select",
-            label: "全部部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           // {