Merge remote-tracking branch 'origin/master'

57a8e1d6 · 赵啸非 · dcce5378 · 4c0f4b8f · 57a8e1d6
Commit 57a8e1d6 authored Jul 19, 2023 by 赵啸非
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

attendance-performance-manager-ui/admin/src/views/perform/rules/attend/components/AttendIndex.vue ...src/views/perform/rules/attend/components/AttendIndex.vue +3 -1

No files found.
--- a/attendance-performance-manager-ui/admin/src/views/perform/rules/attend/components/AttendIndex.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/rules/attend/components/AttendIndex.vue
@@ -226,7 +226,9 @@ export default {
        type: this.activeName,
        page: this.query.page,
        orderColList: this.typeArr,
-        name: `%${this.searchValue}%`,
+        andConditionList: [
+          { content: `%${this.searchValue}%`, name: `%${this.searchValue}%` },
+        ],
      }).then((res) => {
        if (res.code == 1) {
          this.tableData = res.data;