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

.env.development

@@ -5,6 +5,9 @@ OUT_PUT_DIR=dist/shinestar-portal
 VUE_APP_BACKEND_URL=http://127.0.0.1:8086/shinestar-server
 #VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com
 
+VUE_APP_LOCAL_IP=127.0.0.1
+VUE_APP_LOCAL_BACKEND_URL=http://127.0.0.1:8086/shinestar-server
+
 #手机企业版
 VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
 #手机校园版

.env.production

@@ -1,6 +1,8 @@
 OUT_PUT_DIR=dist/shinestar-portal
 
 VUE_APP_BACKEND_URL=http://223.75.170.44:6060/shinestar-server
+VUE_APP_LOCAL_IP=173.168.0.188
+VUE_APP_LOCAL_BACKEND_URL=http://173.168.0.188:6060/shinestar-server
 
 #手机企业版
 VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 

.env.test

@@ -4,6 +4,9 @@ OUT_PUT_DIR=dist/shinestar-portal
 #VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
 VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/shinestar-server
 
+VUE_APP_LOCAL_IP=127.0.0.1
+VUE_APP_LOCAL_BACKEND_URL=http://127.0.0.1:8086/shinestar-server
+
 #手机企业版
 VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
 

src/routers/index.js

@@ -10,6 +10,7 @@ import { Message } from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
 import { getToken } from '@/utils/auth' // get token from cookie
+import Constant from "@/constant";
 
 Vue.use(Router)
 
@@ -67,6 +68,15 @@ router.beforeEach((to, from, next) => {
   NProgress.start();
   console.log(`${to.path}`);
 
+  var url = window.location.href;
+
+  var localIP = process.env.VUE_APP_LOCAL_IP;
+
+  if(url.indexOf(localIP)!=-1){
+    console.log("通过内网访问");
+    Constant.serverUrl =  process.env.VUE_APP_LOCAL_BACKEND_URL;
+  }
+
   const hasToken = getToken()
 
   if (hasToken != null) {

src/routers/modules/business.js

@@ -64,6 +64,32 @@ var routers = [
                         title: '携物出厂'
                 }
         },
+        {
+                //请假记录
+                path: '/business/requestForLeave/list',
+                name: 'business-requestForLeave-list',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/business/requestForLeave-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '请假记录'
+                }
+        },
+        {
+                //异地打卡记录
+                path: '/business/clockOut/list',
+                name: 'BusinessClockOutList',
+                // 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/clockOut-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '外勤打卡记录'
+                }
+        },
 ]
 
 export default routers;

src/views/Login.vue

@@ -136,7 +136,9 @@ export default {
   destroyed() {
     // window.removeEventListener('hashchange', this.afterQRScan)
   },
-  mounted() {}
+  mounted() {
+
+  }
 };
 </script>
 

src/views/base/alarmConfig-list.vue

@@ -19,7 +19,7 @@
       inline
       class="demo-form-inline"
     >
-      <el-form-item label="单位" prop="companyId">
+      <el-form-item label="单位/部门" prop="companyId">
         <!-- <el-select
           v-model="queryModel.companyId"
           size="mini"
@@ -102,7 +102,7 @@
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column
         prop="companyName"
-        label="单位"
+        label="单位/部门"
         width="220"
         fixed="left"
       ></el-table-column>
@@ -196,7 +196,7 @@
             >点击下载模板</el-link
           >
         </el-form-item>
-        <el-form-item label="单位">
+        <el-form-item label="单位/部门">
           <el-select-tree
             size="large"
             :props="props"

src/views/base/approvalConfig-list.vue

@@ -19,7 +19,7 @@
       inline
       class="demo-form-inline"
     >
-      <el-form-item label="单位" prop="companyId">
+      <el-form-item label="单位/部门" prop="companyId">
         <el-select-tree
           :props="props"
           :options="companyResult"

src/views/base/checkinInfo-payment.vue

@@ -30,7 +30,7 @@
                   <el-input v-model="scope.row.unitPrice" oninput ="value=value.replace(/[^0-9.]/g,'')" />
                 </template>
               </el-table-column>
