|
|
@@ -28,7 +28,7 @@
|
|
|
v-model="dateRange"
|
|
|
size="small"
|
|
|
style="width: 240px"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
type="daterange"
|
|
|
range-separator="-"
|
|
|
start-placeholder="开始日期"
|
|
|
@@ -130,7 +130,7 @@
|
|
|
<i></i>
|
|
|
<i @click="toggleSelection()">清除选项</i>
|
|
|
</div>
|
|
|
- <el-table ref="multipleTable" :key="randomKey" border tooltip-effect="dark" :row-key="getRowKeys" :data="dialogTable"
|
|
|
+ <el-table ref="multipleTable" border tooltip-effect="dark" :row-key="getRowKeys" :data="dialogTable"
|
|
|
highlight-current-row @selection-change="handleSelectionChange" style="cursor: pointer;height:500px;">
|
|
|
<el-table-column type="selection" width="55" :reserve-selection="true" align="center"></el-table-column>
|
|
|
<el-table-column label="所属单位" align="left" prop="deptName"/>
|
|
|
@@ -140,7 +140,7 @@
|
|
|
<el-table-column label="身份" align="left" prop="positionName" v-if="userType==2"/>
|
|
|
<el-table-column label="验证方式" align="left" prop="verifyMode">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-select v-model="scope.row.verifyMode" @change="verifyModeFun(scope.row,$event)" clearable >
|
|
|
+ <el-select v-model="scope.row.verifyMode" @change="verifyModeFun()" clearable >
|
|
|
<el-option
|
|
|
v-for="item in verifyWayList"
|
|
|
:key="item.key"
|
|
|
@@ -153,6 +153,7 @@
|
|
|
<el-table-column label="失效时间" align="left" prop="invalidTime">
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker
|
|
|
+ @blur="invalidTimeFun(scope.row,$event)"
|
|
|
v-model="scope.row.invalidTime"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
type="date"
|
|
|
@@ -197,11 +198,9 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { supplierDelete, supplierList, supplierStop } from '@/api/gasManage3_0/gasManage'
|
|
|
import { listStudentUser, listTeacherUser } from '@/api/system/user_student'
|
|
|
import { listDepartments } from '@/api/system/dept'
|
|
|
import { AddImpowerHaikang, delUserHaikang, getHaikangQueryTypes, getHaikangUserList } from '@/api/laboratory/subject'
|
|
|
-import { gasManageAdd } from '@/api/gasManage3_0/gasManageSYD'
|
|
|
|
|
|
export default {
|
|
|
name: "Approval",
|
|
|
@@ -213,7 +212,6 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- randomKey:Math.random(),
|
|
|
loading:false,
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
@@ -221,6 +219,7 @@ export default {
|
|
|
pageSize:20,
|
|
|
searchValue:'',
|
|
|
userType:'',
|
|
|
+ hardId:'',
|
|
|
startTime:'',
|
|
|
endTime:'',
|
|
|
},
|
|
|
@@ -246,6 +245,7 @@ export default {
|
|
|
verifyMode:'',
|
|
|
},
|
|
|
unifyDeploy:false,
|
|
|
+ //提交
|
|
|
form:{}
|
|
|
};
|
|
|
|
|
|
@@ -253,11 +253,17 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
//弹出层表格里验证方式改变重新赋值
|
|
|
- verifyModeFun(item,e){
|
|
|
- item=e
|
|
|
+ verifyModeFun(){
|
|
|
//通过改变数组数据刷新视图
|
|
|
this.dialogTable.pop()
|
|
|
},
|
|
|
+ //弹出层表格里失效时间改变重新赋值
|
|
|
+ invalidTimeFun(item,e){
|
|
|
+ this.dialogTable.splice(1,0);
|
|
|
+
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
//获取当前日期
|
|
|
getdate() {
|
|
|
var date = new Date();
|
|
|
@@ -278,7 +284,7 @@ export default {
|
|
|
//查询
|
|
|
onSearch() {
|
|
|
this.dialogForm.pageNo = 1;
|
|
|
- this.getUserRoleBySub();
|
|
|
+ this.getUserList(this.userType);
|
|
|
},
|
|
|
//重置
|
|
|
resetForm() {
|
|
|
@@ -300,6 +306,7 @@ export default {
|
|
|
//监听关联记录弹窗关闭
|
|
|
handleClose(){
|
|
|
console.log('弹窗关闭');
|
|
|
+ this.$refs.multipleTable.clearSelection();
|
|
|
},
|
|
|
//取消选中
|
|
|
toggleSelection(rows) {
|
|
|
@@ -369,7 +376,7 @@ export default {
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
this.dialogTable.forEach(function(item) {
|
|
|
- item.verifyMode='faceOrFpOrCardOrPw'
|
|
|
+ item.verifyMode='cardOrfaceOrPw'
|
|
|
item.invalidTime=_this.getdate()
|
|
|
})
|
|
|
}
|
|
|
@@ -380,7 +387,7 @@ export default {
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
this.dialogTable.forEach(function(item) {
|
|
|
- item.verifyMode='faceOrFpOrCardOrPw'
|
|
|
+ item.verifyMode='cardOrfaceOrPw'
|
|
|
item.invalidTime=_this.getdate()
|
|
|
})
|
|
|
}
|
|
|
@@ -405,8 +412,12 @@ export default {
|
|
|
},
|
|
|
/** 弹框重置按钮操作 */
|
|
|
resetQuery() {
|
|
|
+ this.dateRange=[];
|
|
|
this.queryParams.searchValue = "";
|
|
|
- this.queryParams.status = "";
|
|
|
+ this.queryParams.userType = "";
|
|
|
+ this.queryParams.startTime = "";
|
|
|
+ this.queryParams.endTime = "";
|
|
|
+
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
//返回
|
|
|
@@ -416,6 +427,7 @@ export default {
|
|
|
},
|
|
|
getList(){
|
|
|
let _this=this;
|
|
|
+
|
|
|
if(this.dateRange&&this.dateRange.length>0) {
|
|
|
this.queryParams.startTime=this.dateRange[0]
|
|
|
this.queryParams.endTime=this.dateRange[1]
|
|
|
@@ -445,11 +457,12 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
_this.form.detailList=arr;
|
|
|
- _this.form.hardId=this.pageData.hardId
|
|
|
setTimeout(function () {
|
|
|
AddImpowerHaikang(_this.form).then(response => {
|
|
|
if(response.code==200){
|
|
|
- this.msgSuccess("新增成功");
|
|
|
+ _this.msgSuccess("新增成功");
|
|
|
+ _this.dialogVisible=false;
|
|
|
+ _this.getList();
|
|
|
}
|
|
|
});
|
|
|
},100)
|
|
|
@@ -462,7 +475,8 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
mounted() {
|
|
|
- console.log(this.pageData)
|
|
|
+ this.queryParams.hardId=this.pageData.hardId;
|
|
|
+ this.form.hardId=this.pageData.hardId;
|
|
|
this.listDepartments();
|
|
|
this.getHaikangQueryTypes()
|
|
|
this.getList()
|
heyang