角色人员出入权限配置

src/api/base/meetingInfo.js

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

src/api/base/rolePersonCheckOn.js

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

src/routers/modules/base.js

@@ -465,6 +465,18 @@ var routers = [
                         title: '人员排班管理'
                 }
         },
+        {
+                path: '/base/meetingInfo/list',
+                name: 'BaseMeetingInfoList',
+                // 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/meetingInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '会议管理'
+                }
+        },
 
 ]
 

src/views/base/holidayCompany-list.vue

@@ -107,14 +107,31 @@ export default {
         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 row={"id":newVal,"name":name,"subordinate":false}
-                    self.tableData.push(row);
+          var jsonData = response.data;
+          if (jsonData.result) {
+              if (jsonData.data != null && jsonData.data != "") {
+
+                var flag = true;
+                self.tableData.forEach((item, index) => {
+                  if(item.id==newVal){
+                    flag = false;
+                  }
+                })
+
+                if(flag){
+                  var name = jsonData.data;
+                  var row={"id":newVal,"name":name,"subordinate":false}
+                  self.tableData.push(row);
                 }
-            }
+                else{
+                  self.$message({
+                    message:"该单位已存在列表中！",
+                    type: "warning"
+                  });
+                }
+
+              }
+          }
         });
         
       }

src/views/base/meetingInfo-list.vue

