diff --git a/src/api/certificateManage/index.js b/src/api/certificateManage/index.js index 4b756c9..8165a6e 100644 --- a/src/api/certificateManage/index.js +++ b/src/api/certificateManage/index.js @@ -74,7 +74,17 @@ export function getCertificateTaskListPageApi(data) { params:data }) } - +// 借退管理-证件任务撤回 +export function getCertificateTakeReturnPageApi(data) { + return request({ + url: '/certificate/certificate_returnmanage/certificateTask/return', + method: 'post', + headers: { + //"merchant-id":"378915229716713472", + }, + data: data + }) +} // 借退管理-存证分页查询信息 export function getCertificateSaveListPageApi(data) { return request({ @@ -87,6 +97,18 @@ export function getCertificateSaveListPageApi(data) { }) } +// 借退管理-证件存入 +export function getCertificateSaveAddPageApi(data) { + return request({ + url: '/certificate/certificate_returnmanage/certificateSave/add', + method: 'post', + headers: { + //"merchant-id":"378915229716713472", + }, + data: data + }) +} + // 借退管理-取证分页查询信息 export function getCertificateAtakeListPageApi(data) { return request({ @@ -98,3 +120,14 @@ export function getCertificateAtakeListPageApi(data) { params:data }) } +// 借退管理-证件取出 +export function getCertificateTakeAddPageApi(data) { + return request({ + url: '/certificate/certificate_returnmanage/certificateTake/add', + method: 'post', + headers: { + //"merchant-id":"378915229716713472", + }, + data: data + }) +} diff --git a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue index bfbf55e..a6f3312 100644 --- a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue +++ b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue @@ -41,7 +41,7 @@ plain icon="el-icon-download" size="mini" - @click="handleAdd" + @click="handleAdd(3)" >自主取证 @@ -50,7 +50,7 @@ plain icon="el-icon-download" size="mini" - @click="handleExport" + @click="handleAdd(4)" v-hasPermi="['system:dict:export']" >管理员取证 @@ -60,7 +60,7 @@ plain icon="el-icon-download" size="mini" - @click="handleBatchDel" + @click="handleAdd(5)" >应急取证 @@ -69,7 +69,7 @@ icon="el-icon-download" type="success" size="mini" - @click="handleDaiLing" + @click="handleAdd(6)" >他人代领 @@ -138,7 +138,7 @@ updateDept, listDeptExcludeChild, } from '@/api/system/dept' - import { getCertificateAtakeListPageApi,addCertificateInfoApi, updateCertificateInfoApi, deleteCertificateInfoApi } from "@/api/certificateManage/index"; + import { getCertificateAtakeListPageApi,addCertificateInfoApi, updateCertificateInfoApi, deleteCertificateInfoApi,getCertificateTakeAddPageApi } from "@/api/certificateManage/index"; import base64 from 'base-64'; import { getToken } from '@/utils/auth' import Treeselect from '@riophae/vue-treeselect' @@ -310,58 +310,33 @@ }; this.resetForm("baseForm"); }, - /** 新增按钮操作 */ - handleAdd() { - this.$modal.confirm('是否确定自主取证？').then(function() { + /** 取证按钮操作 */ + handleAdd(type) { + console.log("type",type); + const CertificateNos = this.ids + if(CertificateNos!=null&&CertificateNos.length>0){ - }).then(() => { - this.getList(); - this.$modal.msgSuccess("取证成功"); + }else{ + this.$modal.msgError("请选择证件"); + return; + } + var titlemsg="是否确定自主取证？" + if(type==3){ + titlemsg="是否确定自主取证？" + }else if(type==4){ + titlemsg="是否确定管理员取证？" + }else if(type==5){ + titlemsg="是否确定应急取证？" + }else if(type==6){ + titlemsg="是否确定代人取证？" + } + this.$modal.confirm(titlemsg).then(() => { + getCertificateTakeAddPageApi({"certificateNos":CertificateNos,"type":type}).then(response => { + this.getList(); + this.$modal.msgSuccess("操作成功"); + }); }).catch(() => {}); }, - /** 电子标签*/ - handleCheckedOne(value, type) { - console.log(type,value) - }, - handleCheckedTwo(value, type) { - console.log(type,value) - }, - /** 转换部门数据结构 */ - normalizer(node) { - if (node.children && !node.children.length) { - delete node.children - } - return { - id: node.deptId, - label: node.deptName, - children: node.children, - } - }, - /** 修改按钮操作 */ - handleUpdate(row) { - this.reset(); - this.open = true; - this.baseForm = Object.assign({}, row) - // this.$set(this,"metadata",row.deviceMetadata) - this.title = "修改"; - }, - handleTabClick(tab, event) { - console.log(tab, event); - }, - /** 提交按钮 */ - submitForm: function() { - this.$modal.msgSuccess("取证成功"); - }, - /** 删除按钮操作 */ - handleDelete(row) { - // const dictIds = row.dictId || this.ids; - this.$modal.confirm('是否确认删除数据项？').then(function() { - return deleteCertificateInfoApi({deviceId:row.deviceId}); - }).then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); - }, formatDate(date) { // 格式化为 YYYY-MM-DD const year = date.getFullYear(); @@ -369,47 +344,10 @@ const day = String(date.getDate()).padStart(2, '0'); return `${year}-${month}-${day}`; }, - /** 导出按钮操作 */ - handleExport() { - this.$modal.confirm('是否确定管理员取证？').then(function() { - }).then(() => { - this.getList(); - this.$modal.msgSuccess("取证成功"); - }).catch(() => {}); - }, - // 文件上传中处理 - handleFileUploadProgress(event, file, fileList) { - this.upload.isUploading = true - }, - // 文件上传成功处理 - handleFileSuccess(response, file, fileList) { - console.log(response) - this.upload.isUploading = false - this.$refs.upload.clearFiles() - if(response.code==200){ - this.appForm.apkPath=response.data.url - }else{ - this.$modal.msgError("上传失败，请重新选择文件！"); - } - }, - /** 批量删除 */ - handleBatchDel(){ - this.$modal.confirm('是否确定应急取证？').then(function() { - - }).then(() => { - this.getList(); - this.$modal.msgSuccess("取证成功"); - }).catch(() => {}); - }, - handleDaiLing(){ - this.reset(); - this.open = true; - this.title = "他人代领"; - }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map(item => item.dictId) + this.ids = selection.map(item => item.certificateNo) this.single = selection.length!=1 this.multiple = !selection.length }, diff --git a/src/views/certificate/certificateReturnManage/certificateSave/index.vue b/src/views/certificate/certificateReturnManage/certificateSave/index.vue index cc70720..f9782c5 100644 --- a/src/views/certificate/certificateReturnManage/certificateSave/index.vue +++ b/src/views/certificate/certificateReturnManage/certificateSave/index.vue @@ -49,7 +49,7 @@ type="danger" plain size="mini" - @click="handleBatchDel" + @click="handleBatchAdd" >管理员存证 @@ -75,114 +75,6 @@ :limit.sync="queryParams.pageSize" @pagination="getList" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 是 - 否 - - - - - - - -
- 确 定 - 取 消 -
- @@ -195,7 +87,7 @@ updateDept, listDeptExcludeChild, } from '@/api/system/dept' - import { getCertificateSaveListPageApi,addCertificateInfoApi, updateCertificateInfoApi, deleteCertificateInfoApi } from "@/api/certificateManage/index"; + import { getCertificateSaveListPageApi,addCertificateInfoApi, updateCertificateInfoApi, deleteCertificateInfoApi,getCertificateSaveAddPageApi } from "@/api/certificateManage/index"; import base64 from 'base-64'; import { getToken } from '@/utils/auth' import Treeselect from '@riophae/vue-treeselect' @@ -369,72 +261,36 @@ }, /** 新增按钮操作 */ handleAdd() { - this.$modal.confirm('是否确定自主存证？').then(function() { + const CertificateNos = this.ids + if(CertificateNos!=null&&CertificateNos.length>0){ - }).then(() => { + }else{ + this.$modal.msgError("请选择证件"); + return; + } + this.$modal.confirm('是否确定自主存证？').then(() => { + getCertificateSaveAddPageApi({"certificateNos":CertificateNos,"type":"1"}).then(response => { this.getList(); this.$modal.msgSuccess("存证成功"); + }); }).catch(() => {}); }, - /** 电子标签*/ - handleCheckedOne(value, type) { - console.log(type,value) - }, - handleCheckedTwo(value, type) { - console.log(type,value) - }, - /** 转换部门数据结构 */ - normalizer(node) { - if (node.children && !node.children.length) { - delete node.children + /** 管理员存证 */ + handleBatchAdd(){ + const CertificateNos = this.ids + if(CertificateNos!=null&&CertificateNos.length>0){ + + }else{ + this.$modal.msgError("请选择证件"); + return; } - return { - id: node.deptId, - label: node.deptName, - children: node.children, - } - }, - /** 修改按钮操作 */ - handleUpdate(row) { - this.reset(); - this.open = true; - this.baseForm = Object.assign({}, row) - // this.$set(this,"metadata",row.deviceMetadata) - this.title = "修改"; - }, - handleTabClick(tab, event) { - console.log(tab, event); - }, - /** 提交按钮 */ - submitForm: function() { - console.log("this.baseForm",this.baseForm); - this.$refs["baseForm"].validate(valid => { - if (valid) { - if (this.baseForm.certificateNo != undefined) { - updateCertificateInfoApi(this.baseForm).then(response => { - this.$modal.msgSuccess("修改成功"); - this.open = false; - this.getList(); - }); - } else { - addCertificateInfoApi(this.baseForm).then(response => { - this.$modal.msgSuccess("新增成功"); - this.open = false; - this.getList(); - }); - } - } - }); - }, - /** 删除按钮操作 */ - handleDelete(row) { - // const dictIds = row.dictId || this.ids; - this.$modal.confirm('是否确认删除数据项？').then(function() { - return deleteCertificateInfoApi({deviceId:row.deviceId}); - }).then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); + this.$modal.confirm('是否确定管理员存证？').then(() => { + getCertificateSaveAddPageApi({"certificateNos":CertificateNos,"type":"2"}).then(response => { + this.getList(); + this.$modal.msgSuccess("存证成功"); + }); + + }).catch(() => {}); }, formatDate(date) { // 格式化为 YYYY-MM-DD @@ -443,45 +299,9 @@ const day = String(date.getDate()).padStart(2, '0'); return `${year}-${month}-${day}`; }, - /** 导出按钮操作 */ - handleExport() { - this.download('system/dict/type/export', { - ...this.queryParams - }, `type_${new Date().getTime()}.xlsx`) - }, - // 文件上传中处理 - handleFileUploadProgress(event, file, fileList) { - this.upload.isUploading = true - }, - // 文件上传成功处理 - handleFileSuccess(response, file, fileList) { - console.log(response) - this.upload.isUploading = false - this.$refs.upload.clearFiles() - if(response.code==200){ - this.appForm.apkPath=response.data.url - }else{ - this.$modal.msgError("上传失败，请重新选择文件！"); - } - }, - /** 下载模板操作 */ - importTemplate() { - let url = window.location.origin + '/glweb/template/批量新增原料模板.xlsx'; - console.log(url) - downloadFileByUrl(url) - }, - /** 批量删除 */ - handleBatchDel(){ - this.$modal.confirm('是否确定管理员存证？').then(function() { - - }).then(() => { - this.getList(); - this.$modal.msgSuccess("存证成功"); - }).catch(() => {}); - }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map(item => item.dictId) + this.ids = selection.map(item => item.certificateNo) this.single = selection.length!=1 this.multiple = !selection.length }, diff --git a/src/views/certificate/certificateReturnManage/certificateTask/index.vue b/src/views/certificate/certificateReturnManage/certificateTask/index.vue index 4fd57e5..ef1bf66 100644 --- a/src/views/certificate/certificateReturnManage/certificateTask/index.vue +++ b/src/views/certificate/certificateReturnManage/certificateTask/index.vue @@ -57,7 +57,7 @@ - + @@ -74,8 +74,14 @@ - - + + + 0){ - }).then(() => { - this.getList(); - this.$modal.msgSuccess("撤回成功"); + }else{ + this.$modal.msgError("请选择证件"); + return; + } + this.$modal.confirm('是否确定撤回任务？').then(() => { + getCertificateTakeReturnPageApi({"certificateNos":taskNos}).then(response => { + this.getList(); + this.$modal.msgSuccess("撤回成功"); + }); }).catch(() => {}); }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map(item => item.dictId) + this.ids = selection.map(item => item.taskNo) this.single = selection.length!=1 this.multiple = !selection.length },