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

src/api/base/address.js

@@ -5,6 +5,10 @@ function pageList(formData){
   return request.post(constant.serverUrl + "/base/addressInfo/pageList", formData);
 }
 
+function list(){
+  return request.post(constant.serverUrl + "/base/addressInfo/list");
+}
+
 function create(){
   return request.get(constant.serverUrl + "/base/addressInfo/create");
 }
@@ -42,5 +46,5 @@ function batchRemove(idList){
 }
 
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,list
 }

src/api/base/companyInfo.js

@@ -82,6 +82,10 @@ function treeList() {
   return request.post(constant.serverUrl + "/base/companyInfo/treeList");
 }
 
+function outScourcerTreeList(formData) {
+  return request.post(constant.serverUrl + "/base/companyInfo/outScourcerTreeList",formData);
+}
+
 function isOpenMobilePayment(formData) {
   return request.post(constant.serverUrl + "/base/companyInfo/isOpenMobilePayment",formData);
 }
@@ -98,5 +102,5 @@ function getCompanyName(formData) {
 export default {
   list, create, edit, add, update, remove, batchRemove, pageList, queryBindDeviceList,
   bindDevice, unbindDevice,loadChildren,treeList,isOpenMobilePayment,departmentList,getCompanyName,
-  syncDevice
+  syncDevice,outScourcerTreeList
 }

src/routers/modules/base.js

@@ -776,6 +776,32 @@ var routers = [
 
                 }
         },
+        {
+                path: '/base/meetingInfo/detail',
+                name: 'BaseMeetingInfoDetail',
+                // 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-detail.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '会议编辑'
+                }
+        },
+        {
+                //外协人员管理
+                path: '/base/personInfo/listOutsourcer',
+                name: 'BasePersonInfoListOutsourcer',
+                // 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/personInfo-list-outsourcer.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '外协人员管理'
+
+                }
+        },
 
 ]
 

src/routers/modules/business.js

@@ -38,6 +38,19 @@ var routers = [
                         title: '考勤统计'
                 }
         },
