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

src/api/base/workPersonScheduling.js

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

src/routers/modules/base.js

@@ -452,6 +452,20 @@ var routers = [
                 }
         },
 
+        
+        {
+                path: '/base/workPersonScheduling/list',
+                name: 'BaseWorkPersonSchedulingList',
+                // 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/workPersonScheduling-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '人员排班管理'
+                }
+        },
+
 ]
 
 export default routers;

src/views/base/companyInfo-detail.vue

@@ -166,7 +166,6 @@
 <script>
 import Constant from "@/constant";
 import companyInfoApi from "@/api/base/companyInfo";
-import sceneInfoApi from "@/api/base/sceneInfo";
 import dataDictionaryApi from "@/api/sys/dataDictionary";
 import SelectTree from "@/components/SelectTree";
 
@@ -222,13 +221,7 @@ export default {
       var jsonData = response.data;
       this.typeData = jsonData.data;
     });
-
-    sceneInfoApi.list().then(response => {
-      var jsonData = response.data;
-      this.sceneData = jsonData.data;
-    });
     
-
     this.loadTree();
   },
   methods: {

src/views/base/workPersonScheduling-detail.vue

@@ -0,0 +1,244 @@
+
+<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"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'100px'"
+      >
+        <el-form-item label="编号" prop="id">
+          <el-input
+            v-model="formModel.id"
+            placeholder="请输入编号"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="人员id" prop="personId">
+          <el-input
+            v-model="formModel.personId"
+            placeholder="请输入人员id"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="年" prop="year">
+          <el-input
+            v-model="formModel.year"
+            placeholder="请输入年"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="月" prop="month">
+          <el-input
+            v-model="formModel.month"
+            placeholder="请输入月"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="日" prop="day">
+          <el-input
+            v-model="formModel.day"
+            placeholder="请输入日"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="安排日期" prop="schedulingDay">
+          <el-input
+            v-model="formModel.schedulingDay"
+            placeholder="请输入安排日期"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="班次ID,多逗号分隔" prop="shiftIds">
+          <el-input
+            v-model="formModel.shiftIds"
+            placeholder="请输入班次ID,多逗号分隔"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="班次编号,多逗号分隔" prop="shiftNumbers">
+          <el-input
+            v-model="formModel.shiftNumbers"
+            placeholder="请输入班次编号,多逗号分隔"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="创建人" prop="createBy">
+          <el-input
+            v-model="formModel.createBy"
+            placeholder="请输入创建人"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-input
+            v-model="formModel.createTime"
+            placeholder="请输入创建时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="更新人" prop="updateBy">
+          <el-input
+            v-model="formModel.updateBy"
+            placeholder="请输入更新人"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="更新时间" prop="updateTime">
+          <el-input
+            v-model="formModel.updateTime"
+            placeholder="请输入更新时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="是否删除" prop="delFlag">
+          <el-input
+            v-model="formModel.delFlag"
+            placeholder="请输入是否删除"
+            style="width: 300px"
+          ></el-input>
+        </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 workPersonSchedulingApi from "@/api/base/workPersonScheduling";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        id: [{ required: true, message: "编号不能为空", trigger: "blur" }],
+        personId: [
+          { required: true, message: "人员id不能为空", trigger: "blur" },
+        ],
+        year: [{ required: true, message: "年不能为空", trigger: "blur" }],
+        month: [{ required: true, message: "月不能为空", trigger: "blur" }],
+        day: [{ required: true, message: "日不能为空", trigger: "blur" }],
+        schedulingDay: [
+          { required: true, message: "安排日期不能为空", trigger: "blur" },
+        ],
+        shiftIds: [
+          {
+            required: true,
+            message: "班次ID,多逗号分隔不能为空",
+            trigger: "blur",
+          },
+        ],
+        shiftNumbers: [
+          {
+            required: true,
+            message: "班次编号,多逗号分隔不能为空",
+            trigger: "blur",
+          },
+        ],
+        createBy: [
+          { required: true, message: "创建人不能为空", trigger: "blur" },
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" },
+        ],
+        updateBy: [
+          { required: true, message: "更新人不能为空", trigger: "blur" },
+        ],
+        updateTime: [
+          { required: true, message: "更新时间不能为空", trigger: "blur" },
+        ],
+        delFlag: [
+          { required: true, message: "是否删除不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return workPersonSchedulingApi.add(self.formModel);
+            } else {
+              return workPersonSchedulingApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            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 workPersonSchedulingApi.create();
+      } else {
+        return workPersonSchedulingApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/workPersonScheduling-list.vue

@@ -0,0 +1,429 @@
+<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="/workPersonScheduling">workPersonScheduling管理</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="id">
+        <el-input type="text" size="mini" v-model="queryModel.id"></el-input>
+      </el-form-item>
+      <el-form-item label="人员id" prop="personId">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.personId"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="年" prop="year">
+        <el-input type="text" size="mini" v-model="queryModel.year"></el-input>
+      </el-form-item>
+      <el-form-item label="月" prop="month">
+        <el-input type="text" size="mini" v-model="queryModel.month"></el-input>
+      </el-form-item>
+      <el-form-item label="日" prop="day">
+        <el-input type="text" size="mini" v-model="queryModel.day"></el-input>
+      </el-form-item>
+      <el-form-item label="安排日期" prop="schedulingDay">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.schedulingDay"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="班次ID,多逗号分隔" prop="shiftIds">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.shiftIds"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="班次编号,多逗号分隔" prop="shiftNumbers">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.shiftNumbers"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="创建人" prop="createBy">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.createBy"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.createTime"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="更新人" prop="updateBy">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.updateBy"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="更新时间" prop="updateTime">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.updateTime"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="是否删除" prop="delFlag">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.delFlag"
+        ></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-circle-plus"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="id" label="编号" width="180"></el-table-column>
+      <el-table-column
+        prop="personId"
+        label="人员id"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="year" label="年" width="180"></el-table-column>
+      <el-table-column prop="month" label="月" width="180"></el-table-column>
+      <el-table-column prop="day" label="日" width="180"></el-table-column>
+      <el-table-column
+        prop="schedulingDay"
+        label="安排日期"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="shiftIds"
+        label="班次ID,多逗号分隔"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="shiftNumbers"
+        label="班次编号,多逗号分隔"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="createBy"
+        label="创建人"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="updateBy"
+        label="更新人"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="updateTime"
+        label="更新时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="delFlag"
+        label="是否删除"
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作">
+        <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>
+    <workPersonScheduling-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></workPersonScheduling-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import WorkPersonSchedulingDetail from "./workPersonScheduling-detail";
+import workPersonSchedulingApi from "@/api/base/workPersonScheduling";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        personId: "",
+        year: "",
+        month: "",
+        day: "",
+        schedulingDay: "",
+        shiftIds: "",
+        shiftNumbers: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: "",
+      },
+      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);
+
+      formData.append("id", self.queryModel.id);
+      formData.append("personId", self.queryModel.personId);
+      formData.append("year", self.queryModel.year);
+      formData.append("month", self.queryModel.month);
+      formData.append("day", self.queryModel.day);
+      formData.append("schedulingDay", self.queryModel.schedulingDay);
+      formData.append("shiftIds", self.queryModel.shiftIds);
+      formData.append("shiftNumbers", self.queryModel.shiftNumbers);
+      formData.append("createBy", self.queryModel.createBy);
+      formData.append("createTime", self.queryModel.createTime);
+      formData.append("updateBy", self.queryModel.updateBy);
+      formData.append("updateTime", self.queryModel.updateTime);
+      formData.append("delFlag", self.queryModel.delFlag);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      workPersonSchedulingApi
+        .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;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    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(() => {
+          workPersonSchedulingApi.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(() => {
+        workPersonSchedulingApi.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 () {
+    this.changePage(1);
+  },
+  components: {
+    "workPersonScheduling-detail": WorkPersonSchedulingDetail,
+  },
+};
+</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>