diff --git a/src/api/certificateManage/index.js b/src/api/certificateManage/index.js index 87c59bc..cae727b 100644 --- a/src/api/certificateManage/index.js +++ b/src/api/certificateManage/index.js @@ -208,3 +208,27 @@ export function getCheckListPageApi(data) { params:data }) } + +// 证件管理-分页查询设备信息 +export function getCertificateCheckListPageApi(data) { + return request({ + url: '/certificate/certificate_manage/certificateInfo/checkList', + method: 'get', + headers: { + //"merchant-id":"378915229716713472", + }, + params:data + }) +} + +// 证件管理-新增验证 +export function addCertificateCheckApi(data) { + return request({ + url: '/certificate/certificate_manage/certificateInfo/addCheck', + method: 'post', + headers: { + //"merchant-id":"378915229716713472", + }, + data: data + }) + } diff --git a/src/views/certificate/certificateManage/certificateInfo/index.vue b/src/views/certificate/certificateManage/certificateInfo/index.vue index fb27652..e9aa7f8 100644 --- a/src/views/certificate/certificateManage/certificateInfo/index.vue +++ b/src/views/certificate/certificateManage/certificateInfo/index.vue @@ -58,7 +58,7 @@ plain icon="el-icon-download" size="mini" - @click="handleExport" + @click="handleExport" >导出 @@ -93,8 +93,7 @@ plain icon="el-icon-plus" size="mini" - :disabled="multiple" - @click="handleTask" + @click="handleTask" >一人多证核验 @@ -105,10 +104,10 @@ - + - @@ -158,8 +157,8 @@ /> - - + + @@ -174,7 +173,7 @@ @click="handleSelect()" >选择人员 - + @@ -190,7 +189,7 @@ - + @@ -254,7 +253,7 @@ format="yyyy-MM-dd" value-format="yyyy-MM-dd"> - + @@ -262,7 +261,7 @@ 否 - + @@ -275,14 +274,14 @@ - +
确 定 取 消
- + @@ -302,7 +301,7 @@ @click.native="getCorpAndDept(item)" /> - + @@ -311,34 +310,34 @@ - - + +
确 定 取 消
- - + + - + - - - + + +
确 定 取 消
- + @@ -352,7 +351,7 @@ listDeptExcludeChild, } from '@/api/system/dept' import { getCertificateInfoListPageApi,addCertificateInfoApi, updateCertificateInfoApi, - deleteCertificateInfoApi,getSysUserListApi } from "@/api/certificateManage/index"; + deleteCertificateInfoApi,getSysUserListApi,addCertificateCheckApi } from "@/api/certificateManage/index"; import base64 from 'base-64'; import { getToken } from '@/utils/auth' import { downloadFileByUrl } from '@/utils/download' @@ -386,8 +385,9 @@ isCreateFlage:true, userNameFlage:false, certificateNos:[], + userIds:[], isReadOnly:false, - openSelectUser:false, + openSelectUser:false, selectItme:{}, allUserList:[], // 部门树选项 @@ -471,11 +471,11 @@ openTask: false, // 表单参数 taskForm: { - verificationDate:"" - }, + processDate:"" + }, // 表单校验 - taskRules: { - verificationDate: [ + taskRules: { + processDate: [ { required: true, message: '核验截止日期不能为空', @@ -685,7 +685,7 @@ this.reset(); }, handleSelect(){ - this.openSelectUser = true; + this.openSelectUser = true; getSysUserListApi({}).then(response => { console.log("response",response); this.allUserList=response; @@ -705,9 +705,9 @@ this.$refs["baseForm2"].validate(valid => { if (valid) { this.$set(this.baseForm,"phone",this.selectItme.phone) - this.$set(this.baseForm,"name",this.selectItme.userName) + this.$set(this.baseForm,"name",this.selectItme.userName) this.$set(this.baseForm,"userId",this.selectItme.userId) - this.$set(this.baseForm,"deptId",this.selectItme.deptId) + this.$set(this.baseForm,"deptId",this.selectItme.deptId) this.openSelectUser = false; this.isCreateFlage=false; } @@ -775,15 +775,16 @@ }, // 多选框选中数据 handleSelectionChange(selection) { - this.certificateNos = selection.map(item => item.certificateNo) + this.certificateNos = selection.map(item => item.certificateNo) + this.userIds=selection.map(item => item.userId) // 更新单选和多选状态 this.single = selection.length !== 1 this.multiple = !selection.length }, /** 远程校验按钮操作 */ handleTask() { - this.resetTask() - this.openTask = true + this.resetTask() + this.openTask = true }, // 取消按钮 cancelTask() { @@ -793,25 +794,32 @@ // 表单重置 resetTask() { this.taskForm = { - verificationDate:"" - } - this.resetForm('taskForm') + processDate:"" + } + this.resetForm('taskForm') }, /** 提交按钮 */ submitTask: function () { - this.$refs['taskForm'].validate((valid) => { - let param = Object.assign({},this.taskForm) - console.log(param) - if (valid) { - // updateUser(param).then((response) => { - // this.$modal.msgSuccess('修改成功') - // this.openTask = false - // this.getList() - // }) - } - }) + this.$refs['taskForm'].validate((valid) => { + let param = Object.assign({},this.taskForm) + console.log(param) + console.log(this.ids) + if (valid) { + param.userIds=this.userIds; + param.checkType="2"; + addCertificateCheckApi(param).then(response => { + if(response.code=200){ + this.$modal.msgSuccess("验证下发成功"); + this.openTask = false; + this.getList(); + }else{ + this.$modal.msgError(response.msg); + } + }); + } + }) }, - openLog(row){ + openLog(row){ this.$router.push({ path: "/certificate/certificateManage/certificateLogList",query: {certificateInfoRowData:JSON.stringify(row)} }); } } diff --git a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue index 5050433..d7ac1a7 100644 --- a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue +++ b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue @@ -72,17 +72,6 @@ >他人代领 - - 出入境核验 - - @@ -200,26 +189,6 @@ - - - - - - - - - - -
- 确 定 - 取 消 -
- diff --git a/src/views/certificate/certificateReturnManage/certificateTask/index.vue b/src/views/certificate/certificateReturnManage/certificateTask/index.vue index da325af..8d66f69 100644 --- a/src/views/certificate/certificateReturnManage/certificateTask/index.vue +++ b/src/views/certificate/certificateReturnManage/certificateTask/index.vue @@ -54,6 +54,16 @@ v-hasPermi="['system:dict:export']" >导出 + + 出入境核验 + +
@@ -61,7 +71,8 @@
取证任务数/已完成数：235/230
- + + @@ -136,7 +168,8 @@ updateDept, listDeptExcludeChild, } from '@/api/system/dept' - import { getCertificateTaskListPageApi,addCertificateInfoApi, updateCertificateInfoApi, deleteCertificateInfoApi,getCertificateTakeReturnPageApi } from "@/api/certificateManage/index"; + import { getCertificateTaskListPageApi,addCertificateInfoApi, updateCertificateInfoApi, deleteCertificateInfoApi, + getCertificateTakeReturnPageApi,addCertificateCheckApi } from "@/api/certificateManage/index"; import base64 from 'base-64'; import { getToken } from '@/utils/auth' import Treeselect from '@riophae/vue-treeselect' @@ -152,6 +185,9 @@ loading: true, // 选中数组 ids: [], + userIds: [], + exitTimes:[], + entryTimes:[], // 非单个禁用 single: true, // 非多个禁用 @@ -251,7 +287,22 @@ }, openCode:false, qrCode: '', - qrCodeStr:"" + qrCodeStr:"", + openTask: false, + // 表单参数 + taskForm: { + processDate:"" + }, + // 表单校验 + taskRules: { + processDate: [ + { + required: true, + message: '核验截止日期不能为空', + trigger: 'blur', + }, + ] + }, }; }, mounted(){ @@ -266,6 +317,13 @@ }else{ return true; } + }, + selectablerow2(row,index){ + if(row.checkState=="0"||row.checkState=="1"){ + return false; + }else{ + return true; + } }, /** 搜索按钮操作 */ handleQuery() { @@ -441,7 +499,10 @@ }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map(item => item.taskNo) + this.ids = selection.map(item => item.taskNo); + this.userIds=selection.map(item => item.userId); + this.exitTimes=selection.map(item => item.exitTime); + this.entryTimes=selection.map(item => item.entryTime); this.single = selection.length!=1 this.multiple = !selection.length }, @@ -459,7 +520,53 @@ correctLevel: QRCode.CorrectLevel.H }) }, 500) - } + }, + /** 远程校验按钮操作 */ + handleTask() { + this.resetTask() + this.openTask = true + }, + // 取消按钮 + cancelTask() { + this.openTask = false + this.resetTask() + }, + // 表单重置 + resetTask() { + this.taskForm = { + verificationDate:"" + } + this.resetForm('taskForm') + }, + /** 提交按钮 */ + submitTask: function () { + this.$refs['taskForm'].validate((valid) => { + let param = Object.assign({},this.taskForm) + console.log(param) + console.log(this.userIds) + if (valid) { + param.userIds=this.userIds; + param.exitTimes=this.exitTimes; + param.entryTimes=this.entryTimes; + for(var k=0;k { + if(response.code=200){ + this.$modal.msgSuccess("验证下发成功"); + this.openTask = false; + this.getList(); + }else{ + this.$modal.msgError(response.msg); + } + }); + } + }) + }, } }; diff --git a/src/views/certificate/filingUser/index.vue b/src/views/certificate/filingUser/index.vue index 516c8e4..de0e6a4 100644 --- a/src/views/certificate/filingUser/index.vue +++ b/src/views/certificate/filingUser/index.vue @@ -146,7 +146,7 @@ { - // this.$modal.msgSuccess('修改成功') - // this.openTask = false - // this.getList() - // }) + param.userIds=this.ids; + param.checkType="1"; + addCertificateCheckApi(param).then(response => { + if(response.code=200){ + this.$modal.msgSuccess("验证下发成功"); + this.openTask = false; + this.getList(); + }else{ + this.$modal.msgError(response.msg); + } + }); } }) }, diff --git a/src/views/certificate/remoteVerification/index.vue b/src/views/certificate/remoteVerification/index.vue index f77de78..bff3e30 100644 --- a/src/views/certificate/remoteVerification/index.vue +++ b/src/views/certificate/remoteVerification/index.vue @@ -1,6 +1,6 @@