+        {
+                //考勤统计
+                path: '/business/workScheduleAttendance/daylist',
+                name: 'BusinessWorkScheduleAttendanceDayList',
+                // 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/business/workScheduleAttendance-day-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '考勤统计详细'
+                }
+        },
         {
                 //考勤统计
                 path: '/business/carryThingsOutFactory/list',

src/views/base/canteenOutsourcerBalance-list.vue

@@ -21,6 +21,16 @@
       <el-form-item label="工号" prop="jobNumber">
         <el-input type="text" size="mini" v-model="queryModel.jobNumber"></el-input>
       </el-form-item>
+
+      <el-form-item label="部门" prop="companyId">
+        <el-select-tree
+          size="mini"
+          :props="props"
+          :options="companyResult"
+          v-model="queryModel.companyId"
+          height="200"
+        ></el-select-tree>&nbsp;
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -112,6 +122,8 @@ import canteenOutsourcerBalanceApi from "@/api/base/canteenOutsourcerBalance";
 import pageUtil from "@/utils/page";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
+import SelectTree from "@/components/SelectTree";
+import companyInfoApi from "@/api/base/companyInfo";
 
 export default {
   name: 'BaseCanteenOutsourcerBalanceList',
@@ -122,6 +134,7 @@ export default {
       queryModel: {
         name: "",
         jobNumber:"",
+        companyId:"",
       },
       canteenId:"",
       loading: false,
@@ -171,7 +184,15 @@ export default {
     };
   },
   created() {
+    var self = this;
+    companyInfoApi.outScourcerTreeList().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
 
+    this.loadTree();
   },
   methods: {
     indexMethod(index) {
@@ -191,6 +212,11 @@ export default {
 
     formData.append("name", self.queryModel.name);
     formData.append("jobNumber", self.queryModel.jobNumber);
+
+    if(self.queryModel.companyId!=null&&self.queryModel.companyId!=""){
+      formData.append("companyId", self.queryModel.companyId);
+    }
+    
     
 
       canteenOutsourcerBalanceApi
@@ -230,6 +256,7 @@ export default {
     },
     handleReset(name) {
       this.$refs[name].resetFields();
+      this.queryModel.companyId = "";
     },
     handleAdd() {
       this.modalTitle = "新增";
@@ -353,6 +380,7 @@ export default {
     "canteenDiningRecord-list": canteenDiningRecordList,
     "canteenOutsourcerRechargeRecord-list": canteenOutsourcerRechargeRecordList,
     "canteenOutsourcerRecharge":canteenOutsourcerRecharge,
+    "el-select-tree": SelectTree,
   }
 };
 </script>

src/views/base/meetingInfo-detail.vue

@@ -1,19 +1,36 @@
 
-<style scoped>
-.user-panel {
-  margin: 10px auto;
+<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>
 <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="950px"
-  >
+  <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>
     <div class="user-panel" v-loading="loading">
       <el-form
         ref="form"
@@ -23,6 +40,7 @@
         :inline="true" 
         class="demo-form-inline"
       >
+      <h4>会议基础信息</h4>
         <el-form-item label="会议编号" prop="number">
           <el-input
             v-model="formModel.number"
@@ -38,67 +56,154 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="会议地点" prop="addressId">
-          <el-input
-            v-model="formModel.addressId"
-            placeholder="请输入详细地址"
-            style="width: 300px"
-          ></el-input>
+          <el-select v-model="formModel.addressId" placeholder="请选择" style="width: 180px">
+            <el-option
+              v-for="item in addressList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+              >
+            </el-option>
+          </el-select>
+           <el-button type="primary" style="margin-left: 20px">添加地点</el-button>
         </el-form-item>
-        <el-form-item label="会议日期" prop="addressId">
+        <el-form-item label="会议日期" prop="meetingDate">
           <el-input
-            v-model="formModel.addressId"
+            v-model="formModel.meetingDate"
             placeholder="请输入详细地址"
             style="width: 300px"
           ></el-input>
         </el-form-item>
-                <el-form-item label="会议内容" prop="addressId">
+                <el-form-item label="会议内容" prop="content">
           <el-input
-            v-model="formModel.addressId"
+            v-model="formModel.content"
             placeholder="请输入详细地址"
             style="width: 300px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="会议备注" prop="addressId">
+        <el-form-item label="会议备注" prop="remark">
           <el-input
-            v-model="formModel.addressId"
+            v-model="formModel.remark"
             placeholder="请输入详细地址"
             style="width: 300px"
           ></el-input>
         </el-form-item>
         <h4>会议配置</h4>
-        <el-table
-        ref="formTable"
-        :data="tableData"
-        v-loading="loading"
-        :element-loading-text="loadingText"
-        stripe
-        :height="tableHeight"
-        >
-        <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="name" label="会议时间" width="200"></el-table-column>
-        <el-table-column prop="name" label="会前签到时间" ></el-table-column>
-        <el-table-column prop="name" label="结束签到时间" ></el-table-column>
-        </el-table>
-        <el-divider></el-divider>
-        <h4>添加参会人员</h4>
-        <el-form-item label="部门" prop="number">
-          <el-input
-            v-model="formModel.number"
-            placeholder="请输入会议编号"
-            style="width: 200px"
-          ></el-input>
-        </el-form-item>
 
-        <template>
-            <el-transfer
-                filterable
-                :filter-method="filterMethod"
-                filter-placeholder="请输入城市拼音"
-                v-model="value"
-                :data="data">
-            </el-transfer>
-        </template>
+        <el-table :data="formModel.meetingTimeList">
+            <el-table-column
+              type="index"
+              label="序号"
+              width="55"
+            ></el-table-column>
+            <el-table-column prop="name" label="会议日期" width="270px">
+                <el-form-item>
+                  <el-date-picker
+                    v-model="value1"
+                    type="date"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>
+            </el-table-column>
+            <el-table-column prop="classify" label="会议时间" width="400px">
+               <el-form-item>
+                <el-time-picker
+                  is-range
+                  v-model="value1"
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  placeholder="选择时间范围">
+                </el-time-picker>
+               </el-form-item>
+            </el-table-column>
+            <el-table-column prop="location" label="会前签到时间" width="400px">
+                <el-form-item>
+                  <el-time-picker
+                    is-range
+                    v-model="value1"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    placeholder="选择时间范围">
+                  </el-time-picker>
+                </el-form-item>
+            </el-table-column>
+            <el-table-column prop="name" label="结束签到时间" width="400px">
+
+                <el-form-item>
+                  <el-time-picker
+                    is-range
+                    v-model="value1"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    placeholder="选择时间范围">
+                  </el-time-picker>
+                </el-form-item>
+            </el-table-column>
+            <el-table-column label="操作" width="150">
+              <template slot-scope="{ row }">
+                <el-form-item>
+                  <i
+                    class="el-icon-delete my-font"
+                    @click="handleDelete(row)"
+                  ></i>
+                  <i class="el-icon-top my-font" @click="handleUp(row)"></i>
+                  <i
+                    class="el-icon-bottom my-font"
+                    @click="handleDown(row)"
+                  ></i>
+                  <i
+                    class="el-icon-document-add my-font"
+                    @click="handleInsert(row)"
+                  ></i>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <div slot="empty">
+              <el-button
+                icon="el-icon-circle-plus-outline"
+                :plain="true"
+                @click="handleAdd()"
+                >新增</el-button
+              >
+            </div>
+          </el-table>
+
+          <div
+            class="el-table__empty-block"
+            v-if="formModel.meetingTimeList.length != 0"
+          >
+            <el-button icon="el-icon-circle-plus-outline" @click="handleAdd()"
+              >新增</el-button
+            >
+          </div>
+
+        <h4>添加参会人员</h4>
+        <el-row>
+          <el-form-item label="部门" prop="companyInfoId">
+            <el-input
+              v-model="formModel.companyInfoId"
+              placeholder="请输入会议编号"
+              style="width: 200px"
+              size="mini"
+            ></el-input>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="添加人员" prop="companyInfoId">
+            <template>
+                <el-transfer
+                    filterable
+                    :filter-method="filterMethod"
+                    filter-placeholder="请输入城市拼音"
+                    v-model="value"
+                    :data="data">
+                </el-transfer>
+            </template>
+          </el-form-item>
+        </el-row>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -107,14 +212,15 @@
         >确 定</el-button
       >
     </span>
-  </el-dialog>
+  </div>
 </template>
 <script>
 import meetingInfoApi from "@/api/base/meetingInfo";
-import dataDictionaryApi from "@/api/sys/dataDictionary";
+import addressInfoApi from "@/api/base/address";
 import "nprogress/nprogress.css"; // progress bar style
 
 export default {
+  name: "baseMeetingDetail",
   props: ["businessKey", "title"],
   data() {
     const generateData = _ => {
@@ -134,10 +240,19 @@ export default {
     return {
         data: generateData(),
         value:[],
-        formModel: {},
+        formModel: {
+          addressId:"",
+          meetingTimeList: [],
+          removeMeetingTimeList: []
+        },
         ruleValidate: {
-            name: [{ required: true, message: "会议地点名称不能为空", trigger: "blur" }],
+            number: [{ required: true, message: "会议编号不能为空", trigger: "blur" }],
+            name: [{ required: true, message: "会议名称不能为空", trigger: "blur" }],
+            addressId: [{ required: true, message: "会议地点不能为空", trigger: "blur" }],
+            meetingDate: [{ required: true, message: "会议地点名称不能为空", trigger: "blur" }],
+
         },
+        addressList:[],
         showDialog: true,
         loading: false,
         submitting: false,
@@ -146,6 +261,15 @@ export default {
         },
     };
   },
+  created() {
+    var self = this;
+    addressInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.addressList = jsonData.data;
+      }
+    });
+  },
   methods: {
     closeDialog() {
       this.$emit("close", false);
@@ -185,6 +309,41 @@ export default {
         }
       });
     },
+    handleAdd() {
+      this.formModel.meetingTimeList.push({
+        sortNo: this.formModel.meetingTimeList.length + 1,
+        name: "",
+        routeId: this.businessKey,
+        classify: "",
+        location: "",
+        delFlag: 0,
+      });
+    },
+    handleDelete(row) {
+      var meetingTimeList = this.formModel.meetingTimeList;
+
+      meetingTimeList.splice(meetingTimeList.indexOf(row), 1);
+
+      this.formModel.removeMeetingTimeList.push(row);
+    },
+    handleUp(row) {
+      var meetingTimeList = this.formModel.meetingTimeList;
+      var index = meetingTimeList.indexOf(row);
+
+      if (index > 0) {
+        meetingTimeList.splice(index, 1);
+        meetingTimeList.splice(index - 1, 0, row);
+      }
+    },
+    handleDown(row) {
+      var meetingTimeList = this.formModel.meetingTimeList;
+      var index = meetingTimeList.indexOf(row);
+
+      if (index < meetingTimeList.length - 1) {
+        meetingTimeList.splice(index, 1);
+        meetingTimeList.splice(index + 1, 0, row);
+      }
+    },
   },
   mounted: function () {
     var self = this;

src/views/base/meetingInfo-list.vue

@@ -54,7 +54,7 @@
     </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" @click="handleToDetail">新增</el-button>
       <el-button type="success" size="small" plain icon="el-icon-location-information" @click="handleToAddress">会议地点管理</el-button>
     </el-row>
     <el-table
@@ -108,7 +108,7 @@
         <template slot-scope="{row}">
           <el-row>
             <el-col :span="10">
-              <el-link type="primary" @click="handleEdit(row)">编辑</el-link>
+              <el-link type="primary" @click="handleToDetail(row)">编辑</el-link>
             </el-col>
             <el-col :span="10">
               <el-link type="primary" @click="bindDevice(row)">签到详情</el-link>
@@ -133,16 +133,9 @@
       @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
@@ -332,6 +325,22 @@ export default {
         this.changePage(this.pageIndex);
       }
     },
+    handleToDetail(row){
+      var path = "/base/meetingInfo/detail";
+
+      this.$store.dispatch("tagsView/delView", {
+          name: "BaseMeetingInfoDetail",
+          path: path,
+          })
+          .then(({ visitedViews }) => {
+          this.$router.push({
+              path: path,
+              query: {
+                id: row.id,
+              },
+          });
+      });
+    },
     handleToAddress(){
       var path = "/base/addressInfo/list";
 
@@ -351,9 +360,6 @@ export default {
     this.changePage(1);
 
   },
-  components: {
-    "meetingInfo-detail": meetingInfoDetail,
-  }
 };
 </script>
 <style lang="scss" scoped>

src/views/base/personInfo-list-outsourcer.vue

@@ -0,0 +1,1896 @@
+<template>
+  <div style="position: relative">
+    <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="/personInfo">外协人员管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+        要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <div>
+        <el-form-item label="编号" prop="id">
+          <el-input
+            type="text"
+            size="mini"
+            style="width: 120px"
+            v-model="queryModel.id"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input
+            type="text"
+            size="mini"
+            v-model="queryModel.name"
+            style="width: 120px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="手机号" prop="phone">
+          <el-input
+            type="text"
+            size="mini"
+            v-model="queryModel.phone"
+            style="width: 120px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="身份证" prop="idCard">
+          <el-input
+            type="text"
+            size="mini"
+            v-model="queryModel.idCard"
+            style="width: 190px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="绑定设备名称" prop="derviceName">
+          <el-input
+            type="text"
+            size="mini"
+            v-model="queryModel.derviceName"
+            style="width: 120px"
+          ></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>
+      </div>
+      <div>
+        <el-form-item label="单位" prop="parentId">
+          <el-select-tree
+            size="mini"
+            :props="props"
+            :options="companyResult"
+            v-model="queryModel.parentId"
+            height="200"
+          ></el-select-tree
+          >&nbsp;
+          <el-checkbox v-model="queryModel.subordinate"
+            >是否包含下级单位</el-checkbox
+          >
+        </el-form-item>
+        <el-form-item label="身份" prop="roleId">
+        <el-select
+          v-model="queryModel.roleId"
+          filterable
+          clearable
+          size="mini"
+          placeholder="请选择"
+          style="width: 120px"
+        >
+          <el-option
+            v-for="role in roleResult"
+            :key="role.id"
+            :label="role.personRoleName"
+            :value="role.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+        <el-form-item label="是否上传照片" prop="isUploadPhoto">
+          <el-select
+            v-model="queryModel.isUploadPhoto"
+            size="mini"
+            clearable
+            placeholder="请选择"
+            style="width: 90px"
+          >
+            <el-option value="1" label="已上传"></el-option>
+            <el-option value="0" label="未上传"></el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="是否同步" prop="faceBound">
+          <el-select
+            v-model="queryModel.faceBound"
+            size="mini"
+            clearable
+            placeholder="请选择"
+            style="width: 100px"
+          >
+            <el-option value label="全部"></el-option>
+            <el-option value="1" label="已同步"></el-option>
+            <el-option value="0" label="未同步"></el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item label="是否需要考勤" prop="enableAttendance">
+          <el-select
+            v-model="queryModel.enableAttendance"
+            size="mini"
+            clearable
+            placeholder="请选择"
+            style="width: 90px"
+          >
+            <el-option :value="true" label="是"></el-option>
+            <el-option :value="false" label="否"></el-option>
+          </el-select>
+        </el-form-item>
+        </div>
+      <div>
+        <el-form-item label="允许审核注册用户" prop="enableRegisterExamine">
+          <el-select
+            v-model="queryModel.enableRegisterExamine"
+            size="mini"
+            clearable
+            placeholder="请选择"
+            style="width: 90px"
+          >
+            <el-option :value="true" label="是"></el-option>
+            <el-option :value="false" label="否"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="健康码" prop="healthyCode">
+          <el-select
+            v-model="queryModel.healthyCode"
+            size="mini"
+            placeholder="请选择"
+            style="width:100px"
+          >
+          <el-option
+              v-for="item in healthyCodeList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+          ></el-option>
+          </el-select>
+        </el-form-item>
+      </div>
+      <!-- <div>
+        <el-form-item v-if="position1Show" :label="position1" prop="position1">
+          <el-input
+            type="text"
+            size="mini"
+            v-model="queryModel.position1"
+          ></el-input>
+        </el-form-item>
+        <el-form-item v-if="position2Show" :label="position2" prop="position2">
+          <el-input
+            type="text"
+            size="mini"
+            v-model="queryModel.position2"
+          ></el-input>
+        </el-form-item>
+        <el-form-item v-if="position3Show" :label="position3" prop="position3">
+          <el-input
+            type="text"
+            size="mini"
+            v-model="queryModel.position3"
+          ></el-input>
+        </el-form-item>
+        <el-form-item v-if="position4Show" :label="position4" prop="position4">
+          <el-input
+            type="text"
+            size="mini"
+            v-model="queryModel.position4"
+          ></el-input>
+        </el-form-item>
+        <el-form-item v-if="position5Show" :label="position5" prop="position5">
+          <el-input
+            type="text"
+            size="mini"
+            v-model="queryModel.position5"
+          ></el-input>
+        </el-form-item>
+      </div> -->
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-remove"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-remove"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-remove"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchClearFaceImg"
+        >清除设备照片</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-upload2"
+        @click="batchImportVisible = true"
+        >导入</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-download"
+        :loading="xlsLoading"
+        @click="downloadAll"
+        >导出数据</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-refresh"
+        :disabled="multipleSelection.length == 0"
+        @click="dataSync"
+        >数据同步</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-refresh"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchEnabledFace"
+        >开启自动同步</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-refresh"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchEnabledFace"
+        >人脸授权</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-refresh"
+        :disabled="multipleSelection.length == 0"
+        @click="batchBoundDevice = true"
+        >关联设备</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-refresh"
+        :disabled="multipleSelection.length == 0"
+        @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"
+      :data="tableData"
+      v-loading="loading"
+      :height="tableHeight"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        prop="id"
+        label="人员编号"
+        width="80"
+        fixed="left"
+      ></el-table-column>
+      <el-table-column
+        prop="jobNumber"
+        label="工号"
+        width="80"
+        fixed="left"
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="姓名"
+        width="80"
+        fixed="left"
+      ></el-table-column>
+      <el-table-column
+        prop="faceImageUrl"
+        label="人员照片"
+        width="80"
+        fixed="left"
+      >
+        <template slot-scope="{ row }">
+          <a :href="row.faceImageUrl" target="_blank">
+            <el-avatar
+              :size="48"
+              shape="circle"
+              :src="
+                row.faceImageUrl +
+                '?x-oss-process=image/resize,m_fill,w_64,h_64'
+              "
+              :key="row.id"
+            ></el-avatar>
+          </a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="主要单位"
+        width="250"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="popedomName"
+        label="主要身份"
+        width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="mechanism"
+        label="所有单位身份"
+        width="250"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="phone"
+        label="手机号"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="idCard"
+        label="身份证"
+        width="100"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column prop="healthyCodeN" label="健康码" width="80">
+        <template slot-scope="{row}">
+          <span v-if="row.healthyCode">
+            <span v-if="row.healthyCode == '00'" style="color:green">绿码</span>
+            <span v-else-if="row.healthyCode == '01'" style="color:yellow">黄码</span>
+            <span v-else-if="row.healthyCode == '02'" style="color:red">红码</span>
+            <span v-else style="color:gray">灰码</span>
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="工作状态" width="120">
+        <template slot-scope="{ row }">
+          <span v-if="row.workStatus == 1">工作</span>
+          <span v-else-if="row.workStatus == 2">外出</span>
+          <span v-else-if="row.workStatus == 3">出差</span>
+          <span v-else-if="row.workStatus == 4">休假</span>
+          <span v-else>未设置</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="deviceName"
+        label="绑定设备"
+        width="150"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column prop="openId" label="是否绑定公众号" width="180">
+        <template slot-scope="{ row }">{{
+          row.openId == null ? "否" : "是"
+        }}</template>
+      </el-table-column>
+      <el-table-column prop="faceBound" label="是否同步人脸信息" width="180">
+        <template slot-scope="{ row }">{{
+          row.faceBound ? "是" : "否"
+        }}</template>
+      </el-table-column>
+      <el-table-column label="是否自动同步" width="120">
+        <template slot-scope="{ row }">
+          <el-switch
+            v-model="row.isSync"
+            @change="enabledTo(row, 'sync', row.faceEnabled)"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            :disabled="disabled"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="人脸授权">
+        <template slot-scope="{ row }">
+          <el-switch
+            v-model="row.faceEnabled"
+            @change="enabledTo(row, 'face', row.faceEnabled)"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            :disabled="disabled"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="刷卡授权">
+        <template slot-scope="{ row }">
+          <el-switch
+            v-model="row.cardEnabled"
+            @change="enabledTo(row, 'card', '')"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            :disabled="disabled"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="手机授权">
+        <template slot-scope="{ row }">
+          <el-switch
+            v-model="row.appEnabled"
+            @change="enabledTo(row, 'app', '')"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            :disabled="disabled"
+          ></el-switch>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="密码">
+        <template slot-scope="{row}">
+          <el-switch v-model="row.passwordEnabled" @change="enabledTo(row.id,'face')" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+        </template>
+      </el-table-column>-->
+      <!-- <el-table-column label="访客授权">
+        <template slot-scope="{ row }">
+          <el-switch
+            v-model="row.guestEnabled"
+            @change="enabledTo(row, 'guest', '')"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            :disabled="disabled"
+          ></el-switch>
+        </template>
+      </el-table-column> -->
+      <el-table-column label="接收微信通知">
+        <template slot-scope="{ row }">
+          <el-switch
+            v-model="row.wechatNoticeEnabled"
+            @change="enabledTo(row, 'wechatNotice', '')"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            :disabled="disabled"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="openId"
+        label="微信openid"
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作" width="300" fixed="right">
+        <template slot-scope="{ row }">
+          <el-row>
+            <el-col>
+              <span v-if="row.delFlag">
+                <el-link
+                  type="danger"
+                  :underline="false"
+                  @click="handleClearFaceImg(row)"
+                  >清除图片</el-link
+                >-
+              </span>
+              <span v-else>
+                <el-link
+                  type="primary"
+                  :underline="false"
+                  @click="handleEdit(row)"
+                  >编辑</el-link
+                >-
+                <el-link
+                  type="danger"
+                  :underline="false"
+                  @click="handleDelete(row)"
+                  >删除</el-link
+                >-
+                <el-link
+                  type="primary"
+                  :underline="false"
+                  @click="bindRole(row)"
+                  >机构身份管理</el-link
+                >-
+                <span v-if="row.faceBound">
+                  <el-link
+                    type="primary"
+                    :underline="false"
+                    :disabled="true"
+                    @click="uploadData(row)"
+                    >数据同步</el-link
+                  >-
+                </span>
+                <span v-if="!row.faceBound">
+                  <el-link
+                    type="primary"
+                    :underline="false"
+                    @click="uploadData(row)"
+                    >数据同步</el-link
+                  >-
+                </span>
+              </span>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col>
+              <el-link
+                type="primary"
+                :underline="false"
+                @click="bindDevice(row)"
+                >关联设备</el-link
+              >-
+              <el-link type="primary" :underline="false" @click="showBound(row)"
+                >已关联设备</el-link
+              >-
+              <el-link
+                type="primary"
+                :underline="false"
+                @click="showLifeRecord(row)"
+                >生活记录</el-link
+              >-
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col>
+              <el-link
+                type="primary"
+                :underline="false"
+                @click="bindWechat(row)"
+                >微信绑定</el-link
+              >-
+              <el-link
+                type="primary"
+                :underline="false"
+                @click="unbindWechat(row)"
+                >微信解绑</el-link
+              >-
+              <el-link
+                type="primary"
+                :underline="false"
+                @click="updateHealthyCode(row)"
+                >更新健康码</el-link>-
+                <el-link
+                type="primary"
+                :underline="false"
+                @click="comeOutAuth(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>
+    <personInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      :companyResult="companyResult"
+      :companyPosition1="position1"
+      :companyPosition2="position2"
+      :companyPosition3="position3"
+      :companyPosition4="position4"
+      :companyPosition5="position5"
+      @close="onDetailModalClose"
+    ></personInfo-detail>
+    <personDeviceRelation-list
+      v-if="showDeviceModal"
+      :personId="personId"
+      @close="onDetailModalClose"
+    ></personDeviceRelation-list>
+    <personDeviceRelation-BoundList
+      v-if="showBoundModal"
+      :personId="personId"
+      @close="onDetailModalClose"
+    ></personDeviceRelation-BoundList>
+    <!--批量导入S-->
+    <!--生活记录 start-->
+    <lifeRecord-list
+      v-if="showRecordModal"
+      :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"
+      :modal-append-to-body="false"
+      style="text-align: left"
+      :close-on-click-modal="false"
+    >
+      <el-form label-width="150px">
+        <el-form-item label="模板下载">
+          <el-link
+            href="http://rccs.oss-cn-hangzhou.aliyuncs.com/smart/personInfo/2020/10/小鹏管家人员导入模板.xls"
+            type="primary"
+            target="_blank"
+            >点击下载模板</el-link
+          >
+        </el-form-item>
+        <!-- <el-form-item label="单位">
+          <el-select-tree
+            size="large"
+            :props="props"
+            :options="companyResult"
+            v-model="uploadXlsData.companyId"
+            height="200"
+            width="300px"
+          ></el-select-tree>
+        </el-form-item> -->
+        <el-form-item label="用户身份" prop="personRoleId">
+          <el-select
+            filterable
+            placeholder="请选择"
+            style="width: 300px;"
+            v-model="uploadXlsData.personRoleId"
+          >
+            <el-option
+              v-for="role in personRoleResult"
+              :key="role.personRoleName"
+              :label="role.personRoleName"
+              :value="role.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>        
+        <el-form-item label="上传文件">
+          <el-upload
+            class="upload-demo"
+            accept=".xls"
+            :action="uploadUrlXls"
+            :data="uploadXlsData"
+            :headers="headers"
+            :on-preview="handleBatchImportPreview"
+            name="uploadFile"
+            :multiple="true"
+            :limit="1"
+            :on-remove="handleBatchImportRemove"
+            :before-remove="beforeBatchImportRemove"
+            :before-upload="beforeUpload"
+            :on-exceed="handleBatchImportExceed"
+            :on-success="handleBatchImportSuccess"
+            :file-list="batchImportFileList"
+          >
+            <el-button size="small" type="primary" :loading="xlsLoading"
+              >点击上传</el-button
+            >
+            <div slot="tip" class="el-upload__tip">
+              只能上传xls文件，且不超过500kb
+            </div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="batchImportVisible = false"
+          >关 闭</el-button
+        >
+      </div>
+    </el-dialog>
+    <!--批量导入E-->
+    <!-- 批量绑定设备 -->
+    <el-dialog
+      title="绑定设备"
+      :visible.sync="batchBoundDevice"
+      :modal-append-to-body="false"
+      style="text-align: left"
+      :close-on-click-modal="false"
+    >
+      <el-form
+        label-width="150px"
+        v-loading="boundDeviceDisabled"
+        element-loading-text="正在操作,请稍等"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      >
+        <el-form-item label="设备">
+          <el-select
+            v-model="boundDeviceIds"
+            filterable
+            placeholder="请选择"
+            multiple
+            style="width: 300px"
+          >
+            <el-option
+              v-for="devices in deviceResult"
+              :key="devices.id"
+              :label="devices.aliasName"
+              :value="devices.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="closeBatchBoundDevice">关 闭</el-button>
+        <el-button type="primary" @click="handleBatchBoundDevice"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
+    <!-- 批量绑定设备end -->
+    <!-- 批量解绑设备 -->
+    <el-dialog
+      title="解绑设备"
+      :visible.sync="batchUnBoundDevice"
+      :modal-append-to-body="false"
+      style="text-align: left"
+      :close-on-click-modal="false"
+    >
+      <el-form label-width="150px" v-loading="boundDeviceDisabled">
+        <el-form-item label="设备">
+          <el-select v-model="boundUnDeviceId" filterable placeholder="请选择">
+            <el-option
+              v-for="devices in deviceResult"
+              :key="devices.id"
+              :label="devices.aliasName"
+              :value="devices.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="closeBatchUnBoundDevice">关 闭</el-button>
+        <el-button type="primary" @click="handleBatchUnBoundDevice">确 定</el-button>
+      </div>
+    </el-dialog>
+    <!-- 批量解绑设备end -->
+    <el-dialog
+      title="扫码绑定微信"
+      :visible.sync="bindWechatVisible"
+      :modal-append-to-body="false"
+      :close-on-click-modal="false"
+      width="340px"
+    >
+      <div v-loading="bindWechatLoading">
+        <img :src="bindWechatUrl" style="width: 300px; fit-object: cover" />
+      </div>
+    </el-dialog>
+    <personPopedom-list
+      v-if="showRoleModal"
+      :personId="personId"
+      @close="onDetailModalClose"
+    ></personPopedom-list>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import PersonInfoDetail from "./personInfo-detail";
+import PersonDeviceRelationList from "./personDeviceRelation-list";
+import PersonDeviceRelationBoundList from "./personDeviceRelation-BoundList";
+import PersonPopedomList from "./personPopedom-list";
+
+import rolePersonCheckOnDetail from "./rolePersonCheckOn-detail";
+
+import personInfoApi from "@/api/base/personInfo";
+import companyInfoApi from "@/api/base/companyInfo";
+import personRoleInfoApi from "@/api/base/personRoleInfo";
+import companyPositionApi from "@/api/base/companyPosition";
+import deviceInfoApi from "@/api/base/deviceInfo";
+import personDeviceRelationApi from "@/api/base/personDeviceRelation";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import SelectTree from "@/components/SelectTree";
+import LifeRecordList from "./lifeRecord-list";
+
+import { getToken } from "@/utils/auth"; // get token from cookie
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "BasePersonInfoList",
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        companyCode: "",
+        parentId: "",
+        name: "",
+        phone: "",
+        idCard: "",
+        faceBound: "",
+        isUploadPhoto: "",
+        subordinate: false,
+        position1: "",
+        position2: "",
+        position3: "",
+        position4: "",
+        position5: "",
+        derviceName: "",
+        parkId: "",
+        roleId:"",
+        enableAttendance: null,
+        enableRegisterExamine: null,
+        healthyCode:"",
+      },
+      personIds:"",
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 30,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [30, 100, 500],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      companyResult: [],
+      batchImportVisible: false,
+      batchImportFileList: [],
+      uploadUrlXls: Constant.serverUrl + "/base/personInfo/importXls",
+      uploadXlsData: {
+        subFolder: "company",
+        // companyId: "",
+        personRoleId: ""
+      },
+      personRoleResult: [],
+      headers: {
+        Authorization: getToken(),
+      },
+      disabled: false,
+      position1: "",
+      position2: "",
+      position3: "",
+      position4: "",
+      position5: "",
+      position1Show: false,
+      position2Show: false,
+      position3Show: false,
+      position4Show: false,
+      position5Show: false,
+      showDeviceModal: false,
+      showBoundModal: false,
+      personId: "",
+      batchBoundDevice: false,
+      batchUnBoundDevice: false,
+      deviceResult: "",
+      boundDeviceIds: [],
+      boundUnDeviceId: "",
+      xlsLoading: false,
+      tableHeight: 400,
+      boundDeviceDisabled: false,
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      showRecordModal: false,
+      bindWechatVisible: false,
+      bindWechatUrl: "",
+      bindWechatLoading: false,
+      showRolePersonCheckOnModal:false,
+      parkList: [],
+      showRoleModal: false,
+      roleResult:[],
+      healthyCodeList:[],
+    };
+  },
+  watch: {
+    // "uploadXlsData.companyId":function(newVal,oldVal){
+    //     var self = this;
+
+    //     if(newVal!=null){
+    //       var formData = new FormData();
+    //       formData.append("companyId", newVal);
+
+    //       //查询单位下角色
+    //       personRoleInfoApi.listByCompanyId(formData)
+    //       .then(response=>{
+    //           var jsonData = response.data;
+
+    //           if (jsonData.result) {
+    //             self.personRoleResult = jsonData.data;
+    //           }
+    //       })
+    //     }
+    // },
+    "queryModel.parentId": function (val, oldval) {
+      if (val != null && val != "") {
+        var self = this;
+        var formData = new FormData();
+        formData.append("companyId", val);
+        personRoleInfoApi.listByCompanyId(formData).then(function (response) {
+          var jsonData = response.data;
+          if (jsonData.result) {
+            if (jsonData.data != null && jsonData.data != "") {
+              self.roleResult = jsonData.data;
+            }
+          }
+        });
+      }
+    }
+  },
+  created() {
+    var self = this;
+
+    var formData1 = new FormData();
+
+    companyInfoApi.outScourcerTreeList(formData1).then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.companyResult = jsonData.data;
+        }
+      }
+    });
+
+    var formData = new FormData();
+    formData.append("catalogName", "健康码");
+    dataDictionaryApi.findByCatalogName(formData).then(response => {
+      var jsonData = response.data;
+      this.healthyCodeList = jsonData.data;
+    });
+
+    // companyInfoApi.list({ type: "3" }).then((response) => {
+    //   var jsonData = response.data;
+    //   this.parkList = jsonData.data;
+    // });
+
+    deviceInfoApi.list().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.deviceResult = jsonData.data;
+        }
+      }
+    });
+
+    companyPositionApi.detailForCompany().then(function (response) {
+      var jsonData = response.data.data;
+      if (jsonData.position1Name != null && jsonData.position1Name != "") {
+        self.position1 = jsonData.position1Name;
+        self.position1Show = true;
+      }
+      if (jsonData.position2Name != null && jsonData.position2Name != "") {
+        self.position2 = jsonData.position2Name;
+        self.position2Show = true;
+      }
+      if (jsonData.position3Name != null && jsonData.position3Name != "") {
+        self.position3 = jsonData.position3Name;
+        self.position3Show = true;
+      }
+      if (jsonData.position4Name != null && jsonData.position4Name != "") {
+        self.position4 = jsonData.position4Name;
+        self.position4Show = true;
+      }
+      if (jsonData.position5Name != null && jsonData.position5Name != "") {
+        self.position5 = jsonData.position5Name;
+        self.position5Show = true;
+      }
+    });
+
+    var formData5 = new FormData();
+    formData5.append("sceneId", "1");
+
+    //查询单位下角色
+    personRoleInfoApi.findBySceneId(formData5)
+    .then(response=>{
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          self.personRoleResult = jsonData.data;
+        }
+    })
+
+    this.loadTree();
+  },
+  methods: {
+    getSelectedValue(value) {
+      this.queryModel.parentId = value;
+    },
+    loadTree() {
+      companyInfoApi.treeList().then((resp) => {
+        var jsonData = resp.data;
+
+        if (jsonData.result) {
+          this.treeData = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+    loadChildren(tree, treeNode, resolve) {
+      console.log(tree);
+
+      var formData = new FormData();
+      formData.append("parentId", tree.id);
+
+      companyInfoApi.loadChildren(formData).then((resp) => {
+        var jsonData = resp.data;
+
+        if (jsonData.result) {
+          resolve(jsonData.data);
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+    adjustTableHeight() {
+      var self = this;
+      self.tableHeight = window.innerHeight - self.$refs.formTable.$el.offsetTop - 110;
+    },
+    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 (self.queryModel.parentId == null) {
+        self.queryModel.parentId = "";
+      }
+      formData.append("companyCode", self.queryModel.companyCode);
+      formData.append("parentId", self.queryModel.parentId);
+
+      formData.append("subordinate", self.queryModel.subordinate);
+
+      formData.append("id", self.queryModel.id);
+      formData.append("name", self.queryModel.name);
+      formData.append("phone", self.queryModel.phone);
+      formData.append("idCard", self.queryModel.idCard);
+      formData.append("faceBound", self.queryModel.faceBound);
+      formData.append("isUploadPhoto", self.queryModel.isUploadPhoto);
+
+      if(self.queryModel.enableRegisterExamine!=null){
+        formData.append("enableRegisterExamine", self.queryModel.enableRegisterExamine);
+      }
+      
+      if(self.queryModel.enableAttendance!=null){
+        formData.append("enableAttendance", self.queryModel.enableAttendance);
+      }
+
+      formData.append("position1", self.queryModel.position1);
+      formData.append("position2", self.queryModel.position2);
+      formData.append("position3", self.queryModel.position3);
+      formData.append("position4", self.queryModel.position4);
+      formData.append("position5", self.queryModel.position5);
+
+      formData.append("derviceName", self.queryModel.derviceName);
+
+      formData.append("roleId", self.queryModel.roleId);
+
+      formData.append("outsourcerStatus", "1");
+
+      
+
+      if (self.queryModel.parkId == null) {
+        self.queryModel.parkId = "";
+      }
+      formData.append("parkId", self.queryModel.parkId);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      formData.append("healthyCode", self.queryModel.healthyCode);
+
+      personInfoApi
+        .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.adjustTableHeight();
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.changePage(this.pageIndex);
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      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(() => {
+          self.loading = true;
+          personInfoApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+            self.loading = false;
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        })
+        .catch(() => {
+          self.loading = false;
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        self.loading = true;
+        personInfoApi
+          .batchRemove(idList)
+          .then(function (response) {
+            var jsonData = response.data;
+            self.loading = false;
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          })
+          .catch(() => {
+            self.loading = false;
+          });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+      this.showDeviceModal = false;
+      this.showBoundModal = false;
+      this.showRoleModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    bindDevice(record) {
+      //绑定设备
+      this.personId = record.id;
+      this.showDeviceModal = true;
+    },
+    showBound(record) {
+      //展示绑定设备
+      //人员信息ID
+      this.personId = record.id;
+      this.showBoundModal = true;
+    },
+    beforeUpload(file, fileList) {
+      //导入前判断
+      var self = this;
+      var personRoleId = self.uploadXlsData.personRoleId;
+
+      if (personRoleId==null || personRoleId.length==0) {
+        self.$message({
+          type: "warning",
+          message: "请选择用户身份!",
+        });
+        self.xlsLoading = false;
+        return false;
+      } else {
+        self.xlsLoading = true;
+        return true;
+      }
+    },
+    //批量导入-上传成功
+    handleBatchImportSuccess(response, file, fileList) {
+      var self = this;
+      self.xlsLoading = false;
+      self.uploadXlsData.companyId = null;
+      
+      if (response.result) {
+        self.$message.success(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+
+        this.batchImportVisible = false;
+      } else {
+        //this.$message.error(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+
+        if (response.data != null) {
+          //下载有错误信息提示的报表
+          //window.open(response.data);
+          self.$message({
+            showClose: true,
+            dangerouslyUseHTMLString: true,
+            message:
+              response.message +
+              `,<a href="${response.data}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
+            duration: 30000,
+          });
+        }
+      }
+    },
+    //批量导入-预览
+    handleBatchImportPreview(file) {
+      console.log(file.url);
+    },
+    //批量导入-移除
+    handleBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-移除前操作
+    beforeBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-文件超出个数限制时的钩子
+    handleBatchImportExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    downloadAll() {
+      //导出
+      var self = this;
+      var formData = new FormData();
+
+      if (self.queryModel.parentId == null) {
+        self.queryModel.parentId = "";
+      }
+      formData.append("companyCode", self.queryModel.companyCode);
+      formData.append("parentId", self.queryModel.parentId);
+      formData.append("subordinate", self.queryModel.subordinate);
+
+      formData.append("id", self.queryModel.id);
+      formData.append("name", self.queryModel.name);
+      formData.append("phone", self.queryModel.phone);
+      formData.append("idCard", self.queryModel.idCard);
+      formData.append("faceBound", self.queryModel.faceBound);
+      formData.append("isUploadPhoto", self.queryModel.isUploadPhoto);
+
+      if(self.queryModel.enableRegisterExamine!=null){
+        formData.append("enableRegisterExamine", self.queryModel.enableRegisterExamine);
+      }
+      
+      if(self.queryModel.enableAttendance!=null){
+        formData.append("enableAttendance", self.queryModel.enableAttendance);
+      }
+
+      formData.append("position1", self.queryModel.position1);
+      formData.append("position2", self.queryModel.position2);
+      formData.append("position3", self.queryModel.position3);
+      formData.append("position4", self.queryModel.position4);
+      formData.append("position5", self.queryModel.position5);
+
+      self.xlsLoading = true;
+
+      personInfoApi.exportXls(formData).then(function (response) {
+        self.xlsLoading = false;
+        var jsonData = response.data;
+        if (jsonData.result) {
+          if (jsonData.data != null) {
+            if(document.location.href.startsWith("https://")){
+                jsonData.data = jsonData.data.replace("http://","https://");
+            }
+            
+            self.$message({
+              showClose: true,
+              type: "success",
+              dangerouslyUseHTMLString: true,
+              message: `报表已生成，<a href="${jsonData.data}" target="_blank">点击下载报表</a>&nbsp;`,
+              duration: 30000,
+            });
+          }
+        }
+      });
+    },
+    enabledTo(row, type, value) {
+      var self = this;
+
+      if (type == "wechatNotice") {
+        var formData = new FormData();
+        formData.append("id", row.id);
+
+        personInfoApi.enabledWechatNotice(formData);
+      } else {
+        this.$confirm("该操作会对设备上的信息进行操作,请确认？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //self.loading = true;
+            if (!self.disabled) {
+              var formData = new FormData();
+              formData.append("id", row.id);
+              if ("face" == type) {
+                personInfoApi.enabledFace(formData);
+              } else if ("card" == type) {
+                personInfoApi.enabledCard(formData);
+              } else if ("app" == type) {
+                personInfoApi.enabledApp(formData);
+              } else if ("guest" == type) {
+                personInfoApi.enabledGuest(formData);
+              } else if ("wechatNotice" == type) {
+                personInfoApi.enabledWechatNotice(formData);
+              } else if ("sync" == type) {
+                personInfoApi.enabledSync(formData);
+              }
+
+              //关闭开关,是自动同步到服务器
+              //打开开关需要手动同步服务器
+              // if (!value) {
+              //   //如果是打开开关,则修改状态
+              //   row.faceBound = false;
+              // }
+
+              self.disabled = true;
+
+              setTimeout(function () {
+                self.disabled = false;
+                //self.loading = false;
+              }, 1000); //一秒内不能重复点击
+            } else {
+              self.$message({
+                type: "success",
+                message: "操作过快!",
+              });
+            }
+          })
+          .catch(() => {
+            // self.loading = false;
+            if (row.faceEnabled) {
+              row.faceEnabled = false;
+            } else {
+              row.faceEnabled = true;
+            }
+          });
+      }
+    },
+    uploadData(record) {
+      //同步人脸数据
+      var self = this;
+      self.loading = true;
+      var uploadSync = new Array(0);
+      uploadSync.push(record.id);
+
+      personInfoApi.dataSync(uploadSync).then(function (response) {
+        var jsonData = response.data;
+        self.loading = false;
+        if (jsonData.result) {
+          if (jsonData.data) {
+            self.changePage(self.pageIndex);
+            self.$message({
+              type: "success",
+              message: "同步成功!",
+            });
+          } else {
+            if (jsonData.message != null) {
+              //下载有错误信息提示的报表
+              //window.open(response.data);
+              self.$message({
+                showClose: true,
+                dangerouslyUseHTMLString: true,
+                message:
+                  "错误" +
+                  `,<a href="${jsonData.message}" target="_blank">点击下载错误报表</a>&nbsp;`,
+                duration: 30000,
+              });
+            }
+          }
+        } else {
+          self.$message({
+            type: "warning",
+            message: jsonData.message,
+          });
+        }
+      });
+    },
+    dataSync() {
+      //批量同步人脸
+      var self = this;
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认同步选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          self.loading = true;
+          personInfoApi.dataSync(idList).then(function (response) {
+            var jsonData = response.data;
+            self.loading = false;
+            if (jsonData.result) {
+              if (jsonData.data) {
+                self.changePage(self.pageIndex);
+                self.$message({
+                  type: "success",
+                  message: "同步成功!",
+                });
+              } else {
+                if (jsonData.message != null) {
+                  //下载有错误信息提示的报表
+                  //window.open(response.data);
+                  self.$message({
+                    showClose: true,
+                    dangerouslyUseHTMLString: true,
+                    message:
+                      "错误" +
+                      `,<a href="${jsonData.message}" target="_blank">点击下载错误报表</a>&nbsp;`,
+                    duration: 30000,
+                  });
+                }
+              }
+            } else {
+              self.$message({
+                type: "warning",
+                message: jsonData.message,
+              });
+            }
+          });
+        })
+        .catch(() => {
+          self.loading = false;
+        });
+    },
+    handleBatchBoundDevice() {
+      //批量人脸
+      var self = this;
+      var formData = new FormData();
+
+      //选择设备
+      let boundDeviceIds = self.boundDeviceIds;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+      self
+        .$confirm("是否立刻同步照片到设备？", "提示", {
+          confirmButtonText: "同步到设备",
+          cancelButtonText: "只绑定不同步",
+          type: "warning",
+          distinguishCancelAndClose: true,
+        })
+        .then(() => {
+          boundDeviceIds.forEach((boundDeviceId) => {
+            var formData = new FormData();
+            self.boundDeviceDisabled = true;
+
+            formData.append("persons", idList);
+            formData.append("deviceId", boundDeviceId);
+            formData.append("isWrite", true);
+
+            personDeviceRelationApi
+              .batchBindPerson(formData)
+              .then(function (response) {
+                var jsonData = response.data;
+                //self.loading = false;
+                self.boundDeviceDisabled = false;
+                if (jsonData.result) {
+                  self.changePage(self.pageIndex);
+                  self.batchBoundDevice = false;
+                  self.boundDeviceId = "";
+                  self.$message({
+                    type: "success",
+                    message: "绑定成功!",
+                  });
+                } else {
+                  self.$message({
+                    showClose: true,
+                    dangerouslyUseHTMLString: true,
+                    message: `有部分人员绑定失败,<a href="${jsonData.message}" target="_blank">点击下载错误信息报表</a>&nbsp;`,
+                    duration: 30000,
+                  });
+                }
+              });
+          });
+        })
+        .catch((error) => {
+          if (error === "cancel") {
+            boundDeviceIds.forEach((boundDeviceId) => {
+              var formData = new FormData();
+              self.boundDeviceDisabled = true;
+
+              formData.append("persons", idList);
+              formData.append("deviceId", boundDeviceId);
+              formData.append("isWrite", false);
+
+              personDeviceRelationApi
+                .batchBindPerson(formData)
+                .then(function (response) {
+                  var jsonData = response.data;
+                  //self.loading = false;
+                  self.boundDeviceDisabled = false;
+                  if (jsonData.result) {
+                    self.changePage(self.pageIndex);
+                    self.batchBoundDevice = false;
+                    self.boundDeviceId = "";
+                    self.$message({
+                      type: "success",
+                      message: "绑定成功!",
+                    });
+                  } else {
+                    self.$message({
+                      showClose: true,
+                      dangerouslyUseHTMLString: true,
+                      message: `有部分人员绑定失败,<a href="${jsonData.message}" target="_blank">点击下载错误信息报表</a>&nbsp;`,
+                      duration: 30000,
+                    });
+                  }
+                });
+            });
+          } else {
+            self.boundDeviceDisabled = false;
+          }
+        });
+    },
+    handleBatchUnBoundDevice() {
+      //批量人脸
+      var self = this;
+      //self.loading = true;
+      self.boundDeviceDisabled = true;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+      var formData = new FormData();
+
+      formData.append("persons", idList);
+      formData.append("deviceId", self.boundUnDeviceId);
+      personDeviceRelationApi
+        .batchUnBindPerson(formData)
+        .then(function (response) {
+          var jsonData = response.data;
+          //self.loading = false;
+          self.boundDeviceDisabled = false;
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+            self.batchBoundDevice = false;
+            self.boundDeviceId = "";
+            self.$message({
+              type: "success",
+              message: "解除绑定成功!",
+            });
+          }
+        });
+    },
+    closeBatchBoundDevice() {
+      var self = this;
+      self.batchBoundDevice = false;
+      self.boundDeviceId = "";
+    },
+    closeBatchUnBoundDevice() {
+      var self = this;
+      self.batchUnBoundDevice = false;
+      self.boundUnDeviceId = "";
+    },
+    handleBatchEnabledFace() {
+      //批量人脸授权
+      var self = this;
+      self.loading = true;
+
+      let boundDeviceId = self.boundDeviceId;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+      var formData = new FormData();
+
+      formData.append("ids", idList);
+
+      personInfoApi.enabledFaceList(idList).then(function (response) {
+        var jsonData = response.data;
+        self.loading = false;
+        if (jsonData.result) {
+          self.changePage(self.pageIndex);
+          self.$message({
+            type: "success",
+            message: "授权成功!",
+          });
+        } else {
+          self.$message({
+            type: "warning",
+            message: jsonData.message,
+          });
+        }
+      });
+    },
+    bindWechat(record) {
+      this.bindWechatVisible = true;
+      this.bindWechatLoading = true;
+      this.bindWechatUrl = "";
+
+      personInfoApi
+        .bindWechat(record.id + "," + record.phone)
+        .then((response) => {
+          var jsonData = response.data;
+          this.bindWechatLoading = false;
+
+          if (jsonData.result) {
+            this.bindWechatUrl = jsonData.data;
+          } else {
+            this.$message.warning(jsonData.message);
+          }
+        });
+    },
+    unbindWechat(record) {
+      var self = this;
+      this.$confirm("是否确认微信解绑？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        self.loading = true;
+        personInfoApi
+          .unbindWechat(record.id)
+          .then(function (response) {
+            var jsonData = response.data;
+            self.loading = false;
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "解绑成功!",
+              });
+            }
+          })
+          .catch(() => {
+            self.loading = false;
+          });
+      });
+    },
+    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;
+    },
+    recordModalClose(refreshed) {
+      this.showRecordModal = false;
+    },
+    handleClearFaceImg(record) {
+      var self = this;
+      self
+        .$confirm("是否确认清除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          self.loading = true;
+          personInfoApi.clearFaceImg(record.id).then(function (response) {
+            var jsonData = response.data;
+            self.loading = false;
+            if (jsonData.result) {
+              self.$message({
+                type: "success",
+                message: "清除成功!",
+              });
+            } else {
+              self.$message({
+                showClose: true,
+                dangerouslyUseHTMLString: true,
+                message:
+                  "发生错误" +
+                  `,<a href="${jsonData.message}" target="_blank">点击下载错误信息</a>&nbsp;`,
+                duration: 30000,
+              });
+            }
+          });
+        })
+        .catch(() => {
+          self.loading = false;
+        });
+    },
+    handleBatchClearFaceImg() {
+      var self = this;
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认清除设备上的照片？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        self.loading = true;
+        personInfoApi
+          .batchClearFaceImg(idList)
+          .then(function (response) {
+            var jsonData = response.data;
+            self.loading = false;
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "清除成功!",
+              });
+            }
+          })
+          .catch(() => {
+            self.loading = false;
+          });
+      });
+    },
+    bindRole(record) {
+      //绑定设备
+      this.personId = record.id;
+      this.showRoleModal = true;
+    },
+    updateHealthyCode(record) {
+      var self = this;
+      self.loading = true;
+
+      personInfoApi.updateHealthyCode(record.id).then(response=>{
+        self.loading = false;
+
+        var jsonData = response.data;
+            
+        if (jsonData.result) {
+          self.$message.success("更新健康码状态成功!");
+          self.changePage(self.pageIndex);
+        }
+        else{
+          self.$message.success("更新健康码状态失败!");
+        }
+      });
+    }
+  },
+  async mounted() {
+    this.changePage(1);
+    //self.tableHeight = window.innerHeight - self.$refs.queryForm.$el.offsetTop - 100;
+    window.addEventListener('resize',this.adjustTableHeight);
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize',this.adjustTableHeight);
+  },
+  components: {
+    "personInfo-detail": PersonInfoDetail,
+    "personDeviceRelation-list": PersonDeviceRelationList,
+    "personDeviceRelation-BoundList": PersonDeviceRelationBoundList,
+    "el-select-tree": SelectTree,
+    "lifeRecord-list": LifeRecordList,
+    "rolePersonCheckOn-detail":rolePersonCheckOnDetail,
+    "personPopedom-list": PersonPopedomList,
+  },
+};
+</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;
+  background-color: white;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.sticky-panel {
+  background-color: #fff;
+}
+</style>

src/views/business/workScheduleAttendance-day-list.vue

@@ -140,6 +140,7 @@ import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
 export default {
+  name:"BusinessWorkScheduleAttendanceDayList",
   data() {
     var self = this;