-              <el-table-column prop="unit" label="单位" ></el-table-column>
+              <el-table-column prop="unit" label="单位/部门" ></el-table-column>
           </el-table>
       </el-form>
     </div>

src/views/base/companyInfo-detail.vue

@@ -64,16 +64,8 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="地区" prop="regionId">
-              <!-- <el-select v-model="formModel.regionId" filterable placeholder="请选择" style="width:50%">
-                <el-option
-                  v-for="region in regionData"
-                  :key="region.id"
-                  :label="region.name"
-                  :value="region.id"
-                ></el-option>
-              </el-select> -->
               <el-select-tree
                 :props="props"
                 :options="regionData"
@@ -82,7 +74,7 @@
                 width="400px"
               ></el-select-tree>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="单位性质" prop="unitType">
               <el-select
@@ -101,8 +93,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="场景值" prop="sceneId">
               <el-select
@@ -121,12 +111,27 @@
               </el-select>
             </el-form-item>
           </el-col>
-      
+        </el-row>
+        <el-row>
+          
+          <el-col :span="12">
+            <el-form-item label="是否外协部门" prop="isOutsourcer">
+              <el-radio-group v-model="formModel.isOutsourcer">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="允许手机注册用户" prop="enableRegister">
-              <el-radio v-model="formModel.enableRegister" :label="true">允许</el-radio>
-              <el-radio v-model="formModel.enableRegister" :label="false">否</el-radio>
+              <el-radio-group v-model="formModel.enableRegister">
+                <el-radio :label="true">允许</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
             </el-form-item>
+             
           </el-col>
         </el-row>
         <el-row v-show="formModel.unitType=='1'">
@@ -481,6 +486,11 @@ export default {
             self.fileUrl =
               logo + "?x-oss-process=image/resize,m_lfit,h_400,w_400";
           }
+
+          let isOutsourcer = self.formModel.isOutsourcer;
+          if(isOutsourcer == null){
+            self.formModel.isOutsourcer = false;
+          }
         } else {
           self.$message.error(jsonData.message + "");
         }

src/views/base/companyInfo-list.vue

@@ -173,20 +173,20 @@
         width="120"
       ></el-table-column>
       <el-table-column
-        prop="sceneName"
-        label="场景值"
+        prop="isOutsourcer"
+        label="是否外协"
         width="90"
-      ></el-table-column>
-      <el-table-column
-        prop="typeName"
-        label="服务场景"
-        width="90"
-      ></el-table-column>
-      <el-table-column
+      >
+      <template slot-scope="{row}">
+        <span v-if="row.isOutsourcer">是</span>
+        <span v-else>否</span>
+      </template>
+      </el-table-column>
+      <!-- <el-table-column
         prop="regionName"
         label="地区"
         width="90"
-      ></el-table-column>
+      ></el-table-column> -->
       <el-table-column
         prop="typeName"
         label="单位类别"

src/views/base/deviceInfo-detail.vue

@@ -19,7 +19,7 @@
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="单位" prop="companyId">
+            <el-form-item label="单位/部门" prop="companyId">
               <!-- <el-select
                 v-model="formModel.companyId"
                 filterable

src/views/base/deviceInfo-list.vue

@@ -137,7 +137,7 @@
         sortable="custom"></el-table-column>
       <el-table-column prop="code" label="内部编号" width="100" sort-by="a.code_"
         sortable="custom"></el-table-column>
-      <el-table-column prop="companyName" label="单位" width="250" show-overflow-tooltip sort-by="b.name_"
+      <el-table-column prop="companyName" label="单位/部门" width="250" show-overflow-tooltip sort-by="b.name_"
         sortable="custom"></el-table-column>
       <el-table-column prop="aliasName" label="设备别名" width="200" show-overflow-tooltip></el-table-column>
       <el-table-column prop="isOnline" label="运行状态" width="100" sort-by="a.is_online"

src/views/base/devicePerson-list.vue

@@ -47,7 +47,7 @@
         </el-form-item>
       </div>
       <div>
-        <el-form-item label="单位" prop="parentId">
+        <el-form-item label="单位/部门" prop="parentId">
           <el-select-tree
             size="mini"
             :props="props"