@@ -0,0 +1,365 @@
+<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="/meetingInfo">会议设置</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 label="会议日期" prop="meetingDateRange">
+          <el-date-picker
+          size="mini"
+          v-model="queryModel.meetingDateRange"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd">
+          </el-date-picker>
+      </el-form-item>
+      <el-form-item label="推送状态" prop="pushStatus">
+        <el-select v-model="queryModel.pushStatus" size="mini" style="width:100px;" clearable>
+          <el-option v-for="(item,index) in pushStatusList" 
+          :label="item.name" :value="item.value" :key="index"></el-option>
+        </el-select>
+      </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="success" size="small" plain icon="el-icon-location-information" @click="handleAdd">会议地点管理</el-button>
+    </el-row>
+    <el-table
+      ref="formTable"
+      :data="tableData"
+      v-loading="loading"
+      :element-loading-text="loadingText"
+      stripe
+      :height="tableHeight"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column prop="number" label="会议编号" width="150"></el-table-column>
+      <el-table-column prop="name" label="会议名称" width="200"></el-table-column>
+      <el-table-column prop="meetingDate" label="会议日期" width="120">
+        <template slot-scope="{row}">
+          <div v-for="item in row.meetingDateList" v-bind:key="item.id">
+              {{item}}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="meetingTime" label="会议时间" width="120" >
+        <template slot-scope="{row}">
+          <div v-for="item in row.meetingTimeList" v-bind:key="item.id">
+              {{item}}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="addressName" label="地点"  width="150"></el-table-column>
+      <el-table-column prop="startSignInTime" label="会前签到时间" width="120">
+        <template slot-scope="{row}">
+          <div v-for="item in row.startSignInTimeList" v-bind:key="item.id">
+              {{item}}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="endSignInTime" label="结束签到时间"  width="120">
+        <template slot-scope="{row}">
+          <div v-for="item in row.endSignInTimeList" v-bind:key="item.id">
+              {{item}}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="content" label="会议内容" width="120"></el-table-column>
+      <el-table-column prop="statusN" label="会议状态" width="120"></el-table-column>
+      <el-table-column prop="pushStatusN" label="推送状态" width="120"></el-table-column>
+      <el-table-column prop="pushTime" label="推送时间" width="120"></el-table-column>
+      <el-table-column prop="createName" label="创建人" width="120"></el-table-column>
+      <el-table-column prop="remark" label="备注" width="120"></el-table-column>
+      <el-table-column label="操作" width="180" fixed="right">
+        <template slot-scope="{row}">
+          <el-row>
+            <el-col :span="10">
+              <el-link type="primary" @click="handleEdit(row)">编辑</el-link>
+            </el-col>
+            <el-col :span="10">
+              <el-link type="primary" @click="bindDevice(row)">签到详情</el-link>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="10">
+              <el-link type="danger" @click="handleDelete(row)">关闭</el-link>
+            </el-col>
+            <el-col :span="10">
+              <el-link type="success" @click="bindDevice(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>
+    <meetingInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></meetingInfo-detail>
+  </div>
+</template>
+<script>
+import meetingInfoDetail from "./meetingInfo-detail";
+import meetingInfoApi from "@/api/base/meetingInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: 'BaseMeetingInfoList',
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        name: "",
+        pushStatus:"",
+        meetingDateRange:null,
+      },
+      canteenId:"",
+      loading: false,
+      loadingText: "加载中",
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      pushStatusList:[],
+      tableHeight: 400,
+      dialogVisible: false,
+      ruleDeviceId: "",
+      ruleModel: {
+        mode: "",
+        needCap: "",
+        needMask: "",
+        measureTemperature: "",
+        type: "",
+        minimum: "",
+        maximum: "",
+        preAlarmOffset: "",
+        alarmThreshold: ""
+      },
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children"
+      },
+    };
+  },
+  created() {
+    var self = this;
+
+    dataDictionaryApi.findByCatalogName({
+      "catalogName" : "推送状态"
+    }).then(response => {
+      var jsonData = response.data;
+      this.pushStatusList = jsonData.data;
+    });
+  },
+  methods: {
+    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);
+    formData.append("pushStatus", self.queryModel.pushStatus);
+
+      meetingInfoApi
+        .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;
+    },
+    sortChange(data) {
+      console.log(data);
+
+      this.field = data.column.sortBy;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
+
+      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(() => {
+          meetingInfoApi.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(() => {
+        meetingInfoApi.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() {
+    var self = this;
+    this.changePage(1);
+
+  },
+  components: {
+    "meetingInfo-detail": meetingInfoDetail,
+  }
+};
+</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/personInfo-list.vue

@@ -265,6 +265,15 @@
         @click="batchUnBoundDevice = true"
         >解绑设备</el-button
       >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-s-check"
+        :disabled="multipleSelection.length == 0"
+        @click="batchComeOutAuth"
+        >出入权限配置</el-button
+      >
     </el-row>
     <el-table
       ref="formTable"
@@ -550,6 +559,12 @@
                 :underline="false"
                 @click="unbindWechat(row)"
                 >微信解绑</el-link
+              >-
+              <el-link
+                type="primary"
+                :underline="false"
+                @click="comeOutAuth(row)"
+                >出入权限配置</el-link
               >
             </el-col>
           </el-row>
@@ -590,10 +605,17 @@
     <!--生活记录 start-->
     <lifeRecord-list
       v-if="showRecordModal"
-      :personId="businessKey"
+      :businessKey="businessKey"
       @close="recordModalClose"
     ></lifeRecord-list>
     <!--生活记录 end-->
+    <!--出入权限配置 start-->
+    <rolePersonCheckOn-detail
+      v-if="showRolePersonCheckOnModal"
+      :businessKey="businessKey"
+      @close="rolePersonCheckOnModalClose"
+    ></rolePersonCheckOn-detail>
+    <!--出入权限配置 end-->
     <el-dialog
       title="批量导入人员"
       :visible.sync="batchImportVisible"
@@ -744,6 +766,8 @@ import PersonInfoDetail from "./personInfo-detail";
 import PersonDeviceRelationList from "./personDeviceRelation-list";
 import PersonDeviceRelationBoundList from "./personDeviceRelation-BoundList";
 
+import rolePersonCheckOnDetail from "./rolePersonCheckOn-detail";
+
 import personInfoApi from "@/api/base/personInfo";
 import companyInfoApi from "@/api/base/companyInfo";
 import companyPositionApi from "@/api/base/companyPosition";
@@ -780,6 +804,7 @@ export default {
         derviceName: "",
         parkId:""
       },
+      personIds:"",
       loading: false,
       tableData: [],
       pageIndex: 1,
@@ -838,6 +863,7 @@ export default {
       bindWechatVisible: false,
       bindWechatUrl: "",
       bindWechatLoading: false,
+      showRolePersonCheckOnModal:false,
       parkList:[]
     };
   },
@@ -1525,6 +1551,22 @@ export default {
           });
       });
     },
