|
@@ -74,7 +74,7 @@
|
|
|
<el-table v-loading="loading" border :data="tableData" height="500">
|
|
|
<el-table-column label="所属单位" align="left" prop="deptName" show-overflow-tooltip/>
|
|
|
<el-table-column label="姓名" align="left" prop="userName"></el-table-column>
|
|
|
- <el-table-column align="left" prop="authName"></el-table-column>
|
|
|
+ <el-table-column label="验证方式" align="left" prop="authName"></el-table-column>
|
|
|
<el-table-column label="类别" align="left" prop="userType" width="120px">
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.userType==11">教职工</span>
|
|
@@ -167,8 +167,8 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<pagination :page-sizes="[20, 30, 40, 50]"
|
|
|
- v-show="total>0"
|
|
|
- :total="total"
|
|
|
+ v-show="total2>0"
|
|
|
+ :total="total2"
|
|
|
:page.sync="dialogForm.pageNum"
|
|
|
:limit.sync="dialogForm.pageSize"
|
|
|
@pagination="getUserList"
|
|
@@ -187,7 +187,7 @@
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<p :class="unifyDeploy?'add-button-one-120':'inquire-button-one'" @click="unifyDeployFun()">{{unifyDeploy?'取消统一配置':'统一配置'}}</p>
|
|
|
- <el-button class="color_ff back_one" @click="submitForm()">确定</el-button>
|
|
|
+ <el-button class="color_ff back_one" style="height: 42px" @click="submitForm()">确定</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
@@ -230,12 +230,14 @@
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
pageSize:20,
|
|
|
- searchValue:'',
|
|
|
+ searchValue:null,
|
|
|
+ userType:null,
|
|
|
subjectId:this.subjectData.id,
|
|
|
beginTime:null,
|
|
|
endTime:null,
|
|
|
},
|
|
|
total:0,
|
|
|
+ total2:0,
|
|
|
tableData:[],
|
|
|
dateRange:[],
|
|
|
dialogForm:{
|
|
@@ -321,7 +323,6 @@
|
|
|
},
|
|
|
//监听关联记录弹窗关闭
|
|
|
handleClose(){
|
|
|
- console.log('弹窗关闭');
|
|
|
this.$refs.multipleTable.clearSelection();
|
|
|
this.dialogForm.searchValue='';
|
|
|
this.dialogForm.pageNum=1;
|
|
@@ -366,9 +367,9 @@
|
|
|
this.loading = true;
|
|
|
if(_this.userType==1){
|
|
|
this.dialogForm.userType=22
|
|
|
- listUser(this.addDateRange(this.dialogForm, this.dateRange)).then(response => {
|
|
|
+ listUser(this.addDateRange(this.dialogForm)).then(response => {
|
|
|
this.dialogTable = response.rows;
|
|
|
- this.total = response.total;
|
|
|
+ this.total2 = response.total;
|
|
|
this.loading = false;
|
|
|
this.dialogTable.forEach(function(item) {
|
|
|
item.authType='2'
|
|
@@ -377,9 +378,9 @@
|
|
|
);
|
|
|
}else if(_this.userType==2){
|
|
|
this.dialogForm.userType=11
|
|
|
- listUser(this.addDateRange(this.dialogForm, this.dateRange)).then(response => {
|
|
|
+ listUser(this.addDateRange(this.dialogForm)).then(response => {
|
|
|
this.dialogTable = response.rows;
|
|
|
- this.total = response.total;
|
|
|
+ this.total2 = response.total;
|
|
|
this.loading = false;
|
|
|
this.dialogTable.forEach(function(item) {
|
|
|
item.authType='2'
|
|
@@ -394,7 +395,6 @@
|
|
|
getSignTypeList().then(response => {
|
|
|
if(response.code==200){
|
|
|
this.verifyWayList=response.rows
|
|
|
- console.log(this.verifyWayList)
|
|
|
}
|
|
|
});
|
|
|
},
|
|
@@ -495,17 +495,20 @@
|
|
|
this.$set(this,'queryParams',{
|
|
|
pageNum: 1,
|
|
|
pageSize:20,
|
|
|
- deptId:"",
|
|
|
- name: '',
|
|
|
+ subjectId:this.subjectData.id,
|
|
|
+ searchValue: null,
|
|
|
+ userType:null,
|
|
|
+ beginTime:null,
|
|
|
+ endTime:null,
|
|
|
});
|
|
|
+ this.dateRange=[];
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
handleClick(index,row,doType){
|
|
|
let _this=this;
|
|
|
if(doType=='delete'){//删除
|
|
|
let _this=this
|
|
|
- console.log(row)
|
|
|
- this.$confirm('是否确认删除['+row.userName+']门禁授权?', "警告", {
|
|
|
+ this.$confirm('是否确认删除['+row.userName+']?', "警告", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning"
|
|
@@ -572,6 +575,13 @@
|
|
|
},
|
|
|
getList(){
|
|
|
let _this=this;
|
|
|
+ if(this.dateRange){
|
|
|
+ this.queryParams.beginTime = this.dateRange[0];
|
|
|
+ this.queryParams.endTime = this.dateRange[1];
|
|
|
+ delete this.queryParams.dateRange
|
|
|
+ }else{
|
|
|
+ delete this.queryParams.dateRange
|
|
|
+ }
|
|
|
getSignAuthList(_this.queryParams).then( response => {
|
|
|
let res=response.rows;
|
|
|
this.loading=false;
|