@@ -156,7 +156,7 @@
           </a>
         </template>
       </el-table-column>
-      <el-table-column prop="personInfo.companyName" label="单位" width="250"></el-table-column>
+      <el-table-column prop="personInfo.companyName" label="单位/部门" width="250"></el-table-column>
       <el-table-column prop="personInfo.phone" label="手机号" width="180"></el-table-column>
       <el-table-column prop="personInfo.idCard" label="身份证" width="100" show-overflow-tooltip></el-table-column>
       <el-table-column prop="deviceInfo.aliasName" label="绑定设备" width="150" show-overflow-tooltip></el-table-column>

src/views/base/employeeInfo-list.vue

@@ -14,7 +14,7 @@
       要resetFields起作用，必须配置:model和prop
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-      <el-form-item label="单位" prop="companyId">
+      <el-form-item label="单位/部门" prop="companyId">
         <el-select size="mini" v-model="queryModel.companyId" filterable placeholder="请选择">
           <el-option
             v-for="company in companyList"

src/views/base/holidayInfo-list.vue

@@ -19,7 +19,7 @@
       inline
       class="demo-form-inline"
     >
-      <el-form-item label="单位" prop="companyId">
+      <el-form-item label="单位/部门" prop="companyId">
         <el-select-tree
           :props="props"
           aria-setsize="mini"
@@ -186,7 +186,7 @@
             >点击下载模板</el-link
           >
         </el-form-item>
-        <el-form-item label="单位">
+        <el-form-item label="单位/部门">
           <el-select-tree
             size="large"
             :props="props"

src/views/base/messageSendCondition-list.vue

@@ -29,7 +29,7 @@
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column
         prop="companyName"
-        label="单位"
+        label="单位/部门"
         sortable="no"
         width="180"
       ></el-table-column>

src/views/base/payService-detail.vue

@@ -30,7 +30,7 @@
                 <el-form-item label="单价" prop="unitPrice">
                     <el-input v-model="formModel.unitPrice" placeholder="请输入单价" style="width:300px"></el-input>
                 </el-form-item>
-                <el-form-item label="单位" prop="unit">
+                <el-form-item label="单位/部门" prop="unit">
                     <el-input v-model="formModel.unit" placeholder="请输入单位" style="width:300px"></el-input>
                 </el-form-item>
                 <el-form-item label="是否激活" prop="isActivation">

src/views/base/payService-list.vue

@@ -42,7 +42,7 @@
             <el-table-column prop="name" label="收费项目" ></el-table-column>
             <el-table-column prop="desc" label="收费项目说明" ></el-table-column>
             <el-table-column prop="unitPrice" label="单价" ></el-table-column>
-            <el-table-column prop="unit" label="单位" ></el-table-column>
+            <el-table-column prop="unit" label="单位/部门" ></el-table-column>
             <el-table-column prop="isActivation" label="激活开关" >
                 <template slot-scope="{row}">
                     <el-switch

src/views/base/personDeviceLog-list.vue

@@ -43,7 +43,7 @@
         </el-form-item>
       </div>
       <div>
-        <el-form-item label="单位" prop="companyId">
+        <el-form-item label="单位/部门" prop="companyId">
           <!-- <el-select
             v-model="queryModel.companyId"
             size="mini"

src/views/base/personHealthLedger-list.vue

@@ -32,7 +32,7 @@
             value-format="yyyy-MM-dd"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="单位" prop="companyId">
+        <el-form-item label="单位/部门" prop="companyId">
           <el-select-tree
             :props="props"
             :options="companyResult"
@@ -137,7 +137,7 @@
       <el-table-column type="index" label="序号" :index="indexMethod" width="100"></el-table-column>
       <el-table-column prop="name" label="姓名" width="150"></el-table-column>
       <el-table-column prop="personHealthLedger.temperature" label="记录温度" width="150"></el-table-column>
-      <el-table-column prop="companyName" label="单位" width="220"></el-table-column>
+      <el-table-column prop="companyName" label="单位/部门" width="220"></el-table-column>
       <el-table-column prop="healthStatusN" label="健康情况" width="120">
         <template slot-scope="{row}">
           <span v-if="row.isUpHealth">{{row.personHealthLedger.healthStatusN}}</span>

src/views/base/personInfo-detail.vue

@@ -41,7 +41,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="单位" prop="companyId">
+            <el-form-item label="单位/部门" prop="companyId">
               <el-select-tree
                 :props="props"
                 :options="companyResult"

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

@@ -79,7 +79,7 @@
         </el-form-item>
       </div>
       <div>
-        <el-form-item label="单位" prop="parentId">
+        <el-form-item label="单位/部门" prop="parentId">
           <el-select-tree
             size="mini"
             :props="props"
@@ -662,7 +662,7 @@
             >点击下载模板</el-link
           >
         </el-form-item>
-        <!-- <el-form-item label="单位">
+        <!-- <el-form-item label="单位/部门">
           <el-select-tree
             size="large"
             :props="props"

src/views/base/personInfo-list.vue

@@ -79,7 +79,7 @@
         </el-form-item>
       </div>
       <div>
-        <el-form-item label="单位" prop="parentId">
+        <el-form-item label="单位/部门" prop="parentId">
           <el-select-tree
             size="mini"
             :props="props"
@@ -368,13 +368,13 @@
       </el-table-column>
       <el-table-column
         prop="companyName"
-        label="主要单位"
+        label="单位/部门"
         width="250"
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="popedomName"
-        label="主要身份"
+        label="身份"
         width="120"
         show-overflow-tooltip
       ></el-table-column>
@@ -670,7 +670,7 @@
             >点击下载模板</el-link
           >
         </el-form-item>
-        <!-- <el-form-item label="单位">
+        <!-- <el-form-item label="单位/部门">
           <el-select-tree
             size="large"
             :props="props"

src/views/base/personPopedom-detail.vue

@@ -20,7 +20,7 @@
         :rules="ruleValidate"
         :label-width="'100px'"
       >
-        <el-form-item label="单位" prop="companyId">
+        <el-form-item label="单位/部门" prop="companyId">
           <el-select-tree
             :props="props"
             :options="companyResult"
@@ -52,7 +52,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           label="服务公司"
           prop="serviceCompanyId"
           v-if="sceneId == '4'"
@@ -63,7 +63,7 @@
             v-model="formModel.serviceCompanyId"
             height="200"
           ></el-select-tree>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="身份" prop="personRoleId">
           <el-select
             v-model="formModel.personRoleId"
@@ -107,13 +107,13 @@
             style="width: 300px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="是否要求考勤" prop="enableAttendance">
+        <!-- <el-form-item label="是否要求考勤" prop="enableAttendance">
             <el-switch
               v-model="formModel.enableAttendance"
               active-color="#13ce66"
               inactive-color="#ff4949"
             ></el-switch>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">

src/views/base/personPopedom-list.vue

@@ -42,7 +42,7 @@
       >
         <el-table-column
           prop="companyName"
-          label="单位"
+          label="单位/部门"
           width="200"
         ></el-table-column>
         <!-- <el-table-column
@@ -89,7 +89,7 @@
             ></el-switch>
           </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="enableAttendance"
           label="是否要求考勤"
           width="120"
@@ -102,7 +102,7 @@
               @change="handleUpdate(row)"
             ></el-switch>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="useEnable" label="默认" width="100">
           <template slot-scope="{ row }">
             <el-switch

src/views/base/roleCheckOn-detail.vue

@@ -64,6 +64,7 @@
         </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
+      <el-button type="danger" @click="handleDelete" v-if="formModel.id!=null">删 除</el-button>
       <el-button @click="closeDialog">取 消</el-button>
       <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
     </span>