+    comeOutAuth(record) {
+      this.showRolePersonCheckOnModal = true;
+      this.businessKey = record.id;
+      this.titel="出入权限配置"
+    },
+    batchComeOutAuth() {
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.showRolePersonCheckOnModal = true;
+      this.businessKey = idList;
+    },
+    rolePersonCheckOnModalClose(){
+      this.showRolePersonCheckOnModal = false;
+    },
     showLifeRecord(record) {
       this.showRecordModal = true;
       this.businessKey = record.id;
@@ -1610,6 +1652,7 @@ export default {
     "personDeviceRelation-BoundList": PersonDeviceRelationBoundList,
     "el-select-tree": SelectTree,
     "lifeRecord-list": LifeRecordList,
+    "rolePersonCheckOn-detail":rolePersonCheckOnDetail
   },
 };
 </script>

src/views/base/personRoleInfo-list.vue

@@ -77,6 +77,15 @@
         @click="handleBatchDelete"
         >删除选中项</el-button
       >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-s-check"
+        :disabled="multipleSelection.length == 0"
+        @click="batchComeOutAuth"
+        >出入权限配置
+        </el-button>
     </el-row>
     <el-table
       :data="tableData"
@@ -113,6 +122,9 @@
           <el-button size="mini" type="warning" @click="handleEdit(row)"
             >编辑</el-button
           >
+          <el-button size="mini" type="primary" @click="comeOutAuth(row)"
+            >出入权限设置</el-button
+          >
           <el-button size="mini" type="danger" @click="handleDelete(row)"
             >删除</el-button
           >
@@ -133,12 +145,20 @@
       :title="modalTitle"
       @close="onDetailModalClose"
     ></personRoleInfo-detail>
+        <!--出入权限配置 start-->
+    <roleCheckOn-detail
+      v-if="showRoleCheckOnModal"
+      :businessKey="businessKey"
+      @close="roleCheckOnModalClose"
+    ></roleCheckOn-detail>
+    <!--出入权限配置 end-->
   </div>
 </template>
 <script>
 import Constant from "@/constant";
 import PersonRoleInfoDetail from "./personRoleInfo-detail";
 import personRoleInfoApi from "@/api/base/personRoleInfo";
+import roleCheckOnDetail from "./roleCheckOn-detail";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -172,6 +192,7 @@ export default {
       showModal: false,
       modalTitle: "",
       businessKey: "",
+      showRoleCheckOnModal:false,
     };
   },
   methods: {
@@ -313,12 +334,29 @@ export default {
     updateEnabled(row) {
       personRoleInfoApi.update(row);
     },
+    comeOutAuth(record) {
+      this.showRoleCheckOnModal = true;
+      this.businessKey = record.id;
+      this.titel="出入权限配置"
+    },
+    roleCheckOnModalClose(){
+      this.showRoleCheckOnModal = false;
+    },
+    batchComeOutAuth() {
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.showRoleCheckOnModal = true;
+      this.businessKey = idList;
+    },
   },
   mounted: function () {
     this.changePage(1);
   },
   components: {
     "personRoleInfo-detail": PersonRoleInfoDetail,
+    "roleCheckOn-detail":roleCheckOnDetail
   },
 };
 </script>

src/views/base/roleCheckOn-detail.vue

