pref:修改节假日搜索

base-manager-ui/admin/src/pages/basicset/dept/department.vue

@@ -140,10 +140,10 @@
             </template>
             <!-- 操作 -->
             <div slot="action" slot-scope="text">
-              <div class="flex flexwrap">
-                <a class="yewu" type="primary" @click="workModal(text)">业务</a>
-                <a class="shixiang" @click="addWindowMatter(text)">事项</a>
-                <a class="edit" type="primary" @click="editModal(text)">编辑</a>
+              <div class="flex jcb flexwrap">
+                <a class="primary" @click="workModal(text)">业务</a>
+                <a class="primary" @click="addWindowMatter(text)">事项</a>
+                <a class="primary" @click="editModal(text)">编辑</a>
                 <a class="delete" @click="delWindow(text.id)">删除</a>
               </div>
             </div>
@@ -647,14 +647,6 @@ export default {
     font-size: 5px;
     background-color: #fff;
   }
-  .edit {
-    color: #03d76f;
-    margin-right: 5px;
-  }
-  .delete {
-    color: red;
-    cursor: pointer;
-  }
   .yewu {
     color: #0595fd;
     margin-right: 5px;

base-manager-ui/admin/src/pages/basicset/holiday/festival.vue

@@ -6,14 +6,28 @@
         >新增节日</a-button
       >
       <div>
-        <a-input-search
-          style="width: 300px"
-          allowClear
-          placeholder="请输入年份查询"
-          enter-button="搜索"
-          v-model="year"
-          @search="onSearch"
-        />
+        <a-space>
+          <a-select
+            showSearch
+            optionFilterProp="label"
+            v-model="year"
+            style="width: 180px"
+            placeholder="请选择年份查询"
+          >
+            <a-select-option value="" label="全部年份">
+              全部年份
+            </a-select-option>
+            <a-select-option
+              :label="v"
+              v-for="v in yearData"
+              :key="v"
+              :value="v"
+            >
+              {{ v }}
+            </a-select-option>
+          </a-select>
+          <a-button type="primary" @click="onSearch"> 搜索 </a-button>
+        </a-space>
       </div>
     </div>
     <div class="table-content">
@@ -150,10 +164,12 @@ export default {
       pageSizeOptions: ["10", "30", "50", "100"],
       year: "",
       siteId: local.getLocal("siteId"),
+      yearData: [], // 年份搜索数据
     };
   },
   created() {
     this.getHolidayData();
+    this.getYearData();
   },
   methods: {
     // 获取节假日列表
@@ -229,6 +245,13 @@ export default {
         },
       });
     },
+    // 获取年份选择数据
+    getYearData() {
+      let curYear = new Date().getFullYear();
+      for (let i = curYear; i >= 1990; i--) {
+        this.yearData.push(i);
+      }
+    },
   },
 };
 </script>

base-manager-ui/admin/src/pages/basicset/workman/personnel.vue

@@ -424,6 +424,8 @@ export default {
     // 获取部门窗口
     async getWindowData() {
       let res = await getWindowList({
+        page: 1,
+        size: -1,
         siteId: this.siteId,
         deptId: this.deptSearch,
       });