测试问题修改
This commit is contained in:
parent
d91ea0908c
commit
d5722804f9
|
|
@ -74,6 +74,19 @@ export function getCertificateOverdueListPageApi(data) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 证件统计
|
||||||
|
export function getCertificateStatisticsApi(data) {
|
||||||
|
return request({
|
||||||
|
url: '/certificate/certificate_manage/certificateInfo/statistics',
|
||||||
|
method: 'post',
|
||||||
|
headers: {
|
||||||
|
//"merchant-id":"378915229716713472",
|
||||||
|
},
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// 借退管理-任务记录分页查询信息
|
// 借退管理-任务记录分页查询信息
|
||||||
export function getCertificateTaskListPageApi(data) {
|
export function getCertificateTaskListPageApi(data) {
|
||||||
|
|
|
||||||
|
|
@ -163,8 +163,21 @@
|
||||||
<el-table-column label="签发地" align="center" prop="issueAddr" :show-overflow-tooltip="true"/>
|
<el-table-column label="签发地" align="center" prop="issueAddr" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="签发日期" align="center" width="120" prop="issueDay" :show-overflow-tooltip="true"/>
|
<el-table-column label="签发日期" align="center" width="120" prop="issueDay" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="有效期至" align="center" width="120" prop="issueLifespan" :show-overflow-tooltip="true"/>
|
<el-table-column label="有效期至" align="center" width="120" prop="issueLifespan" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="设备编号" align="center" prop="deviceNo" :show-overflow-tooltip="true"/>
|
<el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true">
|
||||||
<el-table-column label="槽位编号" align="center" prop="slotNo" :show-overflow-tooltip="true"/>
|
<template slot-scope="scope">
|
||||||
|
<span>{{scope.row.deviceName || "/"}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="设备地点" align="center" prop="deviceAddr" :show-overflow-tooltip="true">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{scope.row.deviceAddr || "/"}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="槽位编号" align="center" prop="slotNo" :show-overflow-tooltip="true">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{scope.row.slotNo || "/"}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="当前状态" align="center" prop="stateName" :show-overflow-tooltip="true">
|
<el-table-column label="当前状态" align="center" prop="stateName" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<!-- <dict-tag :options="dict.type.dev_status" :value="scope.row.deviceState"/> -->
|
<!-- <dict-tag :options="dict.type.dev_status" :value="scope.row.deviceState"/> -->
|
||||||
|
|
|
||||||
|
|
@ -47,8 +47,8 @@
|
||||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
<div style="width: 98%;margin: 10px;display: flex;justify-content: flex-end;">
|
<div style="width: 98%;margin: 10px;display: flex;justify-content: flex-end;">
|
||||||
<span style="font-weight: bold;">过期数量:65</span>
|
<span style="font-weight: bold;">过期数量:{{statisticsData.overdNum}}</span>
|
||||||
<span style="font-weight: bold;margin-left: 20px;">临期数量:15</span>
|
<span style="font-weight: bold;margin-left: 20px;">临期数量:{{statisticsData.overNum}}</span>
|
||||||
</div>
|
</div>
|
||||||
<el-table v-loading="loading" :data="tableListData" height="800">
|
<el-table v-loading="loading" :data="tableListData" height="800">
|
||||||
<el-table-column label="序号" align="center" width="80" type="index">
|
<el-table-column label="序号" align="center" width="80" type="index">
|
||||||
|
|
@ -200,7 +200,7 @@
|
||||||
updateDept,
|
updateDept,
|
||||||
listDeptExcludeChild,
|
listDeptExcludeChild,
|
||||||
} from '@/api/system/dept'
|
} from '@/api/system/dept'
|
||||||
import { getCertificateOverdueListPageApi,addCertificateInfoApi, updateCertificateInfoApi, deleteCertificateInfoApi } from "@/api/certificateManage/index";
|
import { getCertificateOverdueListPageApi,addCertificateInfoApi, updateCertificateInfoApi, deleteCertificateInfoApi,getCertificateStatisticsApi } from "@/api/certificateManage/index";
|
||||||
import base64 from 'base-64';
|
import base64 from 'base-64';
|
||||||
import { getToken } from '@/utils/auth'
|
import { getToken } from '@/utils/auth'
|
||||||
import Treeselect from '@riophae/vue-treeselect'
|
import Treeselect from '@riophae/vue-treeselect'
|
||||||
|
|
@ -312,14 +312,22 @@
|
||||||
{ required: true, message: "更新内容不能为空", trigger: "blur" }
|
{ required: true, message: "更新内容不能为空", trigger: "blur" }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
statisticsData:{overdNu:0,overNu:0}
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
mounted(){
|
mounted(){
|
||||||
this.getList();
|
this.getList();
|
||||||
|
this.getCertificateStatistics();
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
|
/** 查询列表 */
|
||||||
|
getCertificateStatistics() {
|
||||||
|
let param = {}
|
||||||
|
getCertificateStatisticsApi(param).then(response => {
|
||||||
|
this.statisticsData = response.data
|
||||||
|
});
|
||||||
|
},
|
||||||
/** 搜索按钮操作 */
|
/** 搜索按钮操作 */
|
||||||
handleQuery() {
|
handleQuery() {
|
||||||
this.queryParams.pageNum = 1;
|
this.queryParams.pageNum = 1;
|
||||||
|
|
|
||||||
|
|
@ -62,8 +62,21 @@
|
||||||
<el-table-column label="签发地" align="center" prop="issueAddr" :show-overflow-tooltip="true"/>
|
<el-table-column label="签发地" align="center" prop="issueAddr" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="签发日期" align="center" prop="issueDay" :show-overflow-tooltip="true"/>
|
<el-table-column label="签发日期" align="center" prop="issueDay" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="有效期至" align="center" prop="issueLifespan" :show-overflow-tooltip="true"/>
|
<el-table-column label="有效期至" align="center" prop="issueLifespan" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="设备编号" align="center" prop="deviceNo" :show-overflow-tooltip="true"/>
|
<el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true">
|
||||||
<el-table-column label="槽位编号" align="center" prop="soltNo" :show-overflow-tooltip="true"/>
|
<template slot-scope="scope">
|
||||||
|
<span>{{scope.row.deviceName || "/"}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="设备地点" align="center" prop="deviceAddr" :show-overflow-tooltip="true">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{scope.row.deviceAddr || "/"}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="槽位编号" align="center" prop="slotNo" :show-overflow-tooltip="true">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{scope.row.slotNo || "/"}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="当前状态" align="center" prop="stateName" :show-overflow-tooltip="true">
|
<el-table-column label="当前状态" align="center" prop="stateName" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<!-- <dict-tag :options="dict.type.dev_status" :value="scope.row.deviceState"/> -->
|
<!-- <dict-tag :options="dict.type.dev_status" :value="scope.row.deviceState"/> -->
|
||||||
|
|
|
||||||
|
|
@ -64,9 +64,26 @@
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="事由" align="center" width="140" prop="applyDetail" :show-overflow-tooltip="true"/>
|
<el-table-column label="事由" align="center" width="140" prop="applyDetail" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="计划出国地点" align="center" prop="exitAddr" :show-overflow-tooltip="true"/>
|
<el-table-column label="证件柜" align="center" prop="deviceName" :show-overflow-tooltip="true">
|
||||||
<el-table-column label="计划出国日期" align="center" prop="exitTime" :show-overflow-tooltip="true"/>
|
<template slot-scope="scope">
|
||||||
<el-table-column label="计划回国日期" align="center" prop="entryTime" :show-overflow-tooltip="true"/>
|
<span>{{scope.row.deviceName || "/"}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="计划出国地点" align="center" prop="exitAddr" :show-overflow-tooltip="true">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{scope.row.exitAddr || "/"}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="计划出国日期" align="center" prop="exitTime" :show-overflow-tooltip="true">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{scope.row.exitTime || "/"}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="计划回国日期" align="center" prop="entryTime" :show-overflow-tooltip="true">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{scope.row.entryTime || "/"}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="允许他人代办" align="center" prop="isThrid" :show-overflow-tooltip="true">
|
<el-table-column label="允许他人代办" align="center" prop="isThrid" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="scope.row.isThrid==1">是</span>
|
<span v-if="scope.row.isThrid==1">是</span>
|
||||||
|
|
@ -138,7 +155,10 @@
|
||||||
{{applyRow.applyDetail}}
|
{{applyRow.applyDetail}}
|
||||||
</div>
|
</div>
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item v-if="applyRow.applyType==1">
|
||||||
|
<template slot="label">证件柜</template>
|
||||||
|
{{applyRow.deviceName}}
|
||||||
|
</el-descriptions-item>
|
||||||
<el-descriptions-item v-if="applyRow.applyType==2">
|
<el-descriptions-item v-if="applyRow.applyType==2">
|
||||||
<template slot="label">计划出国地点</template>
|
<template slot="label">计划出国地点</template>
|
||||||
{{applyRow.exitAddr}}
|
{{applyRow.exitAddr}}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
|
||||||
<el-form-item label="申请人姓名" prop="name">
|
<el-form-item label="关键字" prop="keyWord">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.name"
|
v-model="queryParams.keyWord"
|
||||||
placeholder="请输入申请人姓名"
|
placeholder="请输入关键字"
|
||||||
clearable maxlength="20"
|
clearable maxlength="20"
|
||||||
style="width: 300px"
|
style="width: 300px"
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
|
|
@ -75,9 +75,26 @@
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="事由" align="center" width="140" prop="applyDetail" :show-overflow-tooltip="true"/>
|
<el-table-column label="事由" align="center" width="140" prop="applyDetail" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="计划出国地点" align="center" prop="exitAddr" :show-overflow-tooltip="true"/>
|
<el-table-column label="证件柜" align="center" prop="deviceName" :show-overflow-tooltip="true">
|
||||||
<el-table-column label="计划出国日期" align="center" prop="exitTime" :show-overflow-tooltip="true"/>
|
<template slot-scope="scope">
|
||||||
<el-table-column label="计划回国日期" align="center" prop="entryTime" :show-overflow-tooltip="true"/>
|
<span>{{scope.row.deviceName || "/"}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="计划出国地点" align="center" prop="exitAddr" :show-overflow-tooltip="true">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{scope.row.exitAddr || "/"}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="计划出国日期" align="center" prop="exitTime" :show-overflow-tooltip="true">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{scope.row.exitTime || "/"}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="计划回国日期" align="center" prop="entryTime" :show-overflow-tooltip="true">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{scope.row.entryTime || "/"}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="允许他人代办" align="center" prop="isThrid" :show-overflow-tooltip="true">
|
<el-table-column label="允许他人代办" align="center" prop="isThrid" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="scope.row.isThrid==1">是</span>
|
<span v-if="scope.row.isThrid==1">是</span>
|
||||||
|
|
@ -179,6 +196,18 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
<el-col :span="12" v-if="baseForm.applyType==1">
|
||||||
|
<el-form-item label="证件柜" prop="deviceId">
|
||||||
|
<el-select v-model="baseForm.deviceId" placeholder="请选择证件柜" clearable style="width: 100%;">
|
||||||
|
<el-option
|
||||||
|
v-for="item in allDeviceList"
|
||||||
|
:key="item.deviceId"
|
||||||
|
:label="item.deviceName"
|
||||||
|
:value="item.deviceId"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
<el-col :span="12" >
|
<el-col :span="12" >
|
||||||
<el-form-item label="证件用途" prop="applyReason">
|
<el-form-item label="证件用途" prop="applyReason">
|
||||||
<el-radio-group v-model="baseForm.applyReason">
|
<el-radio-group v-model="baseForm.applyReason">
|
||||||
|
|
@ -217,7 +246,7 @@
|
||||||
value-format="yyyy-MM-dd"></el-date-picker>
|
value-format="yyyy-MM-dd"></el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12" v-if="baseForm.applyType==2">
|
||||||
<el-form-item label="允许他人代办" prop="isThrid" required>
|
<el-form-item label="允许他人代办" prop="isThrid" required>
|
||||||
<el-radio-group v-model="baseForm.isThrid" @change="changeIsThrid">
|
<el-radio-group v-model="baseForm.isThrid" @change="changeIsThrid">
|
||||||
<el-radio label="1">是</el-radio>
|
<el-radio label="1">是</el-radio>
|
||||||
|
|
@ -312,7 +341,10 @@
|
||||||
{{viewRow.applyDetail}}
|
{{viewRow.applyDetail}}
|
||||||
</div>
|
</div>
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item v-if="viewRow.applyType==1">
|
||||||
|
<template slot="label">证件柜</template>
|
||||||
|
{{viewRow.deviceName}}
|
||||||
|
</el-descriptions-item>
|
||||||
<el-descriptions-item v-if="viewRow.applyType==2">
|
<el-descriptions-item v-if="viewRow.applyType==2">
|
||||||
<template slot="label">计划出国地点</template>
|
<template slot="label">计划出国地点</template>
|
||||||
{{viewRow.exitAddr}}
|
{{viewRow.exitAddr}}
|
||||||
|
|
@ -392,7 +424,7 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { getUser } from '@/api/system/user'
|
import { getUser } from '@/api/system/user'
|
||||||
import { getCertificateApplyListPageApi,addCertificateApplyApi, editCertificateApplyApi,
|
import { getCertificateApplyListPageApi,addCertificateApplyApi, editCertificateApplyApi,getDevicelistApi,
|
||||||
delCertificateApplyApi,revokeCertificateApplyApi,getApplyUserListApi,applyCheckProcessApi,applyCertificateNoListApi,thridListApi } from "@/api/certificateManage/index";
|
delCertificateApplyApi,revokeCertificateApplyApi,getApplyUserListApi,applyCheckProcessApi,applyCertificateNoListApi,thridListApi } from "@/api/certificateManage/index";
|
||||||
import base64 from 'base-64';
|
import base64 from 'base-64';
|
||||||
import { getToken } from '@/utils/auth'
|
import { getToken } from '@/utils/auth'
|
||||||
|
|
@ -427,8 +459,7 @@
|
||||||
queryParams: {
|
queryParams: {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
idNumber:null,//身份证号
|
keyWord:null,//姓名
|
||||||
name:null,//姓名
|
|
||||||
},
|
},
|
||||||
// 表单参数
|
// 表单参数
|
||||||
baseForm: {
|
baseForm: {
|
||||||
|
|
@ -450,6 +481,7 @@
|
||||||
allUserList:[],
|
allUserList:[],
|
||||||
certificateList:[],
|
certificateList:[],
|
||||||
thridManList:[],
|
thridManList:[],
|
||||||
|
allDeviceList:[],
|
||||||
// 表单校验
|
// 表单校验
|
||||||
baseFormRules: {
|
baseFormRules: {
|
||||||
userId: [
|
userId: [
|
||||||
|
|
@ -458,6 +490,9 @@
|
||||||
certificateNos: [
|
certificateNos: [
|
||||||
{ required: true, message: "证件编号不能为空", trigger: "change" }
|
{ required: true, message: "证件编号不能为空", trigger: "change" }
|
||||||
],
|
],
|
||||||
|
deviceId: [
|
||||||
|
{ required: true, message: "证件柜不能为空", trigger: "change" }
|
||||||
|
],
|
||||||
applyDetail: [
|
applyDetail: [
|
||||||
{ required: true, message: "事由不能为空", trigger: "blur" }
|
{ required: true, message: "事由不能为空", trigger: "blur" }
|
||||||
],
|
],
|
||||||
|
|
@ -495,13 +530,23 @@
|
||||||
dialogVisible:false,//图片弹窗
|
dialogVisible:false,//图片弹窗
|
||||||
dialogImageUrl:"",//图片弹窗
|
dialogImageUrl:"",//图片弹窗
|
||||||
openView:false,//查看弹窗
|
openView:false,//查看弹窗
|
||||||
viewRow:{}
|
viewRow:{},
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
mounted(){
|
mounted(){
|
||||||
this.getList();
|
this.getList();
|
||||||
|
this.getDeviceList();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
//获取可申请证件编号列表
|
||||||
|
getDeviceList(){
|
||||||
|
let param = {}
|
||||||
|
this.allDeviceList=[]
|
||||||
|
this.$set(this.baseForm,"deviceId",null)
|
||||||
|
getDevicelistApi(param).then((response) => {
|
||||||
|
this.allDeviceList = response
|
||||||
|
})
|
||||||
|
},
|
||||||
/** 搜索按钮操作 */
|
/** 搜索按钮操作 */
|
||||||
handleQuery() {
|
handleQuery() {
|
||||||
this.queryParams.pageNum = 1;
|
this.queryParams.pageNum = 1;
|
||||||
|
|
@ -518,10 +563,7 @@
|
||||||
let param = {
|
let param = {
|
||||||
"pageNum":this.queryParams.pageNum,
|
"pageNum":this.queryParams.pageNum,
|
||||||
"pageSize":this.queryParams.pageSize,
|
"pageSize":this.queryParams.pageSize,
|
||||||
// "idNumber":this.queryParams.idNumber,
|
"keyWord":this.queryParams.keyWord,
|
||||||
"name":this.queryParams.name,
|
|
||||||
// "certificateType":this.queryParams.certificateType,
|
|
||||||
// "certificateNo":this.queryParams.certificateNo
|
|
||||||
}
|
}
|
||||||
getCertificateApplyListPageApi(param).then(response => {
|
getCertificateApplyListPageApi(param).then(response => {
|
||||||
this.tableListData = response.rows;
|
this.tableListData = response.rows;
|
||||||
|
|
@ -605,6 +647,10 @@
|
||||||
this.certificateList=[]
|
this.certificateList=[]
|
||||||
this.$set(this.baseForm,"certificateNos",[])
|
this.$set(this.baseForm,"certificateNos",[])
|
||||||
this.thridManList=[]
|
this.thridManList=[]
|
||||||
|
this.$set(this.baseForm,'exitAddr',"")
|
||||||
|
this.$set(this.baseForm,'exitTime',"")
|
||||||
|
this.$set(this.baseForm,'entryTime',"")
|
||||||
|
this.$set(this.baseForm,'isThrid',"2")
|
||||||
this.$set(this.baseForm,'thridId',null)
|
this.$set(this.baseForm,'thridId',null)
|
||||||
this.$set(this.baseForm,'thridName',null)
|
this.$set(this.baseForm,'thridName',null)
|
||||||
this.$set(this.baseForm,'thridIdNumber',null)
|
this.$set(this.baseForm,'thridIdNumber',null)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue