添加假日数据

attendance-performance-manager-ui/admin/src/views/holiday/dialogshow.vue

@@ -3,13 +3,12 @@
     <el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-                                            <Field label="站点ID" prop="siteId" v-model="form.siteId" placeholder="请输入站点ID"/>
-                            <Field label="节日名称" prop="name" v-model="form.name" placeholder="请输入节日名称"/>
+                             <Field label="节日名称" prop="name" v-model="form.name" placeholder="请输入节日名称"/>
                             <Field label="备注" prop="summary" v-model="form.summary" type="textarea" placeholder="请输入备注"/>
                             <Field label="年份" prop="year" v-model="form.year" placeholder="请输入年份"/>
                             <Field label="开始时间" prop="startTime" v-model="form.startTime" type="date" />
                             <Field label="结束时间" prop="endTime" v-model="form.endTime" type="date" />
-                            <Field label="是否工作日" prop="workorholiday" v-model="form.workorholiday" type="select" :enumData="dict.workorholiday" placeholder="请选择是否工作日"/>
+                            <Field label="工作日" prop="workorholiday" v-model="form.workorholiday" type="select" :enumData="dict.workorholiday" placeholder="请选择是否工作日"/>
 
             </el-row>
 

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

@@ -39,19 +39,32 @@ export default {
     return {
       config: {
         search: [
+          {
+            name: "name",
+            type: "text",
+            label: "节日名称",
+            fuzzy: true
+          },
+          {
+            name: "year",
+            type: "text",
+            label: "年份",
+            fuzzy: true
+          },
         ],
         columns: [
           {type: "index",label: "序号",width: 50},
 
           {label: "节日名称", prop: "name"},
 
-          {label: "备注", prop: "summary"},
+
 
           {label: "年份", prop: "year",formatter: this.formatter},
 
           {label: "开始时间", prop: "startTime", formatter: this.formatterDateOnly},
 
           {label: "工作日", prop: "workorholiday",formatter: this.formatter},
+          {label: "备注", prop: "summary"},
           {
             label: "操作",
             width: 240,

attendance-performance-manager/src/main/java/com/mortals/xhx/module/holiday/web/HolidayController.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.holiday.web;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.holiday.model.HolidayEntity;
 import com.mortals.xhx.module.holiday.service.HolidayService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +31,7 @@ public class HolidayController extends BaseCRUDJsonBodyMappingController<Holiday
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "workorholiday", paramService.getParamBySecondOrganize("Holiday", "workorholiday"));
+        this.addDict(model, "workorholiday", YesNoEnum.getEnumMap());
         super.init(model, context);
     }