diff --git a/src/api/certificateManage/index.js b/src/api/certificateManage/index.js index 80159a0..c3785e5 100644 --- a/src/api/certificateManage/index.js +++ b/src/api/certificateManage/index.js @@ -1,7 +1,7 @@ import request from '@/utils/request' -// 分页查询设备信息 +// 证件管理-分页查询设备信息 export function getCertificateInfoListPageApi(data) { return request({ url: '/certificate/certificate_manage/certificateInfo/list', @@ -14,7 +14,7 @@ export function getCertificateInfoListPageApi(data) { } -// 新增设备 +// 证件管理-新增 export function addCertificateInfoApi(data) { return request({ url: '/certificate/certificate_manage/certificateInfo/add', @@ -26,7 +26,7 @@ export function addCertificateInfoApi(data) { }) } -// 修改设备信息 +// 证件管理-修改信息 export function updateCertificateInfoApi(data) { return request({ url: '/certificate/certificate_manage/certificateInfo/edit', @@ -38,7 +38,7 @@ export function updateCertificateInfoApi(data) { }) } -// 删除设备信息 +// 证件管理-删除信息 export function deleteCertificateInfoApi(data) { return request({ url: '/certificate/certificate_manage/certificateInfo/del', @@ -50,7 +50,7 @@ export function deleteCertificateInfoApi(data) { }) } -// 借退管理-取证分页查询信息 +// 证件管理-存证超期分页查询信息 export function getCertificateLifespanListPageApi(data) { return request({ url: '/certificate/certificate_manage/certificateLifespan/list', @@ -62,6 +62,18 @@ export function getCertificateLifespanListPageApi(data) { }) } +// 证件管理-证件超期分页查询信息 +export function getCertificateOverdueListPageApi(data) { + return request({ + url: '/certificate/certificate_manage/certificateOverdue/list', + method: 'get', + headers: { + //"merchant-id":"378915229716713472", + }, + params:data + }) +} + // 借退管理-任务记录分页查询信息 export function getCertificateTaskListPageApi(data) { @@ -142,3 +154,13 @@ export function getReplacelistApi(data) { params:data }) } +export function getDevicelistApi(data) { + return request({ + url: '/certificate/certificate_returnmanage/certificateSave/devicelist', + method: 'get', + headers: { + //"merchant-id":"378915229716713472", + }, + params:data + }) +} diff --git a/src/views/certificate/certificateManage/certificateInfo/index.vue b/src/views/certificate/certificateManage/certificateInfo/index.vue index 308d054..e3f5567 100644 --- a/src/views/certificate/certificateManage/certificateInfo/index.vue +++ b/src/views/certificate/certificateManage/certificateInfo/index.vue @@ -95,16 +95,25 @@ - + - - + + - + + + @@ -87,7 +132,7 @@ updateDept, listDeptExcludeChild, } from '@/api/system/dept' - import { getCertificateSaveListPageApi,addCertificateInfoApi, updateCertificateInfoApi, deleteCertificateInfoApi,getCertificateSaveAddPageApi } from "@/api/certificateManage/index"; + import { getCertificateSaveListPageApi,getCertificateSaveAddPageApi,getDevicelistApi } from "@/api/certificateManage/index"; import base64 from 'base-64'; import { getToken } from '@/utils/auth' import Treeselect from '@riophae/vue-treeselect' @@ -116,6 +161,11 @@ title: "", // 是否显示弹出层 open: false, + allDevice:[], + selectCertificateNos:"", + selectType:"", + selectDeviceId:"", + selectDeviceName:"", checked: false, // 部门树选项 deptOptions: [], @@ -146,27 +196,12 @@ }, // 表单校验 baseFormRules: { - deptId: [ - { required: true, message: "部门不能为空", trigger: "blur" } + deviceId: [ + { required: true, message: "证件柜不能为空", trigger: "blur" } ], - name: [ - { required: true, message: "姓名不能为空", trigger: "blur" } + processDate: [ + { required: true, message: "截止日期不能为空", trigger: "blur" } ], - idNumber: [ - { required: true, message: "身份证不能为空", trigger: "blur" } - ], - certificateType: [ - { required: true, message: "证件类型不能为空", trigger: "blur" } - ], - certificateNo: [ - { required: true, message: "证件编号不能为空", trigger: "blur" } - ], - issueDay: [ - { required: true, message: "签发日期不能为空", trigger: "blur" } - ], - issueLifespan: [ - { required: true, message: "有效期不能为空", trigger: "blur" } - ] }, logTableData:[],//异常弹窗 // 总条数 @@ -182,23 +217,6 @@ // 上传的地址 url: process.env.VUE_APP_BASE_API + '/file/upload', }, - appFormRules:{ - version: [ - { required: true, message: "版本号不能为空", trigger: "blur" } - ], - versionName: [ - { required: true, message: "版本号名称不能为空", trigger: "blur" } - ], - apkName: [ - { required: true, message: "APP名称不能为空", trigger: "blur" } - ], - apkPath: [ - { required: true, message: "APP路径不能为空", trigger: "blur" } - ], - updateContent: [ - { required: true, message: "更新内容不能为空", trigger: "blur" } - ] - }, }; }, mounted(){ @@ -236,6 +254,10 @@ this.loading = false; }); }, + getCorpAndDept(val){ + console.log("getCorpAndDept",val) + this.selectDeviceId=val.deviceId; + }, // 取消按钮 cancel() { this.open = false; @@ -263,34 +285,57 @@ handleAdd() { const CertificateNos = this.ids if(CertificateNos!=null&&CertificateNos.length>0){ - }else{ this.$modal.msgError("请选择证件"); return; } - this.$modal.confirm('是否确定自主存证？').then(() => { - getCertificateSaveAddPageApi({"certificateNos":CertificateNos,"type":"1"}).then(response => { - this.getList(); - this.$modal.msgSuccess("存证成功"); - }); - }).catch(() => {}); + this.open = true; + this.title = "自助存证"; + this.selectCertificateNos=CertificateNos; + this.selectType="1"; + getDevicelistApi({}).then(response => { + console.log("response",response); + this.allDevice=response; + }); }, /** 管理员存证 */ handleBatchAdd(){ - const CertificateNos = this.ids + const CertificateNos = this.ids if(CertificateNos!=null&&CertificateNos.length>0){ - }else{ this.$modal.msgError("请选择证件"); return; } - this.$modal.confirm('是否确定管理员存证？').then(() => { - getCertificateSaveAddPageApi({"certificateNos":CertificateNos,"type":"2"}).then(response => { - this.getList(); - this.$modal.msgSuccess("存证成功"); - }); - - }).catch(() => {}); + this.open = true; + this.title = "管理员存证"; + this.selectCertificateNos=CertificateNos; + this.selectType="2"; + getDevicelistApi({}).then(response => { + console.log("response",response); + this.allDevice=response; + }); + }, + submitForm: function() { + console.log("this.baseForm",this.baseForm); + if(this.selectDeviceId==""||this.selectDeviceId==null){ + this.$modal.msgError("请选择设备信息"); + return; + } + if(this.baseForm.processDate==""||this.baseForm.processDate==null){ + this.$modal.msgError("请选择截止日期"); + return; + } + getCertificateSaveAddPageApi({"certificateNos":this.selectCertificateNos,"type":this.selectType,"deviceId":this.selectDeviceId,"processDate":this.baseForm.processDate}).then(response => { + this.getList(); + this.open = false; + this.reset(); + this.$modal.msgSuccess("操作成功"); + }); + }, + // 取消按钮 + cancel() { + this.open = false; + this.reset(); }, formatDate(date) { // 格式化为 YYYY-MM-DD