@@ -77,7 +78,9 @@ export default {
         return {
             ruleValidate: {
             },
-            formModel:{},
+            formModel:{
+                checkTimeRange: []
+            },
             showDialog: true,
             loading: false,
             submitting: false,
@@ -100,55 +103,77 @@ export default {
         
         },
         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"
-                });
+            var self = this;
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                (function() {
+                    var formModel = JSON.parse(JSON.stringify(self.formModel));
 
-                self.$emit("close", {
-                    result : true,
-                    data : jsonData.data
-                });
-                } else {
-                self.$message({
-                    message: jsonData.message + "",
-                    type: "warning"
-                });
+                    if(formModel.checkTimeRange.length>0){
+                        formModel.checkTimeRange = formModel.checkTimeRange[0] +","+ formModel.checkTimeRange[1];
+                    }
+
+                    return rolePersonCheckOnApi.save(formModel);
+                })().then(function(response) {
+                    var jsonData = response.data;
+
+                    if (jsonData.result) {
+                    self.$message({
+                        message: "保存成功!",
+                        type: "success"
+                    });
 
-                self.$emit("close", {
-                    result : false
+                    self.$emit("close", {
+                        result : true,
+                        data : jsonData.data
+                    });
+                    } else {
+                    self.$message({
+                        message: jsonData.message + "",
+                        type: "warning"
+                    });
+
+                    self.$emit("close", {
+                        result : false
+                    });
+                    }
                 });
                 }
             });
-            }
-        });
         },
+        handleDelete() {
+            var self = this;
+
+            self.$confirm("是否确认删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                self.loading = true;
+                rolePersonCheckOnApi.remove(self.formModel.id).then(function (response) {
+                    var jsonData = response.data;
+                    self.loading = false;
+                    if (jsonData.result) {
+                        self.$message({
+                            type: "success",
+                            message: "删除成功!",
+                        });
+
+                        self.$emit("close", false);
+                    }
+                });
+            })
+            .catch(() => {
+                self.loading = false;
+            });
+        }
     },
     mounted: function() {
         var self = this;
-        (function() {
+
         self.loading = true;
 
-        if (self.businessKey.length == 0) {
-            return rolePersonCheckOnApi.create();
-        } else {
-            return rolePersonCheckOnApi.editRole(self.businessKey);
-        }
-        })()
+        rolePersonCheckOnApi.editRole(self.businessKey)
         .then(response => {
             var jsonData = response.data;
             self.loading = false;
@@ -156,9 +181,14 @@ export default {
             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;
+
+                if(checkTimeRange[0]!=null && checkTimeRange[1]!=null){
+                    self.formModel.checkTimeRange = checkTimeRange;
+                }
+
                 self.formModel.rolePerson = 0
 
                 var checkOnTimeFlag = jsonData.data.checkOnTimeFlag;

src/views/base/rolePersonCheckOn-detail.vue

@@ -9,7 +9,7 @@
 <template>
     <el-dialog
     :visible.sync="showDialog"
-    title="出入权限配置"
+    title="出入权限配置123"
     :modal-append-to-body="false"
     style="text-align:left;"
     @close="closeDialog"
@@ -64,8 +64,9 @@
         </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>
+        <el-button type="danger" @click="handleDelete" v-if="formModel.id!=null">删 除</el-button>
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
     </span>
     </el-dialog>
 </template>
@@ -76,8 +77,11 @@ export default {
     data(){
         return {
             ruleValidate: {
+                
+            },
+            formModel:{
+                checkTimeRange: []
             },
-            formModel:{},
             showDialog: true,
             loading: false,
             submitting: false,
@@ -88,67 +92,86 @@ export default {
             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"
-            });
-        } 
-        
+            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;
+            var self = this;
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    (function() {
+                        var formModel = JSON.parse(JSON.stringify(self.formModel));
 
-                if (jsonData.result) {
-                self.$message({
-                    message: "保存成功!",
-                    type: "success"
-                });
+                        if(formModel.checkTimeRange.length>0){
+                            formModel.checkTimeRange = formModel.checkTimeRange[0] +","+ formModel.checkTimeRange[1];
+                        }
 
-                self.$emit("close", {
-                    result : true,
-                    data : jsonData.data
-                });
-                } else {
-                self.$message({
-                    message: jsonData.message + "",
-                    type: "warning"
-                });
+                        return rolePersonCheckOnApi.save(formModel);
+                    })().then(function(response) {
+                        var jsonData = response.data;
 
-                self.$emit("close", {
-                    result : false
-                });
+                        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
+                        });
+                        }
+                    });
                 }
             });