@@ -0,0 +1,189 @@
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+.el-tag + .el-tag {
+  margin-left: 10px;
+}
+</style>
+<template>
+    <el-dialog
+    :visible.sync="showDialog"
+    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="'150px'">
+            <el-form-item label="配置对象" prop="name">
+                <el-tag
+                v-for="tag in formModel.personRoleInfoList"
+                :key="tag.personRoleName"
+                :value="tag.id"
+                closable
+                @close="handleClose(tag)">
+                {{tag.personRoleName}}
+                </el-tag>
+            </el-form-item>
+            <el-form-item label="时间限制" prop="checkOnTimeFlag">
+                <el-radio-group v-model="formModel.checkOnTimeFlag" >
+                <div class="radioDiv">
+                    <el-radio  label="true">按时间段限制</el-radio>
+                    <el-time-picker
+                        is-range
+                        v-model="formModel.checkTimeRange"
+                        range-separator="至"
+                        start-placeholder="开始时间"
+                        end-placeholder="结束时间"
+                        placeholder="选择时间范围"
+                        format='HH:mm'
+                        value-format="HH:mm"
+                        style="width:250px">
+                    </el-time-picker>
+                </div>
+                <div>
+                    <el-radio label="false">不限制</el-radio>
+                </div>
+                </el-radio-group>
+                
+            </el-form-item>
+            <el-form-item label="次数限制" prop="checkOnCountFlag">
+                <el-radio-group v-model="formModel.checkOnCountFlag">
+                    <el-radio label="true">限制出入次数</el-radio>
+                    <el-radio label="false">不限制</el-radio>
+                </el-radio-group>   
+            </el-form-item>
+            <el-form-item label="每个班次允许" prop="checkOnCountFlag">
+                <span>
+                <el-input v-model="formModel.come" type="number"  style="width:100px"></el-input>进
+                <el-input v-model="formModel.out" type="number"  style="width:100px"></el-input>出
+                </span> 
+            </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 rolePersonCheckOnApi from "@/api/base/rolePersonCheckOn";
+export default {
+    props: ["businessKey","title"],
+    data(){
+        return {
+            ruleValidate: {
+            },
+            formModel:{},
+            showDialog: true,
+            loading: false,
+            submitting: false,
+        }
+    },
+    methods:{
+        closeDialog() {
+            this.$emit("close", false);
+        },
+        handleClose(tag) {
+        if(this.formModel.personRoleInfoList.length>1){
+            this.formModel.personRoleInfoList.splice(this.formModel.personRoleInfoList.indexOf(tag), 1);
+        }
+        else{
+            this.$message({
+            message: "角色至少保留一位",
+            type: "error"
+            });
+        } 
+        
+        },
+        handleSubmit() {
+        var self = this;
+        this.$refs["form"].validate(valid => {
+            if (valid) {
+            (function() {
+                
+                if(self.formModel.checkTimeRange.length>0){
+                   self.formModel.checkTimeRange = self.formModel.checkTimeRange[0]+","+self.formModel.checkTimeRange[1];
+                }
+                //alert(JSON.stringify(self.formModel))
+                return rolePersonCheckOnApi.save(self.formModel);
+            })().then(function(response) {
+                var jsonData = response.data;
+
+                if (jsonData.result) {
+                self.$message({
+                    message: "保存成功!",
+                    type: "success"
+                });
+
+                self.$emit("close", {
+                    result : true,
+                    data : jsonData.data
+                });
+                } else {
+                self.$message({
+                    message: jsonData.message + "",
+                    type: "warning"
+                });
+
+                self.$emit("close", {
+                    result : false
+                });
+                }
+            });
+            }
+        });
+        },
+    },
+    mounted: function() {
+        var self = this;
+        (function() {
+        self.loading = true;
+
+        if (self.businessKey.length == 0) {
+            return rolePersonCheckOnApi.create();
+        } else {
+            return rolePersonCheckOnApi.editRole(self.businessKey);
+        }
+        })()
+        .then(response => {
+            var jsonData = response.data;
+            self.loading = false;
+
+            if (jsonData.result) {
+                self.formModel = jsonData.data;
+                var checkTimeRange = new Array();
+                checkTimeRange[0]=jsonData.data.checkStartTime;
+                checkTimeRange[1]=jsonData.data.checkEndTime
+                self.formModel.checkTimeRange = checkTimeRange;
+                self.formModel.rolePerson = 0
+
+                var checkOnTimeFlag = jsonData.data.checkOnTimeFlag;
+                if(checkOnTimeFlag){
+                    self.formModel.checkOnTimeFlag="true"
+                }
+                else{
+                    self.formModel.checkOnTimeFlag="false"
+                }
+
+                var checkOnCountFlag = jsonData.data.checkOnCountFlag;
+                if(checkOnCountFlag){
+                    self.formModel.checkOnCountFlag="true"
+                }
+                else{
+                    self.formModel.checkOnCountFlag="false"
+                }
+
+            } else {
+                self.$message.error(jsonData.message + "");
+            }
+        })
+        .catch(error => {
+            self.$message.error(error + "");
+        });
+    },
+}
+</script>

src/views/base/rolePersonCheckOn-detail.vue

