节假日管理

src/api/base/holidayInfo.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/holidayInfo/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/holidayInfo/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/holidayInfo/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/holidayInfo/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/holidayInfo/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/holidayInfo/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/holidayInfo/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

src/routers/modules/base.js

@@ -294,6 +294,18 @@ var routers = [
                 meta: {
                         roles: ["admin"]
                 }
+        },
+        {
+                //节假日设置
+                path: '/base/holidayInfo/list',
+                name: 'base-holidayInfo-list',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/base/holidayInfo-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
         }
 ]
 

src/views/base/holidayInfo-detail.vue

@@ -0,0 +1,196 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    width="800px;"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'150px'">
+        <el-form-item label="节假日名称" prop="holidayName">
+          <el-input v-model="formModel.holidayName" placeholder="请输入电表名称" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="开始时间" prop="beginDate">
+          <el-date-picker v-model="formModel.beginDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="结束时间" prop="endDate">
+          <el-date-picker v-model="formModel.endDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="是否需要上班" prop="working">
+          <el-radio v-model="formModel.working" :label="true">是</el-radio>
+          <el-radio v-model="formModel.working" :label="false">否</el-radio>
+        </el-form-item>
+        <el-form-item label="参考上班日" prop="refWeekday">
+          <el-select
+            v-model="formModel.refWeekday"
+            placeholder="请选择"
+            style="width:30% "
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import holidayInfoApi from "@/api/base/holidayInfo";
+import { quillEditor } from "vue-quill-editor";
+
+export default {
+  props: ["businessKey", "title", "companyResult"],
+  data() {
+    return {
+      ruleValidate: {
+        companyId: [{ required: true, message: "不能为空", trigger: "blur" }]
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {},
+      rangeTime: "",
+      options: [
+        {
+          value: "",
+          label: "无"
+        },
+        {
+          value: "1",
+          label: "周一"
+        },
+        {
+          value: "2",
+          label: "周二"
+        },
+        {
+          value: "3",
+          label: "周三"
+        },
+        {
+          value: "4",
+          label: "周四"
+        },
+        {
+          value: "5",
+          label: "周五"
+        },
+        {
+          value: "6",
+          label: "周六"
+        },
+        {
+          value: "7",
+          label: "星期天"
+        }
+      ],
+
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children"
+      }
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function() {
+            var id = self.formModel.id;
+
+            self.loading = true;
+
+            if (self.formModel.companyId == null) {
+              self.formModel.companyId = "";
+            }
+
+            if (id == null || id.length == 0) {
+              return holidayInfoApi.add(self.formModel);
+            } else {
+              return holidayInfoApi.update(self.formModel);
+            }
+          })().then(function(response) {
+            self.loading = false;
+
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success"
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    }
+  },
+  mounted: function() {
+    var self = this;
+    (function() {
+      if (self.businessKey.length == 0) {
+        return holidayInfoApi.create();
+      } else {
+        return holidayInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then(response => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          if (self.businessKey.length == 0) {
+            self.formModel.status = false;
+          }
+
+          var working = self.formModel.working;
+          if (working == null) {
+            self.formModel.working = false;
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch(error => {
+        self.$message.error(error + "");
+      });
+  }
+};
+</script>

src/views/base/holidayInfo-list.vue

@@ -0,0 +1,258 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">系统管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/messageNotice">节假日设置</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-remove"
+        :disabled="multipleSelection.length==0"
+        @click="handleBatchDelete"
+      >删除选中项</el-button>
+    </el-row>
+    <el-table
+    ref="formTable"
+      :data="tableData"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="holidayName" label="节假日名称" width="220" fixed="left"></el-table-column>
+      <el-table-column prop="beginDate" label="开始日期" show-overflow-tooltip width="150"></el-table-column>
+      <el-table-column prop="endDate" label="结束日期" width="150"></el-table-column>
+      <el-table-column prop="working" label="是否需要上班" width="120">
+        <template slot-scope="{row}">
+          <span v-html="row.working ? '是': '否'"></span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="refWeekday" label="参考上班日" width="120"></el-table-column>
+      <el-table-column label="操作" width="200" fixed="right">
+        <template slot-scope="{row}">
+          <el-button size="mini" type="warning" @click="handleEdit(row)">修改</el-button>
+          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <holidayInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      :companyResult="companyResult"
+      @close="onDetailModalClose"
+    ></holidayInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import holidayInfoDetail from "./holidayInfo-detail";
+import holidayInfoApi from "@/api/base/holidayInfo";
+import companyInfoApi from "@/api/base/companyInfo";
+
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: ""
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+      holidayInfoApi
+        .pageList(formData)
+        .then(function(response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+          holidayInfoApi.remove(record.id).then(function(response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        holidayInfoApi.batchRemove(idList).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    }
+  },
+  mounted: function() {
+    var self = this;
+    this.changePage(1);
+
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+  },
+  components: {
+    "holidayInfo-detail": holidayInfoDetail
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/messageNotice-detail.vue

@@ -59,7 +59,7 @@ import Constant from "@/constant";
 import messageNoticeApi from "@/api/base/messageNotice";
 import companyInfoApi from "@/api/base/companyInfo";
 import { getToken } from '@/utils/auth'
-import MceEditor from "@/components/tinymce";
+import MceEditor from "@/components/Tinymce";
 
 export default {
   props: ["businessKey", "title"],

src/views/base/personInfo-list.vue

@@ -685,7 +685,7 @@ export default {
 
           //页面高度-列表上面的高度-分页栏高度
           //45为分页栏的高度
-          self.tableHeight = window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
+          //self.tableHeight = window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         })
         .catch(error => {
           self.loading = false;