Merge branch 'master' of http://47.92.161.104:10080/shuzhan/shinestar-portal

src/api/base/companyInfo.js

@@ -74,7 +74,12 @@ function unbindDevice(formData) {
   return request.post(constant.serverUrl + "/base/companyInfo/unbindDevice", formData);
 }
 
+function getCompanyName(formData) {
+  return request.post(constant.serverUrl + "/base/companyInfo/getCompanyName", formData);
+}
+
+
 export default {
   list, create, edit, add, update, remove, batchRemove, pageList, queryBindDeviceList,
-  bindDevice, unbindDevice,loadChildren
+  bindDevice, unbindDevice,loadChildren,getCompanyName
 }

src/api/base/workShiftInfo.js

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

src/routers/modules/base.js

@@ -439,6 +439,18 @@ var routers = [
                         title: '人员就餐记录'
                 }
         },
+        {
+                path: '/base/workShiftInfo/list',
+                name: 'BaseWorkShiftInfoList',
+                // 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/workShiftInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '班次管理'
+                }
+        },
 
         
         {

src/views/base/workShiftInfo-detail.vue

@@ -0,0 +1,298 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+.el-tag + .el-tag {
+  margin-left: 10px;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+    width="700px"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'" :inline="true">
+        <el-form-item label="班次编号" prop="number" >
+            <el-input v-model="formModel.number" placeholder="请输入班次编号" style="width:510px"></el-input>
+        </el-form-item>
+        <el-form-item label="班次名称" prop="name" >
+            <el-input v-model="formModel.name" placeholder="请输入班次名称" style="width:510px"></el-input>
+        </el-form-item>
+        <el-form-item label="刷卡次数" prop="swipeCardCount" >
+            <el-input v-model="formModel.swipeCardCount" placeholder="请输入刷卡次数" style="width:200px" type="number">
+                <template slot="append">次</template>
+            </el-input>
+        </el-form-item>
+        <el-form-item label="对应天数" prop="days">
+            <el-input v-model="formModel.days" placeholder="请输入对应天数" style="width:200px" type="number">
+                <template slot="append">天</template>
+            </el-input>
+        </el-form-item>
+        <el-form-item label="上班时间" prop="workTime" >
+            <el-time-picker
+              v-model="formModel.workTime"
+              style="width:200px"
+              placeholder="任意时间点"
+              format='HH:mm'
+              value-format="HH:mm">
+            </el-time-picker>
+        </el-form-item>
+        <el-form-item label="上班考勤时段" prop="workTimeRange" >
+          <el-time-picker
+              is-range
+              v-model="formModel.workTimeRange"
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              placeholder="选择时间范围"
+              format='HH:mm'
+              value-format="HH:mm"
+              style="width:200px">
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item label="下班时间" prop="closingTime">
+            <el-time-picker
+              v-model="formModel.closingTime"
+              style="width:200px"
+              placeholder="任意时间点"
+              format='HH:mm'
+              value-format="HH:mm">
+            </el-time-picker>
+        </el-form-item>
+        <el-form-item label="下班考勤时段" prop="closingTimeRange" >
+            <el-time-picker
+            is-range
+            v-model="formModel.closingTimeRange"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            placeholder="选择时间范围"
+            format='HH:mm'
+            value-format="HH:mm"
+            style="width:200px">
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item label="关联部门" prop="companyId">
+            <el-select-tree
+            :props="props"
+            :options="companyResult"
+            v-model="formModel.companyId"
+            height="200"
+            style="width:510px"
+            ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="已关联部门" prop="companyList">
+            <el-tag
+              v-for="tag in formModel.companyList"
+              :key="tag.name"
+              :value="tag.id"
+              closable
+              @close="handleClose(tag)">
+              {{tag.name}}
+            </el-tag>
+        </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 workShiftInfoApi from "@/api/base/workShiftInfo";
+import SelectTree from "@/components/SelectTree";
+import companyInfoApi from "@/api/base/companyInfo";
+
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {
+          companyList:[],
+          workTimeRange:null,
+          closingTimeRange:null,
+      },
+      ruleValidate: {
+        number: [
+          { required: true, message: "班次名称不能为空", trigger: "blur" }
+        ],
+        name: [
+          { required: true, message: "班次名称不能为空", trigger: "blur" }
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      canQuery: true,
+      treeData: [],
+      companyResult: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children"
+      },
+    };
+  },
+  created() {
+    var self = this;
+
+    companyInfoApi.list().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.companyResult = jsonData.data;
+        }
+      }
+    });
+  },
+  watch: {
+    "formModel.companyId": function (newVal, oldVal) {
+      var self = this;
+      if(newVal!=oldVal){
+        var flag = true;
+        if(this.formModel.companyList!=null){
+          this.formModel.companyList.forEach((item, index) => {
+            if(item.id==newVal){
+              flag = false;
+            }
+          })
+        }
+        else{
+          this.formModel.companyList=[];
+        }
+
+        if(flag){
+          var formData = new FormData();
+
+          formData.append("id", newVal);
+
+          companyInfoApi.getCompanyName(formData).then(function (response) {
+            var jsonData = response.data;
+            if (jsonData.result) {
+              if (jsonData.data != null && jsonData.data != "") {
+                var name = jsonData.data;
+                var tag ={"id":newVal,"name":name};
+                self.formModel.companyList.push(tag);
+              }
+            }
+          });
+        }
+      }
+    },
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleClose(tag) {
+      if(this.formModel.companyList.length>1){
+        this.formModel.companyList.splice(this.formModel.companyList.indexOf(tag), 1);
+      }
+      else{
+        this.$message({
+          message: "关联部门至少保留一个部门",
+          type: "error"
+        });
+      } 
+      
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function() {
+            var id = self.formModel.id;
+
+            self.loading = true;
+
+            if(self.formModel.workTimeRange.length==2){
+              self.formModel.workTimeRange=self.formModel.workTimeRange[0]+","+self.formModel.workTimeRange[1];
+            }
+            if(self.formModel.closingTimeRange.length==2){
+              self.formModel.closingTimeRange=self.formModel.closingTimeRange[0]+","+self.formModel.closingTimeRange[1];
+            }
+
+
+            if (id == null || id.length == 0) {
+              return workShiftInfoApi.add(self.formModel);
+            } else {
+              return workShiftInfoApi.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);
+            }
+          });
+        }
+      });
+    },
+  },
+  components: {
+    "el-select-tree": SelectTree,
+  },
+  mounted: function() {
+    var self = this;
+    (function() {
+      self.loading = true;
+
+      if (self.businessKey.length == 0) {
+        return workShiftInfoApi.create();
+      } else {
+        return workShiftInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then(response => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+            self.formModel = jsonData.data;
+
+            var workTimeArray = new Array()
+            workTimeArray[0]=jsonData.data.workStartTime;
+            workTimeArray[1]=jsonData.data.workEndTime;
+            self.formModel.workTimeRange = workTimeArray;
+
+            var closingTimeArray = new Array()
+            closingTimeArray[0]=jsonData.data.closingStartTime;
+            closingTimeArray[1]=jsonData.data.closingEndTime;
+            self.formModel.closingTimeRange = closingTimeArray;
+
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch(error => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/workShiftInfo-list.vue

@@ -0,0 +1,306 @@
+<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="/workShiftInfo">班次管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+
+      <el-form-item label="班次名称" prop="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+        >查询</el-button>&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+        >重置</el-button>&nbsp;
+      </el-form-item>
+    </el-form>
+    <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"
+      :element-loading-text="loadingText"
+      stripe
+      :height="tableHeight"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="number" label="班次编号" width="80"></el-table-column>
+      <el-table-column prop="name" label="班次名称" width="150"></el-table-column>
+      <el-table-column prop="swipeCardCount" label="刷卡次数" width="100"></el-table-column>
+      <el-table-column prop="days" label="天数" width="100" ></el-table-column>
+      <el-table-column prop="workTime" label="上班时间"  width="120"></el-table-column>
+      <el-table-column prop="workStartTime" label="上班考勤时段"  width="150">
+          <template slot-scope="{row}">
+                {{row.workStartTime}}-{{row.workEndTime}}
+          </template>
+      </el-table-column>
+      <el-table-column prop="closingTime" label="下班时间" width="120"></el-table-column>
+      <el-table-column prop="closingStartTime" label="下班考勤时段"  width="150">
+          <template slot-scope="{row}">
+                {{row.closingStartTime}}-{{row.closingEndTime}}
+          </template>
+      </el-table-column>
+
+      <el-table-column prop="companyList" label="关联部门" width="200">
+          <template slot-scope="{row}">
+            <div v-for="item in row.companyList" v-bind:key="item.id">
+                {{item.name}}
+            </div>
+          </template>
+      </el-table-column>
+      <el-table-column label="操作" width="150" fixed="right">
+        <template slot-scope="{row}">
+          <el-row>
+            <el-col :span="8">
+              <el-link type="primary" @click="handleEdit(row)">编辑</el-link>
+            </el-col>
+            <el-col :span="8">
+              <el-link type="danger" @click="handleDelete(row)">删除</el-link>
+            </el-col>
+          </el-row>
+        </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>
+    <workShiftInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      :companyResult="companyResult"
+      @close="onDetailModalClose"
+    ></workShiftInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import workShiftInfoDetail from "./workShiftInfo-detail";
+import workShiftInfoApi from "@/api/base/workShiftInfo";
+import pageUtil from "@/utils/page";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: 'BaseWorkShiftInfoList',
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        name:""
+      },
+      loading: false,
+      loadingText: "加载中",
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      companyResult: [],
+      tableHeight: 400,
+      dialogVisible: false,
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children"
+      },
+    };
+  },
+  created() {
+
+  },
+  methods: {
+    indexMethod(index) {
+      return (this.pageIndex - 1) * this.pageSize + (index + 1);
+    },
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+      self.loadingText = "加载中...";
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+    formData.append("pageIndex", self.pageIndex);
+    formData.append("pageSize", self.pageSize);
+
+    formData.append("name", self.queryModel.name);
+
+      workShiftInfoApi
+        .pageList(formData)
+        .then(function(response) {
+          self.loading = false;
+          var jsonData = response.data;
+          
+          if(jsonData.result) {
+              var page = jsonData.data;
+
+              self.tableData = page.data;
+              self.totalPages = page.totalPages;
+              self.totalElements = page.recordsTotal;
+          }
+          else{
+            self.$message.warning(jsonData.message + "");
+          }
+        })
+        .catch(error => {
+          self.loading = false;
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    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(() => {
+          workShiftInfoApi.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(() => {
+        workShiftInfoApi.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;
+      this.showDeviceModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function() {
+    this.changePage(1);
+  },
+  components: {
+    "workShiftInfo-detail": workShiftInfoDetail,
+  }
+};
+</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>