@@ -0,0 +1,189 @@
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+.el-tag + .el-tag {
+  margin-left: 10px;
+}
+</style>
+<template>
+    <el-dialog
+    :visible.sync="showDialog"
+    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="'150px'">
+            <el-form-item label="配置对象" prop="name">
+                <el-tag
+                v-for="tag in formModel.personInfoList"
+                :key="tag.name"
+                :value="tag.id"
+                closable
+                @close="handleClose(tag)">
+                {{tag.name}}
+                </el-tag>
+            </el-form-item>
+            <el-form-item label="时间限制" prop="checkOnTimeFlag">
+                <el-radio-group v-model="formModel.checkOnTimeFlag" >
+                <div class="radioDiv">
+                    <el-radio  label="true">按时间段限制</el-radio>
+                    <el-time-picker
+                        is-range
+                        v-model="formModel.checkTimeRange"
+                        range-separator="至"
+                        start-placeholder="开始时间"
+                        end-placeholder="结束时间"
+                        placeholder="选择时间范围"
+                        format='HH:mm'
+                        value-format="HH:mm"
+                        style="width:250px">
+                    </el-time-picker>
+                </div>
+                <div>
+                    <el-radio label="false">不限制</el-radio>
+                </div>
+                </el-radio-group>
+                
+            </el-form-item>
+            <el-form-item label="次数限制" prop="checkOnCountFlag">
+                <el-radio-group v-model="formModel.checkOnCountFlag">
+                    <el-radio label="true">限制出入次数</el-radio>
+                    <el-radio label="false">不限制</el-radio>
+                </el-radio-group>   
+            </el-form-item>
+            <el-form-item label="每个班次允许" prop="checkOnCountFlag">
+                <span>
+                <el-input v-model="formModel.come" type="number"  style="width:100px"></el-input>进
+                <el-input v-model="formModel.out" type="number"  style="width:100px"></el-input>出
+                </span> 
+            </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 rolePersonCheckOnApi from "@/api/base/rolePersonCheckOn";
+export default {
+    props: ["businessKey","title"],
+    data(){
+        return {
+            ruleValidate: {
+            },
+            formModel:{},
+            showDialog: true,
+            loading: false,
+            submitting: false,
+        }
+    },
+    methods:{
+        closeDialog() {
+            this.$emit("close", false);
+        },
+        handleClose(tag) {
+        if(this.formModel.personInfoList.length>1){
+            this.formModel.personInfoList.splice(this.formModel.personInfoList.indexOf(tag), 1);
+        }
+        else{
+            this.$message({
+            message: "人员至少保留一位",
+            type: "error"
+            });
+        } 
+        
+        },
+        handleSubmit() {
+        var self = this;
+        this.$refs["form"].validate(valid => {
+            if (valid) {
+            (function() {
+                
+                if(self.formModel.checkTimeRange.length>0){
+                   self.formModel.checkTimeRange = self.formModel.checkTimeRange[0]+","+self.formModel.checkTimeRange[1];
+                }
+                //alert(JSON.stringify(self.formModel))
+                return rolePersonCheckOnApi.save(self.formModel);
+            })().then(function(response) {
+                var jsonData = response.data;
+
+                if (jsonData.result) {
+                self.$message({
+                    message: "保存成功!",
+                    type: "success"
+                });
+
+                self.$emit("close", {
+                    result : true,
+                    data : jsonData.data
+                });
+                } else {
+                self.$message({
+                    message: jsonData.message + "",
+                    type: "warning"
+                });
+
+                self.$emit("close", {
+                    result : false
+                });
+                }
+            });
+            }
+        });
+        },
+    },
+    mounted: function() {
+        var self = this;
+        (function() {
+        self.loading = true;
+
+        if (self.businessKey.length == 0) {
+            return rolePersonCheckOnApi.create();
+        } else {
+            return rolePersonCheckOnApi.edit(self.businessKey);
+        }
+        })()
+        .then(response => {
+            var jsonData = response.data;
+            self.loading = false;
+
+            if (jsonData.result) {
+                self.formModel = jsonData.data;
+                var checkTimeRange = new Array();
+                checkTimeRange[0]=jsonData.data.checkStartTime;
+                checkTimeRange[1]=jsonData.data.checkEndTime
+                self.formModel.checkTimeRange = checkTimeRange;
+                self.formModel.rolePerson = 1
+
+                var checkOnTimeFlag = jsonData.data.checkOnTimeFlag;
+                if(checkOnTimeFlag){
+                    self.formModel.checkOnTimeFlag="true"
+                }
+                else{
+                    self.formModel.checkOnTimeFlag="false"
+                }
+
+                var checkOnCountFlag = jsonData.data.checkOnCountFlag;
+                if(checkOnCountFlag){
+                    self.formModel.checkOnCountFlag="true"
+                }
+                else{
+                    self.formModel.checkOnCountFlag="false"
+                }
+
+            } else {
+                self.$message.error(jsonData.message + "");
+            }
+        })
+        .catch(error => {
+            self.$message.error(error + "");
+        });
+    },
+}
+</script>