-            }
-        });
-        },
+        },        
+        handleDelete() {
+            var self = this;
+
+            self.$confirm("是否确认删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                self.loading = true;
+                rolePersonCheckOnApi.remove(self.formModel.id).then(function (response) {
+                    var jsonData = response.data;
+                    self.loading = false;
+                    if (jsonData.result) {
+                        self.$message({
+                            type: "success",
+                            message: "删除成功!",
+                        });
+
+                        self.$emit("close", false);
+                    }
+                });
+            })
+            .catch(() => {
+                self.loading = false;
+            });
+        }
     },
     mounted: function() {
         var self = this;
-        (function() {
-        self.loading = true;
-
-        if (self.businessKey.length == 0) {
-            return rolePersonCheckOnApi.create();
-        } else {
-            return rolePersonCheckOnApi.edit(self.businessKey);
-        }
-        })()
+        
+        rolePersonCheckOnApi.edit(self.businessKey)
         .then(response => {
             var jsonData = response.data;
             self.loading = false;
@@ -158,7 +181,11 @@ export default {
                 var checkTimeRange = new Array();
                 checkTimeRange[0]=jsonData.data.checkStartTime;
                 checkTimeRange[1]=jsonData.data.checkEndTime
-                self.formModel.checkTimeRange = checkTimeRange;
+
+                if(checkTimeRange[0]!=null && checkTimeRange[1]!=null){
+                    self.formModel.checkTimeRange = checkTimeRange;
+                }
+
                 self.formModel.rolePerson = 1
 
                 var checkOnTimeFlag = jsonData.data.checkOnTimeFlag;

src/views/base/temperatureRecord-list.vue

@@ -15,7 +15,7 @@
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
       <div>
-        <el-form-item label="单位" prop="parentId">
+        <el-form-item label="单位/部门" prop="parentId">
           <el-select-tree
             size="mini"
             :props="props"
@@ -36,7 +36,7 @@
             :picker-options="pickerOptions"
           ></el-date-picker>
         </el-form-item>
-        <!-- <el-form-item label="单位" prop="companyId">
+        <!-- <el-form-item label="单位/部门" prop="companyId">
           <el-select
             v-model="queryModel.companyId"
             size="mini"

src/views/base/warningPusher-detail.vue

@@ -17,7 +17,7 @@
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="单位" prop="companyId">
+            <el-form-item label="单位/部门" prop="companyId">
               <!-- <el-select
                 v-model="formModel.companyId"
                 filterable

src/views/base/warningPusher-list.vue

@@ -83,7 +83,7 @@
       <el-table-column prop="name" label="姓名" width="100" fixed="left"></el-table-column>
       <el-table-column prop="remark" label="备注" width="150"></el-table-column>
       <el-table-column prop="phone" label="手机号" width="120"></el-table-column>
-      <el-table-column prop="companyName" label="单位" width="120"></el-table-column>
+      <el-table-column prop="companyName" label="单位/部门" width="120"></el-table-column>
       <el-table-column prop="temperature" label="预警触发温度" width="120"></el-table-column>
       <el-table-column prop="times" label="上报触发次数" width="120"></el-table-column>
       <el-table-column prop="openId" label="是否绑定公众号" width="120">

src/views/base/workOver-list.vue

@@ -133,7 +133,7 @@
       ></el-table-column>
       <el-table-column
         prop="companyName"
-        label="单位"
+        label="单位/部门"
         width="180"
       ></el-table-column>
       

src/views/business/fillAttendance-list.vue

@@ -26,7 +26,7 @@
           v-model="queryModel.personName"
         ></el-input>
       </el-form-item>
-      <el-form-item label="单位" prop="parentId">
+      <el-form-item label="单位/部门" prop="parentId">
         <el-select-tree
           size="mini"
           :props="props"

src/views/business/workAttendance-list.vue

@@ -26,7 +26,7 @@
     >
       <div>
         <el-row>
-          <el-form-item label="单位" prop="companyId">
+          <el-form-item label="单位/部门" prop="companyId">
             <!-- <el-select
               v-model="queryModel.companyId"
               size="mini"

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

@@ -68,19 +68,15 @@
         label="日期"
         width="180"
       ></el-table-column>
-      <el-table-column
-        prop="shiftNumbers"
-        label="班次"
-        width="180"
-      >
-      <template slot-scope="{ row }">
+      <el-table-column prop="shiftNumbers" label="班次" width="180">
+        <template slot-scope="{ row }">
           <span v-if="row.onWorkStatus != 1 && row.onWorkStatus != 1">
-            {{row.onWorkStatusN}}
+            {{ row.onWorkStatusN }}
           </span>
           <span v-else>
-            {{row.shiftNumbers}}
+            {{ row.shiftNumbers }}
           </span>
-      </template>
+        </template>
       </el-table-column>
       <el-table-column prop="onWorkResult" label="上班" width="180">
         <template slot-scope="{ row }">
@@ -127,7 +123,7 @@
       ></el-table-column>
       <el-table-column
         prop="notSwipingNum"
-        label="未刷次数"
+        label="未打卡次数"
         width="180"
       ></el-table-column>
     </el-table>
@@ -140,7 +136,7 @@ import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
 export default {
-  name:"BusinessWorkScheduleAttendanceDayList",
+  name: "BusinessWorkScheduleAttendanceDayList",
   data() {
     var self = this;
 
@@ -207,13 +203,14 @@ export default {
 
           self.tableData = jsonData.wsaList;
           self.personInfo = jsonData.personInfo;
-          self.showMessage =
-            "查询结果 部门:" +
-            self.personInfo.companyName +
-            "      工号:" +
-            self.personInfo.jobNumber +
-            "      姓名:" +
-            self.personInfo.name;
+          let message = "查询结果 部门:" + self.personInfo.companyName;
+          let message2 = "      工号:" + self.personInfo.jobNumber;
+          let message3 = "      姓名:" + self.personInfo.name;
+          if (self.personInfo.jobNumber == null) {
+            self.showMessage = message + message3;
+          } else {
+            self.showMessage = message + message2 + message3;
+          }
 
           self.tableHeight =
             window.innerHeight - self.$refs.formTable.$el.offsetTop - 100;
@@ -256,7 +253,7 @@ export default {
     var timeRanges = this.$route.query.timeRanges;
     this.queryModel.personId = personId;
     let tims = timeRanges.split(",");
-    this.queryModel.timeRanges = [tims[0],tims[1]]
+    this.queryModel.timeRanges = [tims[0], tims[1]];
 
     this.changePage();
   },

src/views/business/workScheduleAttendance-list.vue

@@ -34,7 +34,7 @@
               size="mini"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="单位" prop="companyId">
+          <el-form-item label="单位/部门" prop="companyId">
             <el-select-tree
               :props="props"
               :options="companyResult"
@@ -90,22 +90,26 @@
         type="index"
         label="序号"
         :index="indexMethod"
+         fixed="left"
         width="50"
       ></el-table-column>
       <el-table-column
         prop="personInfo.id"
         label="id"
         width="120"
+        fixed="left"
       ></el-table-column>
       <el-table-column
         prop="personInfo.jobNumber"
         label="工号"
         width="120"
+        fixed="left"
       ></el-table-column>
       <el-table-column
         prop="personInfo.name"
         label="姓名"
         width="120"
+        fixed="left"
       ></el-table-column>
       <el-table-column
         prop="attendanceDays"
@@ -149,7 +153,7 @@
       ></el-table-column>
       <el-table-column
         prop="notSwipingNum"
-        label="未刷次数"
+        label="未打卡次数"
         width="120"
       ></el-table-column>
       <el-table-column
@@ -300,6 +304,9 @@ export default {
         if (jsonData.result) {
           self.tableData = jsonData.data.wsaList;
 
+          self.totalPages = jsonData.data.totalPages;
+          self.totalElements = jsonData.data.recordsTotal;
+
           //45为分页栏的高度
           //页面高度-列表上面的高度-分页栏高度
           self.tableHeight =

src/views/business/workScheduleReport.vue

@@ -26,7 +26,7 @@
     >
       <div>
         <el-row>
-          <el-form-item label="单位" prop="companyId">
+          <el-form-item label="单位/部门" prop="companyId">
             <!-- <el-select
               v-model="queryModel.companyId"
               size="mini"