From 2982e92d0c6298b2f2b8d8727c75e268a34267f0 Mon Sep 17 00:00:00 2001 From: jiask <1069621233@qq.com> Date: Thu, 6 Nov 2025 17:12:13 +0800 Subject: [PATCH] jsk --- src/api/certificateManage/index.js | 24 +++ .../certificateInfo/index.vue | 110 ++++++----- .../certificateAtake/index.vue | 31 --- .../certificateTask/index.vue | 119 ++++++++++- src/views/certificate/filingUser/index.vue | 24 ++- .../certificate/remoteVerification/index.vue | 187 ++++++------------ 6 files changed, 276 insertions(+), 219 deletions(-) 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 b4b417d..e2cd58b 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 @@ {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}} - + - @@ -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 b9987de..ddbe1b7 100644 --- a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue +++ b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue @@ -72,17 +72,6 @@ >他人代领 - - 出入境核验 - - @@ -205,26 +194,6 @@ - - - - - - - - - - - - diff --git a/src/views/certificate/certificateReturnManage/certificateTask/index.vue b/src/views/certificate/certificateReturnManage/certificateTask/index.vue index 72b1787..cf5af77 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 - + + {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}} @@ -110,7 +121,7 @@ @pagination="getList" /> - + @@ -123,6 +134,27 @@ + + + + + + + + + + + + + @@ -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 @@ - + 核验任务下达 - + @@ -43,30 +43,38 @@ 有无证件任务数/已核验数:760个/600个 - + {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}} - - + + - - - - - - + /> + + + 验证中 + 已验证 + + + + + / + 不通过 + 已通过 + + - + - + 有无证件 一人多证 出入境时间 - - + + - - - + + + - + @@ -123,7 +131,7 @@ updateDept, listDeptExcludeChild, } from '@/api/system/dept' - import { getCertificateInfoListPageApi,addCertificateInfoApi, updateCertificateInfoApi, + import { getCertificateCheckListPageApi,addCertificateCheckApi, updateCertificateInfoApi, deleteCertificateInfoApi,getSysUserListApi } from "@/api/certificateManage/index"; import base64 from 'base-64'; import { getToken } from '@/utils/auth' @@ -153,29 +161,29 @@ // 弹出层标题 title: "", // 是否显示弹出层 - open: false, - certificateNos:[], + open: false, + taskNos:[], // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 10, name:null,//姓名 certificateNo:null,//证件编号 - }, + }, // 表单参数 baseForm: { - verificationType:1, - verificationDate:"", - }, + checkType:1, + processDate:"", + }, // 表单校验 baseFormRules: { - verificationType: [ + checkType: [ { required: true, message: "核验类型不能为空", trigger: "blur" } ], - verificationDate: [ + processDate: [ { required: true, message: "核验截至日期不能为空", trigger: "blur" } ] - }, + }, }; }, mounted(){ @@ -195,70 +203,11 @@ callback(new Error('请输入有效的身份证号')); // 验证失败,显示错误信息提示 } }, - handleRadioChange(val){ - if(val==1){ - this.userNameFlage=true; - this.baseFormRules= { - deptId: [ - { required: true, message: "部门不能为空", trigger: "blur" } - ], - name: [ - { required: true, message: "姓名不能为空", trigger: "blur" } - ], - idNumber: [ - { required: true, message: "身份证不能为空", trigger: "blur" }, - { validator: this.validateIDCard, trigger: 'blur' } - ], - certificateType: [ - { required: true, message: "证件类型不能为空", trigger: "blur" } - ], - certificateNo: [ - { required: true, message: "证件编号不能为空", trigger: "blur" } - ], - issueDay: [ - { required: true, message: "签发日期不能为空", trigger: "blur" } - ], - phone: [ - { required: true, message: "手机号码不能为空", trigger: "blur" }, - { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' } - ], - issueLifespan: [ - { required: true, message: "有效期不能为空", trigger: "blur" } - ], - userName: [ - { required: true, message: "用户名不能为空", trigger: "blur" } - ] - } + selectablerow(row,index){ + if(row.checkState=="0"||row.checkState=="1"){ + return false; }else{ - this.userNameFlage=false; - this.baseFormRules= { - deptId: [ - { required: true, message: "部门不能为空", trigger: "blur" } - ], - name: [ - { required: true, message: "姓名不能为空", trigger: "blur" } - ], - idNumber: [ - { required: true, message: "身份证不能为空", trigger: "blur" }, - { validator: this.validateIDCard, trigger: 'blur' } - ], - certificateType: [ - { required: true, message: "证件类型不能为空", trigger: "blur" } - ], - certificateNo: [ - { required: true, message: "证件编号不能为空", trigger: "blur" } - ], - issueDay: [ - { required: true, message: "签发日期不能为空", trigger: "blur" } - ], - phone: [ - { required: true, message: "手机号码不能为空", trigger: "blur" }, - { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' } - ], - issueLifespan: [ - { required: true, message: "有效期不能为空", trigger: "blur" } - ] - } + return true; } }, /** 搜索按钮操作 */ @@ -282,9 +231,7 @@ "certificateNo":this.queryParams.certificateNo } console.log("param",param) - // let str = base64.encode(JSON.stringify(param)) - // console.log({"content":str}) - getCertificateInfoListPageApi(param).then(response => { + getCertificateCheckListPageApi(param).then(response => { this.tableListData = response.rows; this.total = Number(response.total); this.loading = false; @@ -294,7 +241,7 @@ cancel() { this.open = false; this.reset(); - }, + }, // 表单重置 reset() { this.baseForm = { @@ -316,42 +263,38 @@ /** 新增按钮操作 */ handleAdd() { this.reset(); - this.open = true; + this.open = true; console.log("this.baseForm",this.baseForm); - }, + }, // 多选框选中数据 handleSelectionChange(selection) { - this.certificateNos = selection.map(item => item.certificateNo) + this.taskNos = selection.map(item => item.taskNo) }, /** 提交按钮 */ submitForm: function() { console.log("this.baseForm",this.baseForm); this.$refs["baseForm"].validate(valid => { if (valid) { - if (this.baseForm.createTime != 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(); - }); - } + this.baseForm.taskNos=this.taskNos; + addCertificateCheckApi(this.baseForm).then(response => { + if(response.code=200){ + this.$modal.msgSuccess("验证下发成功"); + this.open = false; + this.getList(); + }else{ + this.$modal.msgError(response.msg); + } + }); } }); }, - formatDate(date) { // 格式化为 YYYY-MM-DD const year = date.getFullYear(); const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始 const day = String(date.getDate()).padStart(2, '0'); return `${year}-${month}-${day}`; - }, + }, } };