diff --git a/src/api/certificateManage/index.js b/src/api/certificateManage/index.js index 0fda230..cc5d556 100644 --- a/src/api/certificateManage/index.js +++ b/src/api/certificateManage/index.js @@ -164,6 +164,18 @@ export function getSysUserListApi(data) { params:data }) } + +export function getApplyUserListApi(data) { + return request({ + url: '/certificate/certificate_check/certificateCheck/applyUserlist', + method: 'get', + headers: { + //"merchant-id":"378915229716713472", + }, + params:data + }) +} + export function getDevicelistApi(data) { return request({ url: '/certificate/certificate_returnmanage/certificateSave/devicelist', diff --git a/src/api/certificateStatistics/index.js b/src/api/certificateStatistics/index.js index b3336c7..1889601 100644 --- a/src/api/certificateStatistics/index.js +++ b/src/api/certificateStatistics/index.js @@ -1,6 +1,5 @@ import request from '@/utils/request' -// 证件管理-新增 export function getStatisticsApi(data) { return request({ url: '/certificate/certificate_manage/certificateInfo/statistics', @@ -11,3 +10,14 @@ export function getStatisticsApi(data) { data: data }) } + +export function getTaskStatisticsApi(data) { + return request({ + url: '/certificate/certificate_manage/certificateInfo/taskStatistics', + 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 899b393..1da7d12 100644 --- a/src/views/certificate/certificateManage/certificateInfo/index.vue +++ b/src/views/certificate/certificateManage/certificateInfo/index.vue @@ -204,7 +204,7 @@ - + @@ -425,7 +425,7 @@ // 是否显示弹出层 open: false, checked: false, - isCreateFlage:true, + isCreateFlage:false, userNameFlage:false, certificateNos:[], userIds:[], diff --git a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue index d2ede01..9974d21 100644 --- a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue +++ b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue @@ -382,7 +382,7 @@ if(CertificateNos!=null&&CertificateNos.length>0){ }else{ - this.$modal.msgError("请选择证件"); + this.$modal.msgWarning("请选择证件"); return; } var titlemsg="是否确定自助取证？" diff --git a/src/views/certificate/certificateReturnManage/certificateRequest/index.vue b/src/views/certificate/certificateReturnManage/certificateRequest/index.vue index 605e5c1..456a221 100644 --- a/src/views/certificate/certificateReturnManage/certificateRequest/index.vue +++ b/src/views/certificate/certificateReturnManage/certificateRequest/index.vue @@ -33,7 +33,7 @@ 搜索 重置 - + - @@ -357,13 +365,13 @@ pageNum: 1, pageSize: 10, idNumber:null,//身份证号 - name:null,//姓名 + name:null,//姓名 }, activeName:"baseSetting", deviceData:{}, // 岗位选项 - postOptions: [], - // 表单参数 + postOptions: [], + // 表单参数 baseForm: { userId:"", applyType:1, @@ -405,8 +413,8 @@ dateRange: [ { required: true, message: "预计使用时间不能为空", trigger: "change" } ], - - }, + + }, //导入参数 upload: { // 是否禁用上传 @@ -450,7 +458,7 @@ } getCertificateApplyListPageApi(param).then(response => { this.tableListData = response.rows; - + this.total = Number(response.total); this.loading = false; }); @@ -470,15 +478,15 @@ startTime:"", endTime:"", dateRange:[] - }; + }; this.resetForm("baseForm"); }, /** 新增按钮操作 */ handleAdd() { - this.reset(); + this.reset(); this.open = true; this.isReadOnly=false; - this.title = "新增"; + this.title = "新增"; console.log("this.baseForm",this.baseForm); }, /** 修改按钮操作 */ @@ -486,7 +494,7 @@ this.reset(); this.open = true; this.isReadOnly=true; - this.baseForm = Object.assign({}, row) + this.baseForm = Object.assign({}, row) this.baseForm.dateRange = [row.startTime,row.endTime] if(row.fileUrl&&row.fileUrl!=''){ let arr = row.fileUrl.split(","); @@ -503,7 +511,7 @@ } his.isView = false this.title = "修改"; - }, + }, handleView(row) { this.reset(); this.open = true; @@ -543,8 +551,8 @@ this.baseForm.endTime = "" } //applyState -1 仅保存不提交 0保存提交 - this.baseForm.applyState = type; - //fileUrls 附件 数组 + this.baseForm.applyState = type; + //fileUrls 附件 数组 this.baseForm.fileUrls = this.fileUrls this.baseForm.fileNames = this.fileNames console.log("this.baseForm",this.baseForm); @@ -590,7 +598,9 @@ //选择人员 handleSelect(){ this.openSelectUser = true; - getSysUserListApi({}).then(response => { + console.log("this.baseForm",this.baseForm); + const param={"applyType":this.baseForm.applyType} + getApplyUserListApi(param).then(response => { console.log("response",response); this.allUserList=response; this.$set(this.baseForm2,"userId",this.baseForm.userId) @@ -637,7 +647,7 @@ this.getCertificateList();//获取可申请证件编号列表 }, /** 删除按钮操作 */ - handleDelete(row) { + handleDelete(row) { this.$modal.confirm('是否确认删除数据项？').then(() => { delCertificateApplyApi({checkId:row.checkId}).then(response => { console.log("delCertificateApplyApi",response); @@ -655,9 +665,9 @@ handleFileSuccess(response, file, fileList) { this.upload.isUploading = false; if(response.code==200){ - this.fileUrls.push(response.data.url) + this.fileUrls.push(response.data.url) this.fileNames.push(response.data.name) - this.$modal.msgSuccess(response.msg); + this.$modal.msgSuccess(response.msg); }else{ this.$modal.msgError(response.msg); } @@ -672,7 +682,7 @@ this.fileUrls.splice(sum, 1) this.fileNames.splice(sum, 1) }, - async handlePreviewDownloadFile(file) { + async handlePreviewDownloadFile(file) { if (file.url != null && file.url !== '') { let downloadUrl = file.url; try { @@ -692,17 +702,17 @@ console.error(error); } } - if (file.raw != null && file.raw !== '') { + if (file.raw != null && file.raw !== '') { const blob = file.raw; // 将文件内容转换为 Blob 对象 const link = document.createElement('a'); link.href = URL.createObjectURL(blob); // 创建一个 URL 对象 link.download = file.name; // 指定下载的文件名 document.body.appendChild(link); // 将链接添加到 DOM 中 link.click(); // 触发下载 - document.body.removeChild(link); // 下载后移除 元素 + document.body.removeChild(link); // 下载后移除 元素 } }, - checkFile(row){ + checkFile(row){ this.fileList=[] this.fileUrls=[] this.fileNames = [] @@ -729,7 +739,7 @@ // this.single = selection.length !== 1 // this.multiple = !selection.length }, - formatDate(date) { + formatDate(date) { const year = date.getFullYear(); const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始 const day = String(date.getDate()).padStart(2, '0'); diff --git a/src/views/certificate/certificateReturnManage/certificateSave/index.vue b/src/views/certificate/certificateReturnManage/certificateSave/index.vue index 0aff7e9..d54a970 100644 --- a/src/views/certificate/certificateReturnManage/certificateSave/index.vue +++ b/src/views/certificate/certificateReturnManage/certificateSave/index.vue @@ -111,6 +111,8 @@ v-model="baseForm.processDate" type="date" placeholder="选择日期" + :disabled-date="disabledBeforeToday" + :picker-options="pickerOptions" format="yyyy-MM-dd" style="width: 100%" value-format="yyyy-MM-dd"> @@ -145,6 +147,13 @@ components: { Treeselect }, data() { return { + pickerOptions: { + disabledDate(time) { + // 选择今天以及今天之后的日期 + return time.getTime() < Date.now() - 8.64e7// 如果没有后面的-8.64e7就是不可以选择 + // 选择今天以及今天之前的日期 + // return time.getTime() > Date.now() - 8.64e7// 如果没有后面的-8.64e7就是不可以选择今天的 + } }, // 遮罩层 loading: true, // 选中数组 @@ -215,6 +224,14 @@ }, methods: { + disabledBeforeToday(time) { + // 获取今天的日期 + const today = new Date(); + today.setHours(0, 0, 0, 0); // 设置时间为午夜12点，以确保比较时不考虑时间部分 + // 比较传入的日期是否早于今天 + console.log("disabledBeforeToday",time) + return time.getTime() < today.getTime(); + }, /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; @@ -262,7 +279,7 @@ const CertificateNos = this.ids if(CertificateNos!=null&&CertificateNos.length>0){ }else{ - this.$modal.msgError("请选择证件"); + this.$modal.msgWarning("请选择证件"); return; } this.open = true; @@ -280,7 +297,7 @@ const CertificateNos = this.ids if(CertificateNos!=null&&CertificateNos.length>0){ }else{ - this.$modal.msgError("请选择证件"); + this.$modal.msgWarning("请选择证件"); return; } this.open = true; diff --git a/src/views/certificate/certificateReturnManage/certificateTask/index.vue b/src/views/certificate/certificateReturnManage/certificateTask/index.vue index 9336de4..3711404 100644 --- a/src/views/certificate/certificateReturnManage/certificateTask/index.vue +++ b/src/views/certificate/certificateReturnManage/certificateTask/index.vue @@ -68,8 +68,8 @@
-
存证任务数/已完成数：{{saveNum}}/{{saveNumd}}
-
取证任务数/已完成数：{{takeNum}}/{{takeNumd}}
+
存证任务数/已完成数：{{statistics.saveNum}}/{{statistics.savedNum}}
+
取证任务数/已完成数：{{statistics.takeNum}}/{{statistics.takedNum}}
@@ -170,6 +170,7 @@ } from '@/api/system/dept' import { getCertificateTaskListPageApi,addCertificateInfoApi, updateCertificateInfoApi, deleteCertificateInfoApi, getCertificateTakeReturnPageApi,addCertificateCheckApi,getCertificateTaskNumApi } from "@/api/certificateManage/index"; + import { getTaskStatisticsApi } from "@/api/certificateStatistics/index"; import base64 from 'base-64'; import { getToken } from '@/utils/auth' import Treeselect from '@riophae/vue-treeselect' @@ -206,6 +207,12 @@ checked: false, // 部门树选项 deptOptions: [], + statistics:{ + saveNum:0, + savedNum:0, + takeNum:0, + takedNum:0 + }, // 查询参数 queryParams: { pageNum: 1, @@ -313,6 +320,7 @@ mounted(){ this.getList(); this.getNum(); + this.initStatistics(); }, methods: { @@ -320,6 +328,17 @@ handleQuery() { this.queryParams.pageNum = 1; this.getList(); + this.initStatistics();ss + }, + initStatistics(){ + let param = {} + getTaskStatisticsApi(param).then(response => { + console.log("getTaskStatisticsApi",response) + if(response.code==200){ + this.statistics =response.data; + console.log("this.statistics",this.statistics) + } + }); }, /** 重置按钮操作 */ resetQuery() { diff --git a/src/views/certificate/device/index.vue b/src/views/certificate/device/index.vue index d1dc4e2..6d8506c 100644 --- a/src/views/certificate/device/index.vue +++ b/src/views/certificate/device/index.vue @@ -17,10 +17,10 @@ - + - + @@ -235,6 +235,8 @@ queryParams: { pageNum: 1, pageSize: 10, + deviceName:"", + deviceType:"", keyWord:"",//关键字 }, activeName:"baseSetting", @@ -252,7 +254,8 @@ deviceAddr:"", deviceMac:"", deviceGateway:"", - devicePwd:"" + devicePwd:"", + funImp:"http://xxx.xxx.xxx:8088/externaltask/accessfunction" }, // 表单校验 baseFormRules: { @@ -343,6 +346,8 @@ let param = { "pageNum":this.queryParams.pageNum, "pageSize":this.queryParams.pageSize, + "deviceName":this.queryParams.deviceName, + "deviceType":this.queryParams.deviceType, "searchValue":this.queryParams.keyWord } console.log("param",param) @@ -373,7 +378,8 @@ deviceAddr:"", deviceMac:"", deviceGateway:"", - devicePwd:"" + devicePwd:"", + funImp:"http://xxx.xxx.xxx:8088/externaltask/accessfunction" }; this.resetForm("baseForm"); }, diff --git a/src/views/certificate/filingUser/index.vue b/src/views/certificate/filingUser/index.vue index de0e6a4..e150333 100644 --- a/src/views/certificate/filingUser/index.vue +++ b/src/views/certificate/filingUser/index.vue @@ -100,8 +100,8 @@ >
- 有证人数：231 - 无证人数：65 + 有证人数：{{statistics.ownNum}} + 无证人数：{{statistics.unOwnNum}}
@@ -170,6 +170,7 @@ import { deptTreeSelect, } from '@/api/system/user' import {getCertificateUserListPageApi,addCertificateCheckApi} from "@/api/certificateManage/index" +import { getStatisticsApi } from "@/api/certificateStatistics/index"; import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' export default { @@ -206,6 +207,22 @@ export default { children: 'children', label: 'label', }, + statistics:{ + registerNum:0, + ownNum:0, + unOwnNum:0, + storeNum:0, + unStoreNum:0, + passPortNum:0, + outPassPortNum:0, + inPassPortNum:0, + hMCardNum:0, + outHMCardNum:0, + inHMCardNum:0, + taiwanNum:0, + outTaiwanNum:0, + inTaiwanNum:0, + }, // 查询参数 queryParams: { pageNum: 1, @@ -241,6 +258,7 @@ export default { created() { this.getList() this.getDeptTree() + this.initStatistics(); }, methods: { /* 手机号码脱敏 */ @@ -248,6 +266,16 @@ export default { if (!phone) return '' return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2') }, + initStatistics(){ + let param = {} + getStatisticsApi(param).then(response => { + console.log("getStatisticsApi",response) + if(response.code==200){ + this.statistics =response.data; + console.log("this.statistics",this.statistics) + } + }); + }, /** 查询用户列表 */ getList() { this.loading = true