heyang

src/api/laboratory/subject.js

@@ -355,9 +355,9 @@ export function subjectVo(id) {
 //查询门禁授权列表
 export function getHaikangList(data) {
   return request({
-    url: '/laboratory/haikang/user/subList',
+    url: '/laboratory/haikang/user/subList?pageNum='+data.pageNum+'&pageSize='+data.pageSize,
     method: 'post',
-    data: data
+    data: data,
   })
 }
 //查询实验室已授权列表

src/views/comprehensive/laboratoryManagement/accessAuthorization/lookImpower.vue

@@ -10,7 +10,7 @@
         <el-form-item label="关键字" prop="name">
           <el-input
             v-model="queryParams.searchValue"
-            placeholder="名称/联系人/联系方式"
+            placeholder="请输入姓名/工号/学号"
             clearable
             maxLength="30"
             size="small"
@@ -61,10 +61,10 @@
         <el-table-column label="类别" align="left" prop="userType"></el-table-column>
         <el-table-column label="授权时间" align="left" prop="verifyTime"></el-table-column>
         <el-table-column label="授权人" align="left" prop="verifyUser"></el-table-column>
-        <el-table-column label="失效时间" align="left" prop="invalidTime">
+        <el-table-column label="失效时间" align="left" prop="invalidTime" width="250">
           <template slot-scope="scope">
             <el-date-picker
-              :disabled="admittance || whiteList"
+              :disabled="(scope.row.userType=='学生' && admittance) || (scope.row.userType=='教师' && whiteList)"
               :picker-options="pickerOptions0"
               v-model="scope.row.invalidTime"
               value-format="yyyy-MM-dd"
@@ -77,7 +77,7 @@
           <template slot-scope="scope">
             <div class="button-box">
               <p class="table-min-button"
-                 v-if="!admittance && !whiteList"
+                 v-if="(scope.row.userType=='学生' && !admittance) || (scope.row.userType=='教师' && !whiteList)"
                  @click="handleClick('',scope.row,'delete')"
               >删除</p>
               <p class="table-min-button" v-if="scope.row.userType=='学生' && admittance">安全准入</p>
@@ -266,7 +266,7 @@ export default {
       // 设置只能选择当前日期及之后的日期
       pickerOptions0: {
         disabledDate(time) {
-          return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
+          return time.getTime() < Date.now();//如果没有后面的-8.64e7就是不可以选择今天的
         }
       },
       admittance:false,//智能门禁有没有勾选安全准入
@@ -332,6 +332,8 @@ export default {
         this.$refs.multipleTable.clearSelection();
         this.dialogForm.searchValue='';
         this.dialogForm.deptId='';
+        this.configuration.invalidTime='';
+        this.configuration.verifyMode='';
       },
       //取消选中
       toggleSelection(rows) {
@@ -471,15 +473,9 @@ export default {
       loseTimeSubmitForm(){
         let _this=this;
         let arr=[];
-        // console.log(_this.oldTableData)
-        // console.log( _this.tableData)
-        // _this.oldTableData.forEach(function(item) {
-        //
-        // })
         _this.tableData.forEach(function(item2) {
           arr.push({'invalidTime':item2.invalidTime,'userId':item2.userId,'verifyMode':item2.verifyMode,id:item2.id})
         })
-        console.log(arr)
         _this.form.detailList=arr;
         setTimeout(function () {
           editImpowerHaikang(_this.form).then(response => {
@@ -494,7 +490,6 @@ export default {
       submitForm(){
         let _this=this;
         let arr=[];
-        console.log(this.labWhiteJoinSubList)
         if(this.labWhiteJoinSubList.length>0){
           if(_this.configuration.invalidTime && _this.configuration.verifyMode){//统一配置
             this.labWhiteJoinSubList.forEach(function(item){